From 31607686beab5cbacccf24573a9825b5dfd95278 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 28 Feb 2016 08:11:17 -0500
Subject: [PATCH 001/414] Bless up

---
 .gitignore                 | 65 ++++++++++++++++++++++++++++++++++++++
 lib/angel_framework.dart   |  4 +++
 lib/src/http/http.dart     | 11 +++++++
 lib/src/http/routable.dart | 10 ++++++
 lib/src/http/route.dart    | 14 ++++++++
 lib/src/http/server.dart   | 39 +++++++++++++++++++++++
 pubspec.yaml               |  7 ++++
 7 files changed, 150 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 lib/angel_framework.dart
 create mode 100644 lib/src/http/http.dart
 create mode 100644 lib/src/http/routable.dart
 create mode 100644 lib/src/http/route.dart
 create mode 100644 lib/src/http/server.dart
 create mode 100644 pubspec.yaml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..917abe7c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,65 @@
+# Created by .ignore support plugin (hsz.mobi)
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+### Dart template
+# Don’t commit the following directories created by pub.
+.buildlog
+.pub/
+build/
+packages
+.packages
+
+# Or the files created by dart2js.
+*.dart.js
+*.js_
+*.js.deps
+*.js.map
+
+# Include when developing application packages.
+pubspec.lock
+
diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
new file mode 100644
index 00000000..207d8ea8
--- /dev/null
+++ b/lib/angel_framework.dart
@@ -0,0 +1,4 @@
+/// A controller-based MVC + WebSocket framework in Dart.
+library angel_framework;
+
+export 'src/http/http.dart';
\ No newline at end of file
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
new file mode 100644
index 00000000..3703c3bf
--- /dev/null
+++ b/lib/src/http/http.dart
@@ -0,0 +1,11 @@
+/// HTTP logic
+library angel_framework.http;
+
+import 'dart:async';
+import 'dart:io';
+import 'package:json_god/json_god.dart';
+import 'package:route/server.dart';
+
+part 'route.dart';
+part 'routable.dart';
+part 'server.dart';
\ No newline at end of file
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
new file mode 100644
index 00000000..5f91102c
--- /dev/null
+++ b/lib/src/http/routable.dart
@@ -0,0 +1,10 @@
+part of angel_framework.http;
+
+/// A routable server that can handle dynamic requests.
+class Routable {
+  /// Additional filters to be run on designated requests.
+  Map <String, Object> middleware = {};
+
+  /// Dynamic request paths that this server will respond to.
+  Map <Route, Object> routes = {};
+}
\ No newline at end of file
diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
new file mode 100644
index 00000000..669013c0
--- /dev/null
+++ b/lib/src/http/route.dart
@@ -0,0 +1,14 @@
+part of angel_framework.http;
+
+class Route {
+  Pattern matcher;
+  String method;
+
+  Route(String method, Pattern path, [List handlers]) {
+    this.method = method;
+    if (path is RegExp) this.matcher = path;
+    else this.matcher = new RegExp('^' +
+        path.toString().replaceAll(new RegExp('\/'), r'\/').replaceAll(
+            new RegExp(':[a-zA-Z_]+'), '([^\/]+)') + r'$');
+  }
+}
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
new file mode 100644
index 00000000..c98ca182
--- /dev/null
+++ b/lib/src/http/server.dart
@@ -0,0 +1,39 @@
+part of angel_framework.http;
+
+/// A function that binds
+typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
+
+/// A powerful real-time/REST/MVC server class.
+class Angel extends Routable {
+  ServerGenerator _serverGenerator;
+
+  _startServer(InternetAddress address, int port) async {
+    var server = await _serverGenerator(
+        address ?? InternetAddress.LOOPBACK_IP_V4, port);
+    var router = new Router(server);
+
+    this.routes.forEach((Route route, value) {
+      router.serve(route.matcher, method: route.method).listen((
+          HttpRequest request) {
+
+      });
+    });
+  }
+
+  /// Starts the server.
+  void listen({InternetAddress address, int port: 3000}) {
+    runZoned(() async {
+      await _startServer(address, port);
+    }, onError: onError);
+  }
+
+  /// Handles a server error.
+  void onError(e, [StackTrace stackTrace]) {
+
+  }
+
+  Angel() {}
+
+  /// Creates an HTTPS server.
+  Angel.secure() {}
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
new file mode 100644
index 00000000..86b44c74
--- /dev/null
+++ b/pubspec.yaml
@@ -0,0 +1,7 @@
+name: angel_framework
+version: 0.0.1-dev
+description: Core libraries for the Angel framework.
+author: Tobe O <thosakwe@gmail.com>
+dependencies:
+  json_god: any
+  route: any
\ No newline at end of file

From 95369495e4099a29d4d74ce6f1ac89d1e459570a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 17 Apr 2016 23:27:23 -0400
Subject: [PATCH 002/414] Almost done.

---
 lib/src/http/http.dart             |  10 ++-
 lib/src/http/request_context.dart  |  88 ++++++++++++++++++++
 lib/src/http/response_context.dart | 129 +++++++++++++++++++++++++++++
 lib/src/http/routable.dart         |  53 +++++++++++-
 lib/src/http/route.dart            |  52 ++++++++++--
 lib/src/http/server.dart           | 119 +++++++++++++++++++++++---
 lib/src/http/service.dart          |  54 ++++++++++++
 lib/src/http/services/memory.dart  |  31 +++++++
 pubspec.yaml                       |   7 +-
 test/routing.dart                  |  72 ++++++++++++++++
 test/services.dart                 |  54 ++++++++++++
 test/util.dart                     |  32 +++++++
 12 files changed, 681 insertions(+), 20 deletions(-)
 create mode 100644 lib/src/http/request_context.dart
 create mode 100644 lib/src/http/response_context.dart
 create mode 100644 lib/src/http/service.dart
 create mode 100644 lib/src/http/services/memory.dart
 create mode 100644 test/routing.dart
 create mode 100644 test/services.dart
 create mode 100644 test/util.dart

diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 3703c3bf..dd0d4a70 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -2,10 +2,18 @@
 library angel_framework.http;
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
+import 'dart:mirrors';
+import 'package:body_parser/body_parser.dart';
 import 'package:json_god/json_god.dart';
+import 'package:mime/mime.dart';
 import 'package:route/server.dart';
 
+part 'request_context.dart';
+part 'response_context.dart';
 part 'route.dart';
 part 'routable.dart';
-part 'server.dart';
\ No newline at end of file
+part 'server.dart';
+part 'service.dart';
+part 'services/memory.dart';
\ No newline at end of file
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
new file mode 100644
index 00000000..35bb7e23
--- /dev/null
+++ b/lib/src/http/request_context.dart
@@ -0,0 +1,88 @@
+part of angel_framework.http;
+
+/// A function that intercepts a request and determines whether handling of it should continue.
+typedef Future<bool> Middleware(RequestContext req, ResponseContext res);
+
+/// A function that receives an incoming [RequestContext] and responds to it.
+typedef Future RequestHandler(RequestContext req, ResponseContext res);
+
+/// A function that handles an [HttpRequest].
+typedef Future RawRequestHandler(HttpRequest request);
+
+/// A convenience wrapper around an incoming HTTP request.
+class RequestContext {
+  /// The [Angel] instance that is responding to this request.
+  Angel app;
+
+  /// Any cookies sent with this request.
+  List<Cookie> get cookies => underlyingRequest.cookies;
+
+  /// All HTTP headers sent with this request.
+  HttpHeaders get headers => underlyingRequest.headers;
+
+  /// The requested hostname.
+  String get hostname => underlyingRequest.headers.value(HttpHeaders.HOST);
+
+  /// The user's IP.
+  String get ip => remoteAddress.address;
+
+  /// This request's HTTP method.
+  String get method => underlyingRequest.method;
+
+  /// All post data submitted to the server.
+  Map body = {};
+
+  /// The content type of an incoming request.
+  ContentType contentType;
+
+  /// Any and all files sent to the server with this request.
+  List<FileUploadInfo> files = [];
+
+  /// The URL parameters extracted from the request URI.
+  Map params = {};
+
+  /// The requested path.
+  String path;
+
+  /// The parsed request query string.
+  Map query = {};
+
+  /// The remote address requesting this resource.
+  InternetAddress remoteAddress;
+
+  /// The route that matched this request.
+  Route route;
+
+  /// The user's HTTP session.
+  HttpSession session;
+
+  /// Is this an **XMLHttpRequest**?
+  bool get xhr => underlyingRequest.headers.value("X-Requested-With")
+      ?.trim()
+      ?.toLowerCase() == 'xmlhttprequest';
+
+  /// The underlying [HttpRequest] instance underneath this context.
+  HttpRequest underlyingRequest;
+
+  /// Magically transforms an [HttpRequest] into a RequestContext.
+  static Future<RequestContext> from(HttpRequest request,
+      Map parameters, Angel app, Route sourceRoute) async {
+    RequestContext context = new RequestContext();
+
+    context.app = app;
+    context.contentType = request.headers.contentType;
+    context.remoteAddress = request.connectionInfo.remoteAddress;
+    context.params = parameters;
+    context.path = request.uri.toString();
+    context.route = sourceRoute;
+    context.session = request.session;
+    context.underlyingRequest = request;
+
+    BodyParseResult bodyParseResult = await parseBody(request);
+    context.query = bodyParseResult.query;
+    context.body = bodyParseResult.body;
+    context.files = bodyParseResult.files;
+
+    return context;
+  }
+}
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
new file mode 100644
index 00000000..7268a423
--- /dev/null
+++ b/lib/src/http/response_context.dart
@@ -0,0 +1,129 @@
+part of angel_framework.http;
+
+/// A function that asynchronously generates a view from the given path and data.
+typedef Future<String> ViewGenerator(String path, {Map data});
+
+/// A convenience wrapper around an outgoing HTTP request.
+class ResponseContext {
+  /// The [Angel] instance that is sending a response.
+  Angel app;
+
+  God god = new God();
+
+  /// Can we still write to this response?
+  bool isOpen = true;
+
+  /// A set of UTF-8 encoded bytes that will be written to the response.
+  List<List<int>> responseData = [];
+
+  /// Sets the status code to be sent with this response.
+  status(int code) {
+   underlyingResponse.statusCode = code;
+  }
+
+  /// The underlying [HttpResponse] under this instance.
+  HttpResponse underlyingResponse;
+
+  ResponseContext(this.underlyingResponse);
+
+  /// Any and all cookies to be sent to the user.
+  List<Cookie> get cookies => underlyingResponse.cookies;
+
+  /// Set this to true if you will manually close the response.
+  bool willCloseItself = false;
+
+  /// Sends a download as a response.
+  download(File file, {String filename}) {
+    header("Content-Disposition",
+        'Content-Disposition: attachment; filename="${filename ?? file.path}"');
+    header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
+    header(HttpHeaders.CONTENT_LENGTH, file.lengthSync().toString());
+    responseData.add(file.readAsBytesSync());
+  }
+
+  /// Prevents more data from being written to the response.
+  end() => isOpen = false;
+
+  /// Sets a response header to the given value, or retrieves its value.
+  header(String key, [String value]) {
+    if (value == null) return underlyingResponse.headers[key];
+    else underlyingResponse.headers.set(key, value);
+  }
+
+  /// Serializes JSON to the response.
+  json(value) {
+    write(god.serialize(value));
+    header(HttpHeaders.CONTENT_TYPE, ContentType.JSON.toString());
+    end();
+  }
+
+  /// Returns a JSONP response.
+  jsonp(value, {String callbackName: "callback"}) {
+    write("$callbackName(${god.serialize(value)})");
+    header(HttpHeaders.CONTENT_TYPE, "application/javascript");
+    end();
+  }
+
+  /// Renders a view to the response stream, and closes the response.
+  Future render(String view, {Map data}) async {
+    /// TODO: app.viewGenerator
+    var generator = app.viewGenerator(view, data: data);
+    write(await generator);
+    header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
+    end();
+  }
+
+  /// Redirects to user to the given URL.
+  redirect(String url, {int code: 301}) {
+    header(HttpHeaders.LOCATION, url);
+    status(code);
+    write('''
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Redirecting...</title>
+        <meta http-equiv="refresh" content="0; url=$url">
+      </head>
+      <body>
+        <h1>Currently redirecting you...</h1>
+        <br />
+        Click <a href="$url"></a> if you are not automatically redirected...
+        <script>
+          window.location = "$url";
+        </script>
+      </body>
+    </html>
+    ''');
+    end();
+  }
+
+  /// Streams a file to this response as chunked data.
+  ///
+  /// Useful for video sites.
+  streamFile(File file,
+      {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
+    if (!isOpen) return;
+
+    header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
+    willCloseItself = true;
+    await file.openRead().pipe(underlyingResponse);
+    /*await chunked(file.openRead(), chunkSize: chunkSize,
+        sleepMs: sleepMs,
+        resumable: resumable);*/
+  }
+
+  /// Writes data to the response.
+  write(value) {
+    if (isOpen)
+      responseData.add(UTF8.encode(value.toString()));
+  }
+
+  /// Magically transforms an [HttpResponse] object into a ResponseContext.
+  static Future<ResponseContext> from
+      (HttpResponse response, Angel app) async
+  {
+    ResponseContext context = new ResponseContext(response);
+    context.app = app;
+    return context;
+  }
+}
\ No newline at end of file
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 5f91102c..eb0cec32 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -1,10 +1,59 @@
 part of angel_framework.http;
 
+typedef RouteAssigner(Pattern path, handler, {List middleware});
+
 /// A routable server that can handle dynamic requests.
 class Routable {
   /// Additional filters to be run on designated requests.
-  Map <String, Object> middleware = {};
+  Map <String, Middleware> middleware = {};
 
   /// Dynamic request paths that this server will respond to.
-  Map <Route, Object> routes = {};
+  List<Route> routes = [];
+
+  /// A set of [Service] objects that have been mapped into routes.
+  Map <Pattern, Service> services = {};
+
+  _makeRouteAssigner(String method) {
+    return (Pattern path, Object handler, {List middleware}) {
+      var route = new Route(method, path, (middleware ?? [])
+        ..add(handler));
+      routes.add(route);
+    };
+  }
+
+  /// Assigns a middleware to a name for convenience.
+  registerMiddleware(String name, Middleware middleware) {
+    this.middleware[name] = middleware;
+  }
+
+  /// Retrieves the service assigned to the given path.
+  Service service(Pattern path) => services[path];
+
+  /// Incorporates another routable's routes into this one's.
+  use(Pattern path, Routable routable) {
+    middleware.addAll(routable.middleware);
+    for (Route route in routable.routes) {
+      Route provisional = new Route('', path);
+      route.matcher = new RegExp(route.matcher.pattern.replaceAll(
+          new RegExp('^\\^'),
+          provisional.matcher.pattern.replaceAll(new RegExp(r'\$$'), '')));
+      route.path = "$path${route.path}";
+
+      routes.add(route);
+    }
+
+    if (routable is Service) {
+      services[path.toString()] = routable;
+    }
+  }
+
+  RouteAssigner get, post, patch, delete;
+
+  Routable() {
+    this.get = _makeRouteAssigner('GET');
+    this.post = _makeRouteAssigner('POST');
+    this.patch = _makeRouteAssigner('PATCH');
+    this.delete = _makeRouteAssigner('DELETE');
+  }
+
 }
\ No newline at end of file
diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index 669013c0..0385b091 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -1,14 +1,56 @@
 part of angel_framework.http;
 
 class Route {
-  Pattern matcher;
+  RegExp matcher;
   String method;
+  List handlers = [];
+  String path;
 
   Route(String method, Pattern path, [List handlers]) {
     this.method = method;
-    if (path is RegExp) this.matcher = path;
-    else this.matcher = new RegExp('^' +
-        path.toString().replaceAll(new RegExp('\/'), r'\/').replaceAll(
-            new RegExp(':[a-zA-Z_]+'), '([^\/]+)') + r'$');
+    if (path is RegExp) {
+      this.matcher = path;
+      this.path = path.pattern;
+    }
+    else {
+      this.matcher = new RegExp('^' +
+          path.toString()
+              .replaceAll(new RegExp('\/'), r'\/')
+              .replaceAll(new RegExp(':[a-zA-Z_]+'), '([^\/]+)')
+              .replaceAll(new RegExp('\\*'), '.*')
+          + r'$');
+      this.path = path;
+    }
+
+    if (handlers != null) {
+      this.handlers.addAll(handlers);
+    }
+  }
+
+  parseParameters(String requestPath) {
+    Map result = {};
+
+    Iterable<String> values = _parseParameters(requestPath);
+    RegExp rgx = new RegExp(':([a-zA-Z_]+)');
+    Iterable<Match> matches = rgx.allMatches(
+        path.replaceAll(new RegExp('\/'), r'\/'));
+    for (int i = 0; i < matches.length; i++) {
+      Match match = matches.elementAt(i);
+      String paramName = match.group(1);
+      String value = values.elementAt(i);
+      num numValue = num.parse(value, (_) => double.NAN);
+      if (!numValue.isNaN)
+        result[paramName] = numValue;
+      else
+        result[paramName] = value;
+    }
+
+    return result;
+  }
+
+  _parseParameters(String requestPath) sync* {
+    Match routeMatch = matcher.firstMatch(requestPath);
+    for (int i = 1; i <= routeMatch.groupCount; i++)
+      yield routeMatch.group(i);
   }
 }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index c98ca182..c1cf874d 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -1,39 +1,136 @@
 part of angel_framework.http;
 
-/// A function that binds
+/// A function that binds an [Angel] server to an Internet address and port.
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
+/// A function that configures an [Angel] server in some way.
+typedef AngelConfigurer(Angel app);
+
 /// A powerful real-time/REST/MVC server class.
 class Angel extends Routable {
-  ServerGenerator _serverGenerator;
+  ServerGenerator _serverGenerator = (address, port) async => await HttpServer
+      .bind(address, port);
+  var viewGenerator = (String view, {Map data}) => {};
 
-  _startServer(InternetAddress address, int port) async {
+  HttpServer httpServer;
+  God god = new God();
+
+  /// A set of custom properties that can be assigned to the server.
+  ///
+  /// Useful for configuration and extension.
+  Map properties = {};
+
+  startServer(InternetAddress address, int port) async {
     var server = await _serverGenerator(
         address ?? InternetAddress.LOOPBACK_IP_V4, port);
+    this.httpServer = server;
     var router = new Router(server);
 
-    this.routes.forEach((Route route, value) {
+    this.routes.forEach((Route route) {
       router.serve(route.matcher, method: route.method).listen((
-          HttpRequest request) {
+          HttpRequest request) async {
+        RequestContext req = await RequestContext.from(
+            request, route.parseParameters(request.uri.toString()), this,
+            route);
+        ResponseContext res = await ResponseContext.from(
+            request.response, this);
+        bool canContinue = true;
 
+        for (var handler in route.handlers) {
+          if (canContinue) {
+            canContinue = await new Future<bool>.sync(() async {
+              return _applyHandler(handler, req, res);
+            }).catchError((e) {
+              stderr.write(e.error);
+              canContinue = false;
+              return false;
+            });
+          }
+        }
+
+        if (!res.willCloseItself) {
+          res.responseData.forEach((blob) => request.response.add(blob));
+          await request.response.close();
+        }
       });
     });
+
+    return server;
+  }
+
+  Future<bool> _applyHandler(handler, RequestContext req,
+      ResponseContext res) async {
+    if (handler is Middleware) {
+      return await handler(req, res);
+    }
+
+    else if (handler is RequestHandler) {
+      await handler(req, res);
+      return res.isOpen;
+    }
+
+    else if (handler is RawRequestHandler) {
+      var result = await handler(req.underlyingRequest);
+      return result is bool && result == true;
+    }
+
+    else if (handler is Function || handler is Future) {
+      var result = await handler();
+      return result is bool && result == true;
+    }
+
+    else if (middleware.containsKey(handler)) {
+      return await _applyHandler(middleware[handler], req, res);
+    }
+
+    else {
+      res.willCloseItself = true;
+      res.underlyingResponse.write(god.serialize(handler));
+      await res.underlyingResponse.close();
+      return false;
+    }
+  }
+
+  /// Applies an [AngelConfigurer] to this instance.
+  void configure(AngelConfigurer configurer) {
+    configurer(this);
   }
 
   /// Starts the server.
   void listen({InternetAddress address, int port: 3000}) {
     runZoned(() async {
-      await _startServer(address, port);
+      await startServer(address, port);
     }, onError: onError);
   }
 
   /// Handles a server error.
-  void onError(e, [StackTrace stackTrace]) {
+  var onError = (e, [StackTrace stackTrace]) {
+    stderr.write(e.toString());
+    if (stackTrace != null)
+      stderr.write(stackTrace.toString());
+  };
 
-  }
-
-  Angel() {}
+  Angel() : super() {}
 
   /// Creates an HTTPS server.
-  Angel.secure() {}
+  Angel.secure() : super() {}
+
+  noSuchMethod(Invocation invocation) {
+    if (invocation.memberName != null) {
+      String name = MirrorSystem.getName(invocation.memberName);
+      if (properties.containsKey(name)) {
+        if (invocation.isGetter)
+          return properties[name];
+        else if (invocation.isMethod) {
+          return Function.apply(
+              properties[name], invocation.positionalArguments,
+              invocation.namedArguments);
+        }
+      }
+    }
+
+    super.noSuchMethod(invocation);
+  }
+
+
 }
\ No newline at end of file
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
new file mode 100644
index 00000000..0b598b50
--- /dev/null
+++ b/lib/src/http/service.dart
@@ -0,0 +1,54 @@
+part of angel_framework.http;
+
+/// A data store exposed to the Internet.
+class Service extends Routable {
+
+  /// Retrieves all resources.
+  Future<List> index([Map params]) {
+    throw new MethodNotAllowedError('find');
+  }
+
+  /// Retrieves the desired resource.
+  Future<Object> read(id, [Map params]) {
+    throw new MethodNotAllowedError('get');
+  }
+
+  /// Creates a resource.
+  Future<Object> create(Map data, [Map params]) {
+    throw new MethodNotAllowedError('create');
+  }
+
+  /// Modifies a resource.
+  Future<Object> update(id, Map data, [Map params]) {
+    throw new MethodNotAllowedError('update');
+  }
+
+  /// Removes the given resource.
+  Future<Object> remove(id, [Map params]) {
+    throw new MethodNotAllowedError('remove');
+  }
+
+  Service() : super() {
+    get('/', (req, res) async => res.json(await this.index(req.query)));
+    get('/:id', (req, res) async =>
+        res.json(await this.read(req.params['id'], req.query)));
+    post('/', (req, res) async => res.json(await this.create(req.body))g);
+    post('/:id', (req, res) async =>
+        res.json(await this.update(req.params['id'], req.body)));
+    delete('/:id', (req, res) async =>
+        res.json(await this.remove(req.params['id'], req.body)));
+  }
+}
+
+/// Thrown when an unimplemented method is called.
+class MethodNotAllowedError extends Error {
+  /// The action that threw the error.
+  ///
+  /// Ex. 'get', 'remove'
+  String action;
+
+  /// A description of this error.
+  String get error => 'This service does not support the "$action" action.';
+
+  MethodNotAllowedError(String this.action);
+}
\ No newline at end of file
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
new file mode 100644
index 00000000..c367340c
--- /dev/null
+++ b/lib/src/http/services/memory.dart
@@ -0,0 +1,31 @@
+part of angel_framework.http;
+
+/// An in-memory [Service].
+class MemoryService<T> extends Service {
+  God god = new God();
+  Map <int, T> items = {};
+
+  Future<List> index([Map params]) async => items.values.toList();
+
+  Future<Object> read(id, [Map params]) async => items[int.parse(id)];
+
+  Future<Object> create(Map data, [Map params]) async {
+    data['id'] = items.length;
+    items[items.length] = god.deserializeFromMap(data, T);
+    return items[items.length - 1];
+  }
+
+  Future<Object> update(id, Map data, [Map params]) async {
+    data['id'] = int.parse(id);
+    items[int.parse(id)] = god.deserializeFromMap(data, T);
+    return data;
+  }
+
+  Future<Object> remove(id, [Map params]) async {
+    var item = items[int.parse(id)];
+    items.remove(int.parse(id));
+    return item;
+  }
+
+  MemoryService() : super();
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 86b44c74..ae48993a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,5 +3,10 @@ version: 0.0.1-dev
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 dependencies:
+  body_parser: ^1.0.0-dev
   json_god: any
-  route: any
\ No newline at end of file
+  mime: ^0.9.3
+  route: any
+dev_dependencies:
+  http: any
+  test: any
\ No newline at end of file
diff --git a/test/routing.dart b/test/routing.dart
new file mode 100644
index 00000000..62eb003b
--- /dev/null
+++ b/test/routing.dart
@@ -0,0 +1,72 @@
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:http/http.dart' as http;
+import 'package:json_god/json_god.dart';
+import 'package:test/test.dart';
+
+main() {
+  group('routing', () {
+    Angel angel;
+    Angel nested;
+    Angel todos;
+    String url;
+    http.Client client;
+    God god;
+
+    setUp(() async {
+      god = new God();
+      angel = new Angel();
+      nested = new Angel();
+      todos = new Angel();
+
+      todos.get('/action/:action', (req, res) => res.json(req.params));
+
+      nested.post('/ted/:route', (req, res) => res.json(req.params));
+
+      angel.get('/hello', 'world');
+      angel.get('/name/:first/last/:last', (req, res) => res.json(req.params));
+      angel.use('/nes', nested);
+      angel.use('/todos/:id', todos);
+
+      client = new http.Client();
+      await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+      url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
+    });
+
+    tearDown(() async {
+      await angel.httpServer.close(force: true);
+      angel = null;
+      nested = null;
+      todos = null;
+      client.close();
+      client = null;
+      url = null;
+      god = null;
+    });
+
+    test('Can match basic url', () async {
+      var response = await client.get("$url/hello");
+      expect(response.body, equals('"world"'));
+    });
+
+    test('Can match url with multiple parameters', () async {
+      var response = await client.get('$url/name/HELLO/last/WORLD');
+      var json = god.deserialize(response.body);
+      expect(json['first'], equals('HELLO'));
+      expect(json['last'], equals('WORLD'));
+    });
+
+    test('Can nest another Angel instance', () async {
+      var response = await client.post('$url/nes/ted/foo');
+      var json = god.deserialize(response.body);
+      expect(json['route'], equals('foo'));
+    });
+
+    test('Can parse parameters from a nested Angel instance', () async {
+      var response = await client.get('$url/todos/1337/action/test');
+      var json = god.deserialize(response.body);
+      expect(json['id'], equals(1337));
+      expect(json['action'], equals('test'));
+    });
+  });
+}
\ No newline at end of file
diff --git a/test/services.dart b/test/services.dart
new file mode 100644
index 00000000..11157293
--- /dev/null
+++ b/test/services.dart
@@ -0,0 +1,54 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:http/http.dart' as http;
+import 'package:json_god/json_god.dart';
+import 'package:test/test.dart';
+
+class Todo {
+  int id;
+  String text;
+}
+
+main() {
+  group('Utilities', () {
+    Map headers = {
+      'Content-Type': 'application/json'
+    };
+    Angel angel;
+    String url;
+    http.Client client;
+    God god;
+
+    setUp(() async {
+      angel = new Angel();
+      client = new http.Client();
+      god = new God();
+      angel.use('/todos', new MemoryService<Todo>());
+      await angel.startServer(null, 0);
+      url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
+    });
+
+    tearDown(() async {
+      angel = null;
+      url = null;
+      client.close();
+      client = null;
+      god = null;
+    });
+
+    group('memory', () {
+      test('can index an empty service', () async {
+        var response = await client.get("$url/todos/");
+        expect(response.body, equals('[]'));
+      });
+
+      test('can create data', () async {
+        String postData = god.serialize({'text': 'Hello, world!'});
+        var response = await client.post(
+            "$url/todos/", headers: headers, body: postData);
+        var json = god.deserialize(response.body);
+        print(json);
+        expect(json['text'], equals('Hello, world!'));
+      });
+    });
+  });
+}
\ No newline at end of file
diff --git a/test/util.dart b/test/util.dart
new file mode 100644
index 00000000..6e641c0a
--- /dev/null
+++ b/test/util.dart
@@ -0,0 +1,32 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:test/test.dart';
+
+class Foo {
+  String name;
+
+  Foo(String this.name);
+}
+
+main() {
+  group('Utilities', () {
+    Angel angel;
+
+    setUp(() {
+      angel = new Angel();
+    });
+
+    tearDown(() {
+      angel = null;
+    });
+
+    test('can use app.properties like members', () {
+      angel.properties['hello'] = 'world';
+      angel.properties['foo'] = () => 'bar';
+      angel.properties['Foo'] = new Foo('bar');
+
+      expect(angel.hello, equals('world'));
+      expect(angel.foo(), equals('bar'));
+      expect(angel.Foo.name, equals('bar'));
+    });
+  });
+}
\ No newline at end of file

From d51ab2e2a1e49a6bea87e44ade2e10331592b44e Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 21 Apr 2016 16:37:02 -0400
Subject: [PATCH 003/414] It's getting there. Slowly, but surely.

---
 LICENSE                            | 674 +++++++++++++++++++++++++++++
 lib/src/http/extensible.dart       |  26 ++
 lib/src/http/http.dart             |   1 +
 lib/src/http/request_context.dart  |   2 +-
 lib/src/http/response_context.dart |   2 +-
 lib/src/http/routable.dart         |   5 +-
 lib/src/http/route.dart            |   1 +
 lib/src/http/server.dart           |  48 +-
 lib/src/http/service.dart          |   2 +-
 pubspec.yaml                       |  15 +-
 test/routing.dart                  |  23 +-
 test/services.dart                 |   2 +-
 12 files changed, 758 insertions(+), 43 deletions(-)
 create mode 100644 LICENSE
 create mode 100644 lib/src/http/extensible.dart

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..5717dd98
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+        Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+
+The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+a) The work must carry prominent notices stating that you modified
+it, and giving a relevant date.
+
+b) The work must carry prominent notices stating that it is
+released under this License and any conditions added under section
+7.  This requirement modifies the requirement in section 4 to
+"keep intact all notices".
+
+c) You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy.  This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged.  This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.
+
+d) If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+a) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.
+
+b) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either (1) a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or (2) access to copy the
+Corresponding Source from a network server at no charge.
+
+c) Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source.  This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.
+
+d) Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge.  You need not require recipients to copy the
+Corresponding Source along with the object code.  If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source.  Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.
+
+e) Convey the object code using peer-to-peer transmission, provided
+you inform other peers where the object code and Corresponding
+Source of the work are being offered to the general public at no
+charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+a) Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or
+
+b) Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or
+
+c) Prohibiting misrepresentation of the origin of that material, or
+requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or
+
+d) Limiting the use for publicity purposes of names of licensors or
+authors of the material; or
+
+e) Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or
+
+f) Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions of
+it) with contractual assumptions of liability to the recipient, for
+any liability that these contractual assumptions directly impose on
+those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+{one line to give the program's name and a brief idea of what it does.}
+Copyright (C) {year}  {name of author}
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+{project}  Copyright (C) {year}  {fullname}
+This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+This is free software, and you are welcome to redistribute it
+under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
diff --git a/lib/src/http/extensible.dart b/lib/src/http/extensible.dart
new file mode 100644
index 00000000..ec485e3a
--- /dev/null
+++ b/lib/src/http/extensible.dart
@@ -0,0 +1,26 @@
+part of angel_framework.http;
+
+/// Basically an Expando whoops
+class Extensible {
+  /// A set of custom properties that can be assigned to the server.
+  ///
+  /// Useful for configuration and extension.
+  Map properties = {};
+
+  noSuchMethod(Invocation invocation) {
+    if (invocation.memberName != null) {
+      String name = MirrorSystem.getName(invocation.memberName);
+      if (properties.containsKey(name)) {
+        if (invocation.isGetter)
+          return properties[name];
+        else if (invocation.isMethod) {
+          return Function.apply(
+              properties[name], invocation.positionalArguments,
+              invocation.namedArguments);
+        }
+      }
+    }
+
+    super.noSuchMethod(invocation);
+  }
+}
\ No newline at end of file
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index dd0d4a70..e42cace5 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -10,6 +10,7 @@ import 'package:json_god/json_god.dart';
 import 'package:mime/mime.dart';
 import 'package:route/server.dart';
 
+part 'extensible.dart';
 part 'request_context.dart';
 part 'response_context.dart';
 part 'route.dart';
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 35bb7e23..1fd8980b 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -10,7 +10,7 @@ typedef Future RequestHandler(RequestContext req, ResponseContext res);
 typedef Future RawRequestHandler(HttpRequest request);
 
 /// A convenience wrapper around an incoming HTTP request.
-class RequestContext {
+class RequestContext extends Extensible {
   /// The [Angel] instance that is responding to this request.
   Angel app;
 
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 7268a423..ea4a688b 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -4,7 +4,7 @@ part of angel_framework.http;
 typedef Future<String> ViewGenerator(String path, {Map data});
 
 /// A convenience wrapper around an outgoing HTTP request.
-class ResponseContext {
+class ResponseContext extends Extensible {
   /// The [Angel] instance that is sending a response.
   Angel app;
 
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index eb0cec32..4c3abe67 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -1,9 +1,9 @@
 part of angel_framework.http;
 
-typedef RouteAssigner(Pattern path, handler, {List middleware});
+typedef Route RouteAssigner(Pattern path, handler, {List middleware});
 
 /// A routable server that can handle dynamic requests.
-class Routable {
+class Routable extends Extensible {
   /// Additional filters to be run on designated requests.
   Map <String, Middleware> middleware = {};
 
@@ -18,6 +18,7 @@ class Routable {
       var route = new Route(method, path, (middleware ?? [])
         ..add(handler));
       routes.add(route);
+      return route;
     };
   }
 
diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index 0385b091..baf03314 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -5,6 +5,7 @@ class Route {
   String method;
   List handlers = [];
   String path;
+  String name;
 
   Route(String method, Pattern path, [List handlers]) {
     this.method = method;
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index c1cf874d..9f64ef26 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -15,11 +15,6 @@ class Angel extends Routable {
   HttpServer httpServer;
   God god = new God();
 
-  /// A set of custom properties that can be assigned to the server.
-  ///
-  /// Useful for configuration and extension.
-  Map properties = {};
-
   startServer(InternetAddress address, int port) async {
     var server = await _serverGenerator(
         address ?? InternetAddress.LOOPBACK_IP_V4, port);
@@ -61,22 +56,38 @@ class Angel extends Routable {
   Future<bool> _applyHandler(handler, RequestContext req,
       ResponseContext res) async {
     if (handler is Middleware) {
-      return await handler(req, res);
+      var result = await handler(req, res);
+      if (result is bool)
+        return result == true;
+      else if (result != null) {
+        res.json(result);
+        return false;
+      } else return true;
     }
 
-    else if (handler is RequestHandler) {
+    if (handler is RequestHandler) {
       await handler(req, res);
       return res.isOpen;
     }
 
     else if (handler is RawRequestHandler) {
       var result = await handler(req.underlyingRequest);
-      return result is bool && result == true;
+      if (result is bool)
+        return result == true;
+      else if (result != null) {
+        res.json(result);
+        return false;
+      } else return true;
     }
 
     else if (handler is Function || handler is Future) {
       var result = await handler();
-      return result is bool && result == true;
+      if (result is bool)
+        return result == true;
+      else if (result != null) {
+        res.json(result);
+        return false;
+      } else return true;
     }
 
     else if (middleware.containsKey(handler)) {
@@ -114,23 +125,4 @@ class Angel extends Routable {
 
   /// Creates an HTTPS server.
   Angel.secure() : super() {}
-
-  noSuchMethod(Invocation invocation) {
-    if (invocation.memberName != null) {
-      String name = MirrorSystem.getName(invocation.memberName);
-      if (properties.containsKey(name)) {
-        if (invocation.isGetter)
-          return properties[name];
-        else if (invocation.isMethod) {
-          return Function.apply(
-              properties[name], invocation.positionalArguments,
-              invocation.namedArguments);
-        }
-      }
-    }
-
-    super.noSuchMethod(invocation);
-  }
-
-
 }
\ No newline at end of file
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 0b598b50..a33bdafa 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -32,7 +32,7 @@ class Service extends Routable {
     get('/', (req, res) async => res.json(await this.index(req.query)));
     get('/:id', (req, res) async =>
         res.json(await this.read(req.params['id'], req.query)));
-    post('/', (req, res) async => res.json(await this.create(req.body))g);
+    post('/', (req, res) async => res.json(await this.create(req.body)));
     post('/:id', (req, res) async =>
         res.json(await this.update(req.params['id'], req.body)));
     delete('/:id', (req, res) async =>
diff --git a/pubspec.yaml b/pubspec.yaml
index ae48993a..0087e98e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,12 +1,13 @@
 name: angel_framework
-version: 0.0.1-dev
+version: 0.0.0-dev
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
+homepage: https://github.com/angel-dart/angel_framework
 dependencies:
-  body_parser: ^1.0.0-dev
-  json_god: any
-  mime: ^0.9.3
-  route: any
+  body_parser: ">=1.0.0-dev <2.0.0"
+  json_god: ">=1.0.0 <2.0.0"
+  mime: ">=0.9.3 <0.10.0"
+  route: ">= 0.4.6 <0.5.0"
 dev_dependencies:
-  http: any
-  test: any
\ No newline at end of file
+  http: ^0.11.3
+  test: ^0.12.13
\ No newline at end of file
diff --git a/test/routing.dart b/test/routing.dart
index 62eb003b..7ce95cb0 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -19,12 +19,18 @@ main() {
       nested = new Angel();
       todos = new Angel();
 
+      angel.registerMiddleware('interceptor', (req, res) async {
+        res.write('Middleware');
+        return false;
+      });
+
       todos.get('/action/:action', (req, res) => res.json(req.params));
-
       nested.post('/ted/:route', (req, res) => res.json(req.params));
-
+      angel.get('/intercepted', 'This should not be shown',
+          middleware: ['interceptor']);
       angel.get('/hello', 'world');
       angel.get('/name/:first/last/:last', (req, res) => res.json(req.params));
+      angel.post('/lambda', (req, res) => req.body);
       angel.use('/nes', nested);
       angel.use('/todos/:id', todos);
 
@@ -68,5 +74,18 @@ main() {
       expect(json['id'], equals(1337));
       expect(json['action'], equals('test'));
     });
+
+    test('Can add and use named middleware', () async {
+      var response = await client.get('$url/intercepted');
+      expect(response.body, equals('Middleware'));
+    });
+
+    test('Can serialize function result as JSON', () async {
+      Map headers = {'Content-Type': 'application/json'};
+      String postData = god.serialize({'it': 'works'});
+      var response = await client.post(
+          "$url/lambda", headers: headers, body: postData);
+      expect(god.deserialize(response.body)['it'], equals('works'));
+    });
   });
 }
\ No newline at end of file
diff --git a/test/services.dart b/test/services.dart
index 11157293..c7d5417c 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -9,7 +9,7 @@ class Todo {
 }
 
 main() {
-  group('Utilities', () {
+  group('Services', () {
     Map headers = {
       'Content-Type': 'application/json'
     };

From 04f1a2558bd99f9c72f130690b48e334141a44b5 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 21 Apr 2016 21:27:28 -0400
Subject: [PATCH 004/414] View generator

---
 lib/src/http/response_context.dart | 6 ++----
 lib/src/http/server.dart           | 2 +-
 pubspec.yaml                       | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index ea4a688b..ef081105 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -18,7 +18,7 @@ class ResponseContext extends Extensible {
 
   /// Sets the status code to be sent with this response.
   status(int code) {
-   underlyingResponse.statusCode = code;
+    underlyingResponse.statusCode = code;
   }
 
   /// The underlying [HttpResponse] under this instance.
@@ -66,9 +66,7 @@ class ResponseContext extends Extensible {
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, {Map data}) async {
-    /// TODO: app.viewGenerator
-    var generator = app.viewGenerator(view, data: data);
-    write(await generator);
+    write(await app.viewGenerator(view, data: data));
     header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
     end();
   }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 9f64ef26..adf11048 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -10,7 +10,7 @@ typedef AngelConfigurer(Angel app);
 class Angel extends Routable {
   ServerGenerator _serverGenerator = (address, port) async => await HttpServer
       .bind(address, port);
-  var viewGenerator = (String view, {Map data}) => {};
+  var viewGenerator = (String view, {Map data}) => "No view engine has been configured yet.";
 
   HttpServer httpServer;
   God god = new God();
diff --git a/pubspec.yaml b/pubspec.yaml
index 0087e98e..2feca39e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,5 +9,5 @@ dependencies:
   mime: ">=0.9.3 <0.10.0"
   route: ">= 0.4.6 <0.5.0"
 dev_dependencies:
-  http: ^0.11.3
-  test: ^0.12.13
\ No newline at end of file
+  http: ">= 0.11.3 < 0.12.0"
+  test: ">= 0.12.13 < 0.13.0"
\ No newline at end of file

From d4d5678f646d01f1eb5a1c5cd42476fc65ed5036 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 21 Apr 2016 21:27:54 -0400
Subject: [PATCH 005/414] dev.0

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 2feca39e..e47bbb6d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev
+version: 0.0.0-dev.1
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From f993155c04ddaa8259feed8b8cfea075ef54245b Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 21 Apr 2016 21:42:39 -0400
Subject: [PATCH 006/414] dev.2

---
 lib/src/http/server.dart | 32 +++++++++++++++++++++++++-------
 pubspec.yaml             |  2 +-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index adf11048..0662297d 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -10,7 +10,8 @@ typedef AngelConfigurer(Angel app);
 class Angel extends Routable {
   ServerGenerator _serverGenerator = (address, port) async => await HttpServer
       .bind(address, port);
-  var viewGenerator = (String view, {Map data}) => "No view engine has been configured yet.";
+  var viewGenerator = (String view,
+      {Map data}) => "No view engine has been configured yet.";
 
   HttpServer httpServer;
   God god = new God();
@@ -43,13 +44,20 @@ class Angel extends Routable {
           }
         }
 
-        if (!res.willCloseItself) {
-          res.responseData.forEach((blob) => request.response.add(blob));
-          await request.response.close();
-        }
+        _finalizeResponse(request, res);
       });
     });
 
+    router.defaultStream.listen((HttpRequest request) async {
+      RequestContext req = await RequestContext.from(
+          request, {}, this,
+          null);
+      ResponseContext res = await ResponseContext.from(
+          request.response, this);
+      on404(req, res);
+      _finalizeResponse(request, res);
+    });
+
     return server;
   }
 
@@ -102,6 +110,13 @@ class Angel extends Routable {
     }
   }
 
+  _finalizeResponse(HttpRequest request, ResponseContext res) async {
+    if (!res.willCloseItself) {
+      res.responseData.forEach((blob) => request.response.add(blob));
+      await request.response.close();
+    }
+  }
+
   /// Applies an [AngelConfigurer] to this instance.
   void configure(AngelConfigurer configurer) {
     configurer(this);
@@ -114,12 +129,15 @@ class Angel extends Routable {
     }, onError: onError);
   }
 
+  /// Responds to a 404.
+  RequestHandler on404 = (req, res) => res.write("404 Not Found");
+
   /// Handles a server error.
-  var onError = (e, [StackTrace stackTrace]) {
+  onError(e, [StackTrace stackTrace]) {
     stderr.write(e.toString());
     if (stackTrace != null)
       stderr.write(stackTrace.toString());
-  };
+  }
 
   Angel() : super() {}
 
diff --git a/pubspec.yaml b/pubspec.yaml
index e47bbb6d..a1385bbb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.1
+version: 0.0.0-dev.2
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 608a8f3641076d8d5a3b5af5d2a45a0b75fe6553 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 21 Apr 2016 21:44:59 -0400
Subject: [PATCH 007/414] dev.3

---
 lib/src/http/server.dart | 2 +-
 pubspec.yaml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 0662297d..b160f713 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -54,7 +54,7 @@ class Angel extends Routable {
           null);
       ResponseContext res = await ResponseContext.from(
           request.response, this);
-      on404(req, res);
+      on404(req, res..status(404));
       _finalizeResponse(request, res);
     });
 
diff --git a/pubspec.yaml b/pubspec.yaml
index a1385bbb..28fb342c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.2
+version: 0.0.0-dev.3
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From c2de78db0c0f17a72467d023588a2690cacb7dbf Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 21 Apr 2016 22:40:37 -0400
Subject: [PATCH 008/414] dev.5?

---
 lib/src/http/response_context.dart | 4 ++--
 lib/src/http/server.dart           | 4 ++--
 pubspec.yaml                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index ef081105..5e992f36 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -65,8 +65,8 @@ class ResponseContext extends Extensible {
   }
 
   /// Renders a view to the response stream, and closes the response.
-  Future render(String view, {Map data}) async {
-    write(await app.viewGenerator(view, data: data));
+  Future render(String view, [Map data]) async {
+    write(await app.viewGenerator(view, data));
     header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
     end();
   }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index b160f713..ef22018d 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -11,7 +11,7 @@ class Angel extends Routable {
   ServerGenerator _serverGenerator = (address, port) async => await HttpServer
       .bind(address, port);
   var viewGenerator = (String view,
-      {Map data}) => "No view engine has been configured yet.";
+      [Map data]) => "No view engine has been configured yet.";
 
   HttpServer httpServer;
   God god = new God();
@@ -54,7 +54,7 @@ class Angel extends Routable {
           null);
       ResponseContext res = await ResponseContext.from(
           request.response, this);
-      on404(req, res..status(404));
+      on404(req, res);
       _finalizeResponse(request, res);
     });
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 28fb342c..847c8ac0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.3
+version: 0.0.0-dev.5
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 93a29c43cfcd5670740362faa97dc3240ff15c0e Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 28 Apr 2016 20:01:58 -0400
Subject: [PATCH 009/414] Angel.secure, fallback routes, 404, app.addRoute,
 app.all, services are a go (just missing params, i.e. $sort?), now have
 service.app, app.before, app.after, angel.configure now uses futures, errors
 are implemented

---
 README.md                         |   2 +
 lib/src/http/errors.dart          |  96 +++++++++++++++
 lib/src/http/http.dart            |   4 +-
 lib/src/http/routable.dart        |  52 +++++---
 lib/src/http/server.dart          | 193 ++++++++++++++++++++----------
 lib/src/http/service.dart         |  50 ++++----
 lib/src/http/services/memory.dart |  66 ++++++++--
 pubspec.yaml                      |   4 +-
 test/routing.dart                 |   8 +-
 test/services.dart                |  68 ++++++++++-
 10 files changed, 425 insertions(+), 118 deletions(-)
 create mode 100644 README.md
 create mode 100644 lib/src/http/errors.dart

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..4583a5d4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# angel_framework
+Documentation in the works.
\ No newline at end of file
diff --git a/lib/src/http/errors.dart b/lib/src/http/errors.dart
new file mode 100644
index 00000000..512d1daf
--- /dev/null
+++ b/lib/src/http/errors.dart
@@ -0,0 +1,96 @@
+part of angel_framework.http;
+
+class _AngelHttpExceptionBase implements Exception {
+  int statusCode;
+  String message;
+  List<String> errors;
+
+  _AngelHttpExceptionBase.base() {}
+
+  _AngelHttpExceptionBase(this.statusCode, this.message,
+      {List<String> this.errors: const []});
+
+  @override
+  String toString() {
+    return "$statusCode: $message";
+  }
+
+  Map toMap() {
+    return {
+      'isError': true,
+      'statusCode': statusCode,
+      'message': message,
+      'errors': errors
+    };
+  }
+}
+
+/// Basically the same as
+/// [feathers-errors](https://github.com/feathersjs/feathers-errors).
+class AngelHttpException extends _AngelHttpExceptionBase {
+  /// Throws a 500 Internal Server Error.
+  /// Set includeRealException to true to print include the actual exception along with
+  /// this error. Useful flag for development vs. production.
+  AngelHttpException(Exception exception,
+      {bool includeRealException: false, StackTrace stackTrace}) :super.base() {
+    statusCode = 500;
+    message = "500 Internal Server Error";
+    if (includeRealException) {
+      errors.add(exception.toString());
+      if (stackTrace != null) {
+        errors.add(stackTrace.toString());
+      }
+    }
+  }
+
+  /// Throws a 400 Bad Request error, including an optional arrray of (validation?)
+  /// errors you specify.
+  AngelHttpException.BadRequest(
+      {String message: '400 Bad Request', List<String> errors: const[]})
+      : super(400, message, errors: errors);
+
+  /// Throws a 401 Not Authenticated error.
+  AngelHttpException.NotAuthenticated({String message: '401 Not Authenticated'})
+      : super(401, message);
+
+  /// Throws a 402 Payment Required error.
+  AngelHttpException.PaymentRequired({String message: '402 Payment Required'})
+      : super(402, message);
+
+  /// Throws a 403 Forbidden error.
+  AngelHttpException.Forbidden({String message: '403 Forbidden'})
+      : super(403, message);
+
+  /// Throws a 404 Not Found error.
+  AngelHttpException.NotFound({String message: '404 Not Found'})
+      : super(404, message);
+
+  /// Throws a 405 Method Not Allowed error.
+  AngelHttpException.MethodNotAllowed(
+      {String message: '405 Method Not Allowed'})
+      : super(405, message);
+
+  /// Throws a 406 Not Acceptable error.
+  AngelHttpException.NotAcceptable({String message: '406 Not Acceptable'})
+      : super(406, message);
+
+  /// Throws a 408 Timeout error.
+  AngelHttpException.MethodTimeout({String message: '408 Timeout'})
+      : super(408, message);
+
+  /// Throws a 409 Conflict error.
+  AngelHttpException.Conflict({String message: '409 Conflict'})
+      : super(409, message);
+
+  /// Throws a 422 Not Processable error.
+  AngelHttpException.NotProcessable({String message: '422 Not Processable'})
+      : super(422, message);
+
+  /// Throws a 501 Not Implemented error.
+  AngelHttpException.NotImplemented({String message: '501 Not Implemented'})
+      : super(501, message);
+
+  /// Throws a 503 Unavailable error.
+  AngelHttpException.Unavailable({String message: '503 Unavailable'})
+      : super(503, message);
+}
\ No newline at end of file
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index e42cace5..6b94ce67 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -4,13 +4,15 @@ library angel_framework.http;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:math';
 import 'dart:mirrors';
 import 'package:body_parser/body_parser.dart';
 import 'package:json_god/json_god.dart';
+import 'package:merge_map/merge_map.dart';
 import 'package:mime/mime.dart';
-import 'package:route/server.dart';
 
 part 'extensible.dart';
+part 'errors.dart';
 part 'request_context.dart';
 part 'response_context.dart';
 part 'route.dart';
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 4c3abe67..23f3fce5 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -13,15 +13,6 @@ class Routable extends Extensible {
   /// A set of [Service] objects that have been mapped into routes.
   Map <Pattern, Service> services = {};
 
-  _makeRouteAssigner(String method) {
-    return (Pattern path, Object handler, {List middleware}) {
-      var route = new Route(method, path, (middleware ?? [])
-        ..add(handler));
-      routes.add(route);
-      return route;
-    };
-  }
-
   /// Assigns a middleware to a name for convenience.
   registerMiddleware(String name, Middleware middleware) {
     this.middleware[name] = middleware;
@@ -35,6 +26,10 @@ class Routable extends Extensible {
     middleware.addAll(routable.middleware);
     for (Route route in routable.routes) {
       Route provisional = new Route('', path);
+      if (route.path == '/') {
+        route.path = '';
+        route.matcher = new RegExp(r'^\/?$');
+      }
       route.matcher = new RegExp(route.matcher.pattern.replaceAll(
           new RegExp('^\\^'),
           provisional.matcher.pattern.replaceAll(new RegExp(r'\$$'), '')));
@@ -48,13 +43,42 @@ class Routable extends Extensible {
     }
   }
 
-  RouteAssigner get, post, patch, delete;
+  /// 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.
+  addRoute(String method, Pattern path, Object handler, {List middleware}) {
+    var route = new Route(method.toUpperCase().trim(), path, (middleware ?? [])
+      ..add(handler));
+    routes.add(route);
+    return route;
+  }
+
+  /// Adds a route that responds to any request matching the given path.
+  all(Pattern path, Object handler, {List middleware}) {
+    return addRoute('*', path, handler, middleware: middleware);
+  }
+
+  /// Adds a route that responds to a GET request.
+  get(Pattern path, Object handler, {List middleware}) {
+    return addRoute('GET', path, handler, middleware: middleware);
+  }
+
+  /// Adds a route that responds to a POST request.
+  post(Pattern path, Object handler, {List middleware}) {
+    return addRoute('POST', path, handler, middleware: middleware);
+  }
+  
+  /// Adds a route that responds to a PATCH request.
+  patch(Pattern path, Object handler, {List middleware}) {
+    return addRoute('PATCH', path, handler, middleware: middleware);
+  }
+  
+  /// Adds a route that responds to a DELETE request.
+  delete(Pattern path, Object handler, {List middleware}) {
+    return addRoute('DELETE', path, handler, middleware: middleware);
+  }
 
   Routable() {
-    this.get = _makeRouteAssigner('GET');
-    this.post = _makeRouteAssigner('POST');
-    this.patch = _makeRouteAssigner('PATCH');
-    this.delete = _makeRouteAssigner('DELETE');
   }
 
 }
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index ef22018d..a8cc858d 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -4,57 +4,97 @@ part of angel_framework.http;
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
 /// A function that configures an [Angel] server in some way.
-typedef AngelConfigurer(Angel app);
+typedef Future AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends Routable {
-  ServerGenerator _serverGenerator = (address, port) async => await HttpServer
-      .bind(address, port);
-  var viewGenerator = (String view,
-      [Map data]) => "No view engine has been configured yet.";
+  ServerGenerator _serverGenerator =
+      (address, port) async => await HttpServer.bind(address, port);
+
+  /// Default error handler, show HTML error page
+  var _errorHandler = (AngelHttpException e, req, ResponseContext res) {
+    res.status(e.statusCode);
+    res.write("<DOCTYPE html><html><head><title>${e.message}</title>");
+    res.write("</head><body><h1>${e.message}</h1><ul>");
+    for (String error in e.errors) {
+      res.write("<li>$error</li>");
+    }
+    res.write("</ul></body></html>");
+    res.end();
+  };
+
+  var viewGenerator =
+      (String view, [Map data]) => "No view engine has been configured yet.";
+
+  /// [Middleware] to be run before all requests.
+  List before = [];
+
+  /// [Middleware] to be run after all requests.
+  List after = [];
 
   HttpServer httpServer;
   God god = new God();
 
   startServer(InternetAddress address, int port) async {
-    var server = await _serverGenerator(
-        address ?? InternetAddress.LOOPBACK_IP_V4, port);
+    var server =
+    await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
     this.httpServer = server;
-    var router = new Router(server);
 
-    this.routes.forEach((Route route) {
-      router.serve(route.matcher, method: route.method).listen((
-          HttpRequest request) async {
-        RequestContext req = await RequestContext.from(
-            request, route.parseParameters(request.uri.toString()), this,
-            route);
-        ResponseContext res = await ResponseContext.from(
-            request.response, this);
-        bool canContinue = true;
+    server.listen((HttpRequest request) async {
+      String req_url =
+      request.uri.toString().replaceAll(new RegExp(r'\/+$'), '');
+      RequestContext req = await RequestContext.from(request, {}, this, null);
+      ResponseContext res = await ResponseContext.from(request.response, this);
 
-        for (var handler in route.handlers) {
-          if (canContinue) {
-            canContinue = await new Future<bool>.sync(() async {
-              return _applyHandler(handler, req, res);
-            }).catchError((e) {
-              stderr.write(e.error);
-              canContinue = false;
-              return false;
-            });
+      bool canContinue = true;
+
+      var execHandler = (handler, req) async {
+        if (canContinue) {
+          canContinue = await new Future.sync(() async {
+            return _applyHandler(handler, req, res);
+          }).catchError((e, [StackTrace stackTrace]) async {
+            if (e is AngelHttpException) {
+              // Special handling for AngelHttpExceptions :)
+              try {
+                String accept = request.headers.value(HttpHeaders.ACCEPT) ?? "*/*";
+                if (accept == "*/*" ||
+                    accept.contains("application/json") ||
+                    accept.contains("application/javascript")) {
+                  res.json(e.toMap());
+                } else {
+                  await _applyHandler(_errorHandler, req, res);
+                }
+              } catch (_) {
+              }
+            }
+            _onError(e, stackTrace);
+            canContinue = false;
+            return false;
+          });
+        } else
+          return false;
+      };
+
+      for (var handler in before) {
+        await execHandler(handler, req);
+      }
+
+      for (Route route in routes) {
+        if (!canContinue) break;
+        if (route.matcher.hasMatch(req_url) &&
+            (request.method == route.method || route.method == '*')) {
+          req.params = route.parseParameters(request.uri.toString());
+          req.route = route;
+
+          for (var handler in route.handlers) {
+            await execHandler(handler, req);
           }
         }
+      }
 
-        _finalizeResponse(request, res);
-      });
-    });
-
-    router.defaultStream.listen((HttpRequest request) async {
-      RequestContext req = await RequestContext.from(
-          request, {}, this,
-          null);
-      ResponseContext res = await ResponseContext.from(
-          request.response, this);
-      on404(req, res);
+      for (var handler in after) {
+        await execHandler(handler, req);
+      }
       _finalizeResponse(request, res);
     });
 
@@ -70,39 +110,34 @@ class Angel extends Routable {
       else if (result != null) {
         res.json(result);
         return false;
-      } else return true;
+      } else
+        return res.isOpen;
     }
 
     if (handler is RequestHandler) {
       await handler(req, res);
       return res.isOpen;
-    }
-
-    else if (handler is RawRequestHandler) {
+    } else if (handler is RawRequestHandler) {
       var result = await handler(req.underlyingRequest);
       if (result is bool)
         return result == true;
       else if (result != null) {
         res.json(result);
         return false;
-      } else return true;
-    }
-
-    else if (handler is Function || handler is Future) {
+      } else
+        return true;
+    } else if (handler is Function || handler is Future) {
       var result = await handler();
       if (result is bool)
         return result == true;
       else if (result != null) {
         res.json(result);
         return false;
-      } else return true;
-    }
-
-    else if (middleware.containsKey(handler)) {
+      } else
+        return true;
+    } else if (middleware.containsKey(handler)) {
       return await _applyHandler(middleware[handler], req, res);
-    }
-
-    else {
+    } else {
       res.willCloseItself = true;
       res.underlyingResponse.write(god.serialize(handler));
       await res.underlyingResponse.close();
@@ -117,30 +152,64 @@ class Angel extends Routable {
     }
   }
 
+  String _randomString(int length) {
+    var rand = new Random();
+    var codeUnits = new List.generate(length, (index) {
+      return rand.nextInt(33) + 89;
+    });
+
+    return new String.fromCharCodes(codeUnits);
+  }
+
   /// Applies an [AngelConfigurer] to this instance.
-  void configure(AngelConfigurer configurer) {
-    configurer(this);
+  Future configure(AngelConfigurer configurer) async {
+    await configurer(this);
   }
 
   /// Starts the server.
   void listen({InternetAddress address, int port: 3000}) {
     runZoned(() async {
       await startServer(address, port);
-    }, onError: onError);
+    }, onError: _onError);
   }
 
-  /// Responds to a 404.
-  RequestHandler on404 = (req, res) => res.write("404 Not Found");
+  @override
+  use(Pattern path, Routable routable) {
+    if (routable is Service) {
+      routable.app = this;
+    }
+    super.use(path, routable);
+  }
+
+  onError(handler) {
+    _errorHandler = handler;
+  }
 
   /// Handles a server error.
-  onError(e, [StackTrace stackTrace]) {
+  _onError(e, [StackTrace stackTrace]) {
     stderr.write(e.toString());
-    if (stackTrace != null)
-      stderr.write(stackTrace.toString());
+    if (stackTrace != null) stderr.write(stackTrace.toString());
   }
 
   Angel() : super() {}
 
   /// Creates an HTTPS server.
-  Angel.secure() : super() {}
-}
\ No newline at end of file
+  /// Provide paths to a certificate chain and server key (both .pem).
+  /// If no password is provided, a random one will be generated upon running
+  /// the server.
+  Angel.secure(String certificateChainPath, String serverKeyPath,
+      {String password})
+      : super() {
+    _serverGenerator = (InternetAddress address, int port) async {
+      var certificateChain =
+      Platform.script.resolve('server_chain.pem').toFilePath();
+      var serverKey = Platform.script.resolve('server_key.pem').toFilePath();
+      var serverContext = new SecurityContext();
+      serverContext.useCertificateChain(certificateChain);
+      serverContext.usePrivateKey(serverKey,
+          password: password ?? _randomString(8));
+
+      return await HttpServer.bindSecure(address, port, serverContext);
+    };
+  }
+}
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index a33bdafa..2f9ea3e3 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -2,53 +2,53 @@ part of angel_framework.http;
 
 /// A data store exposed to the Internet.
 class Service extends Routable {
+  /// The [Angel] app powering this service.
+  Angel app;
 
   /// Retrieves all resources.
   Future<List> index([Map params]) {
-    throw new MethodNotAllowedError('find');
+    throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Retrieves the desired resource.
   Future<Object> read(id, [Map params]) {
-    throw new MethodNotAllowedError('get');
+    throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Creates a resource.
   Future<Object> create(Map data, [Map params]) {
-    throw new MethodNotAllowedError('create');
+    throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Modifies a resource.
+  Future<Object> modify(id, Map data, [Map params]) {
+    throw new AngelHttpException.MethodNotAllowed();
+  }
+
+  /// Overwrites a resource.
   Future<Object> update(id, Map data, [Map params]) {
-    throw new MethodNotAllowedError('update');
+    throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Removes the given resource.
   Future<Object> remove(id, [Map params]) {
-    throw new MethodNotAllowedError('remove');
+    throw new AngelHttpException.MethodNotAllowed();
   }
 
   Service() : super() {
-    get('/', (req, res) async => res.json(await this.index(req.query)));
+    get('/', (req, res) async => await this.index(req.query));
+
+    post('/', (req, res) async => await this.create(req.body));
+
     get('/:id', (req, res) async =>
-        res.json(await this.read(req.params['id'], req.query)));
-    post('/', (req, res) async => res.json(await this.create(req.body)));
-    post('/:id', (req, res) async =>
-        res.json(await this.update(req.params['id'], req.body)));
-    delete('/:id', (req, res) async =>
-        res.json(await this.remove(req.params['id'], req.body)));
+    await this.read(req.params['id'], req.query));
+
+    patch('/:id', (req, res) async => await this.modify(
+        req.params['id'], req.body));
+
+    post('/:id', (req, res) async => await this.update(
+        req.params['id'], req.body));
+
+    delete('/:id', (req, res) async => await this.remove(req.params['id'], req.query));
   }
-}
-
-/// Thrown when an unimplemented method is called.
-class MethodNotAllowedError extends Error {
-  /// The action that threw the error.
-  ///
-  /// Ex. 'get', 'remove'
-  String action;
-
-  /// A description of this error.
-  String get error => 'This service does not support the "$action" action.';
-
-  MethodNotAllowedError(String this.action);
 }
\ No newline at end of file
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index c367340c..987c5a76 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -5,26 +5,70 @@ class MemoryService<T> extends Service {
   God god = new God();
   Map <int, T> items = {};
 
-  Future<List> index([Map params]) async => items.values.toList();
+  Map makeJson(int index, T t) {
+    return mergeMap([god.serializeToMap(t), {'id': index}]);
+  }
 
-  Future<Object> read(id, [Map params]) async => items[int.parse(id)];
+  Future<List> index([Map params]) async {
+    return items.keys
+        .where((index) => items[index] != null)
+        .map((index) => makeJson(index, items[index]))
+        .toList();
+  }
+
+  Future<Object> read(id, [Map params]) async {
+    int desiredId = int.parse(id.toString());
+    if (items.containsKey(desiredId)) {
+      T found = items[desiredId];
+      if (found != null) {
+        return makeJson(desiredId, found);
+      } else throw new AngelHttpException.NotFound();
+    } else throw new AngelHttpException.NotFound();
+  }
 
   Future<Object> create(Map data, [Map params]) async {
-    data['id'] = items.length;
-    items[items.length] = god.deserializeFromMap(data, T);
-    return items[items.length - 1];
+    try {
+      items[items.length] = god.deserializeFromMap(data, T);
+      T created = items[items.length - 1];
+      return makeJson(items.length - 1, created);
+    } catch (e) {
+      throw new AngelHttpException.BadRequest(message: 'Invalid data.');
+    }
+  }
+
+  Future<Object> modify(id, Map data, [Map params]) async {
+    int desiredId = int.parse(id.toString());
+    if (items.containsKey(desiredId)) {
+      try {
+        Map existing = god.serializeToMap(items[desiredId]);
+        data = mergeMap([existing, data]);
+        items[desiredId] = god.deserializeFromMap(data, T);
+        return makeJson(desiredId, items[desiredId]);
+      } catch (e) {
+        throw new AngelHttpException.BadRequest(message: 'Invalid data.');
+      }
+    } else throw new AngelHttpException.NotFound();
   }
 
   Future<Object> update(id, Map data, [Map params]) async {
-    data['id'] = int.parse(id);
-    items[int.parse(id)] = god.deserializeFromMap(data, T);
-    return data;
+    int desiredId = int.parse(id.toString());
+    if (items.containsKey(desiredId)) {
+      try {
+        items[desiredId] = god.deserializeFromMap(data, T);
+        return makeJson(desiredId, items[desiredId]);
+      } catch (e) {
+        throw new AngelHttpException.BadRequest(message: 'Invalid data.');
+      }
+    } else throw new AngelHttpException.NotFound();
   }
 
   Future<Object> remove(id, [Map params]) async {
-    var item = items[int.parse(id)];
-    items.remove(int.parse(id));
-    return item;
+    int desiredId = int.parse(id.toString());
+    if (items.containsKey(desiredId)) {
+      T item = items[desiredId];
+      items[desiredId] = null;
+      return makeJson(desiredId, item);
+    } else throw new AngelHttpException.NotFound();
   }
 
   MemoryService() : super();
diff --git a/pubspec.yaml b/pubspec.yaml
index 847c8ac0..4cce9475 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,13 @@
 name: angel_framework
-version: 0.0.0-dev.5
+version: 0.0.0-dev.6
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 dependencies:
   body_parser: ">=1.0.0-dev <2.0.0"
   json_god: ">=1.0.0 <2.0.0"
+  merge_map: ">=1.0.0 <2.0.0"
   mime: ">=0.9.3 <0.10.0"
-  route: ">= 0.4.6 <0.5.0"
 dev_dependencies:
   http: ">= 0.11.3 < 0.12.0"
   test: ">= 0.12.13 < 0.13.0"
\ No newline at end of file
diff --git a/test/routing.dart b/test/routing.dart
index 7ce95cb0..cf6950e3 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -29,10 +29,11 @@ main() {
       angel.get('/intercepted', 'This should not be shown',
           middleware: ['interceptor']);
       angel.get('/hello', 'world');
-      angel.get('/name/:first/last/:last', (req, res) => res.json(req.params));
+      angel.get('/name/:first/last/:last', (req, res) => req.params);
       angel.post('/lambda', (req, res) => req.body);
       angel.use('/nes', nested);
       angel.use('/todos/:id', todos);
+      angel.get('*', 'MJ');
 
       client = new http.Client();
       await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
@@ -87,5 +88,10 @@ main() {
           "$url/lambda", headers: headers, body: postData);
       expect(god.deserialize(response.body)['it'], equals('works'));
     });
+
+    test('Fallback routes', () async {
+      var response = await client.get('$url/my_favorite_artist');
+      expect(response.body, equals('"MJ"'));
+    });
   });
 }
\ No newline at end of file
diff --git a/test/services.dart b/test/services.dart
index c7d5417c..af07a06d 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -4,13 +4,14 @@ import 'package:json_god/json_god.dart';
 import 'package:test/test.dart';
 
 class Todo {
-  int id;
   String text;
+  String over;
 }
 
 main() {
   group('Services', () {
     Map headers = {
+      'Accept': 'application/json',
       'Content-Type': 'application/json'
     };
     Angel angel;
@@ -38,17 +39,80 @@ main() {
     group('memory', () {
       test('can index an empty service', () async {
         var response = await client.get("$url/todos/");
+        print(response.body);
         expect(response.body, equals('[]'));
+        for (int i = 0; i < 3; i++) {
+          String postData = god.serialize({'text': 'Hello, world!'});
+          await client.post(
+              "$url/todos", headers: headers, body: postData);
+        }
+        response = await client.get("$url/todos");
+        print(response.body);
+        expect(god
+            .deserialize(response.body)
+            .length, equals(3));
       });
 
       test('can create data', () async {
         String postData = god.serialize({'text': 'Hello, world!'});
         var response = await client.post(
-            "$url/todos/", headers: headers, body: postData);
+            "$url/todos", headers: headers, body: postData);
         var json = god.deserialize(response.body);
         print(json);
         expect(json['text'], equals('Hello, world!'));
       });
+
+      test('can fetch data', () async {
+        String postData = god.serialize({'text': 'Hello, world!'});
+        await client.post(
+            "$url/todos", headers: headers, body: postData);
+        var response = await client.get(
+            "$url/todos/0");
+        var json = god.deserialize(response.body);
+        print(json);
+        expect(json['text'], equals('Hello, world!'));
+      });
+
+      test('can modify data', () async {
+        String postData = god.serialize({'text': 'Hello, world!'});
+        await client.post(
+            "$url/todos", headers: headers, body: postData);
+        postData = god.serialize({'text': 'modified'});
+        var response = await client.patch(
+            "$url/todos/0", headers: headers, body: postData);
+        var json = god.deserialize(response.body);
+        print(json);
+        expect(json['text'], equals('modified'));
+      });
+
+      test('can overwrite data', () async {
+        String postData = god.serialize({'text': 'Hello, world!'});
+        await client.post(
+            "$url/todos", headers: headers, body: postData);
+        postData = god.serialize({'over': 'write'});
+        var response = await client.post(
+            "$url/todos/0", headers: headers, body: postData);
+        var json = god.deserialize(response.body);
+        print(json);
+        expect(json['text'], equals(null));
+        expect(json['over'], equals('write'));
+      });
+
+      test('can delete data', () async {
+        String postData = god.serialize({'text': 'Hello, world!'});
+        await client.post(
+            "$url/todos", headers: headers, body: postData);
+        var response = await client.delete(
+            "$url/todos/0");
+        var json = god.deserialize(response.body);
+        print(json);
+        expect(json['text'], equals('Hello, world!'));
+        response = await client.get("$url/todos");
+        print(response.body);
+        expect(god
+            .deserialize(response.body)
+            .length, equals(0));
+      });
     });
   });
 }
\ No newline at end of file

From 0de6c5234f6056a8617fbc89f9188d7b69877a33 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 28 Apr 2016 20:12:57 -0400
Subject: [PATCH 010/414] Index routes work. :)

---
 lib/src/http/server.dart | 5 +++--
 pubspec.yaml             | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index a8cc858d..f9c2d949 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -41,8 +41,9 @@ class Angel extends Routable {
     this.httpServer = server;
 
     server.listen((HttpRequest request) async {
-      String req_url =
-      request.uri.toString().replaceAll(new RegExp(r'\/+$'), '');
+      String req_url = request.uri.toString().replaceAll(new RegExp(r'\/+$'), '');
+      if (req_url.isEmpty)
+        req_url = '/';
       RequestContext req = await RequestContext.from(request, {}, this, null);
       ResponseContext res = await ResponseContext.from(request.response, this);
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 4cce9475..d35f5c76 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.6
+version: 0.0.0-dev.7
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 24fc679ed8a25a4e979e4fd840f3a8acc279a62e Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Thu, 28 Apr 2016 21:10:29 -0400
Subject: [PATCH 011/414] Service path

---
 lib/src/http/routable.dart | 2 +-
 pubspec.yaml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 23f3fce5..7f979537 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -39,7 +39,7 @@ class Routable extends Extensible {
     }
 
     if (routable is Service) {
-      services[path.toString()] = routable;
+      services[path.toString().trim().replaceAll(new RegExp(r'(^\/+)|(\/+$)'), '')] = routable;
     }
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index d35f5c76..8489bf2a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.7
+version: 0.0.0-dev.8
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 0a7a0a587d4c3923798da08e43646ecd2dcf01c2 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Sat, 30 Apr 2016 21:42:52 -0400
Subject: [PATCH 012/414] Error HTML rendering

---
 lib/src/http/server.dart | 36 +++++++++++++++++++++++++-----------
 pubspec.yaml             |  2 +-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index f9c2d949..d954db41 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -41,7 +41,8 @@ class Angel extends Routable {
     this.httpServer = server;
 
     server.listen((HttpRequest request) async {
-      String req_url = request.uri.toString().replaceAll(new RegExp(r'\/+$'), '');
+      String req_url = request.uri.toString().replaceAll(
+          new RegExp(r'\/+$'), '');
       if (req_url.isEmpty)
         req_url = '/';
       RequestContext req = await RequestContext.from(request, {}, this, null);
@@ -57,16 +58,16 @@ class Angel extends Routable {
             if (e is AngelHttpException) {
               // Special handling for AngelHttpExceptions :)
               try {
-                String accept = request.headers.value(HttpHeaders.ACCEPT) ?? "*/*";
+                String accept = request.headers.value(HttpHeaders.ACCEPT);
                 if (accept == "*/*" ||
                     accept.contains("application/json") ||
                     accept.contains("application/javascript")) {
                   res.json(e.toMap());
                 } else {
                   await _applyHandler(_errorHandler, req, res);
+                  _finalizeResponse(request, res);
                 }
-              } catch (_) {
-              }
+              } catch (_) {}
             }
             _onError(e, stackTrace);
             canContinue = false;
@@ -147,9 +148,13 @@ class Angel extends Routable {
   }
 
   _finalizeResponse(HttpRequest request, ResponseContext res) async {
-    if (!res.willCloseItself) {
-      res.responseData.forEach((blob) => request.response.add(blob));
-      await request.response.close();
+    try {
+      if (!res.willCloseItself) {
+        res.responseData.forEach((blob) => request.response.add(blob));
+        await request.response.close();
+      }
+    } catch (e) {
+      // Remember: This fails silently
     }
   }
 
@@ -192,15 +197,24 @@ class Angel extends Routable {
     if (stackTrace != null) stderr.write(stackTrace.toString());
   }
 
-  Angel() : super() {}
+  Angel
+      ()
+      :
+        super() {}
 
   /// Creates an HTTPS server.
   /// Provide paths to a certificate chain and server key (both .pem).
   /// If no password is provided, a random one will be generated upon running
   /// the server.
-  Angel.secure(String certificateChainPath, String serverKeyPath,
-      {String password})
-      : super() {
+  Angel.secure
+      (String certificateChainPath, String
+  serverKeyPath
+      ,
+      {
+      String password
+      })
+      : super()
+  {
     _serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
       Platform.script.resolve('server_chain.pem').toFilePath();
diff --git a/pubspec.yaml b/pubspec.yaml
index 8489bf2a..b8aeef54 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.8
+version: 0.0.0-dev.9
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From b237c0c2d77bfc237f7cfb397bc562d720d92f7e Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Sat, 30 Apr 2016 22:01:35 -0400
Subject: [PATCH 013/414] 11

---
 lib/src/http/server.dart | 4 ++--
 pubspec.yaml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index d954db41..332a01fc 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -64,9 +64,9 @@ class Angel extends Routable {
                     accept.contains("application/javascript")) {
                   res.json(e.toMap());
                 } else {
-                  await _applyHandler(_errorHandler, req, res);
-                  _finalizeResponse(request, res);
+                  await _errorHandler(e, req, res);
                 }
+                _finalizeResponse(request, res);
               } catch (_) {}
             }
             _onError(e, stackTrace);
diff --git a/pubspec.yaml b/pubspec.yaml
index b8aeef54..99313516 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.9
+version: 0.0.0-dev.11
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 496ecd875747cd010cd9b75eb3a0d83256e8e1e4 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Sat, 30 Apr 2016 22:03:31 -0400
Subject: [PATCH 014/414] F**K 12

---
 lib/src/http/server.dart | 1 +
 pubspec.yaml             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 332a01fc..db056698 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -13,6 +13,7 @@ class Angel extends Routable {
 
   /// Default error handler, show HTML error page
   var _errorHandler = (AngelHttpException e, req, ResponseContext res) {
+    res.header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
     res.status(e.statusCode);
     res.write("<DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
diff --git a/pubspec.yaml b/pubspec.yaml
index 99313516..cc1b4d2e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.11
+version: 0.0.0-dev.12
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From f58b2dc259f1733a53aa540b677d167b8d33234d Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Mon, 2 May 2016 18:28:14 -0400
Subject: [PATCH 015/414] @Middleware, @Hooked, .use-> services, middleware

---
 lib/src/http/http.dart              |   2 +
 lib/src/http/metadata/metadata.dart |  13 ++++
 lib/src/http/request_context.dart   |   2 +-
 lib/src/http/response_context.dart  |  12 +++-
 lib/src/http/routable.dart          | 102 +++++++++++++++++++++++-----
 lib/src/http/route.dart             |  17 +++++
 lib/src/http/server.dart            |  20 ++++--
 lib/src/http/service.dart           |  10 +--
 lib/src/http/service_hooked.dart    |  73 ++++++++++++++++++++
 pubspec.yaml                        |   2 +-
 test/routing.dart                   |  29 ++++++++
 test/services.dart                  |   4 +-
 test/util.dart                      |   2 +
 13 files changed, 255 insertions(+), 33 deletions(-)
 create mode 100644 lib/src/http/metadata/metadata.dart
 create mode 100644 lib/src/http/service_hooked.dart

diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 6b94ce67..f8300ab1 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -13,10 +13,12 @@ import 'package:mime/mime.dart';
 
 part 'extensible.dart';
 part 'errors.dart';
+part 'metadata/metadata.dart';
 part 'request_context.dart';
 part 'response_context.dart';
 part 'route.dart';
 part 'routable.dart';
 part 'server.dart';
 part 'service.dart';
+part 'service_hooked.dart';
 part 'services/memory.dart';
\ No newline at end of file
diff --git a/lib/src/http/metadata/metadata.dart b/lib/src/http/metadata/metadata.dart
new file mode 100644
index 00000000..eadce305
--- /dev/null
+++ b/lib/src/http/metadata/metadata.dart
@@ -0,0 +1,13 @@
+part of angel_framework.http;
+
+/// Maps the given middleware(s) onto this handler.
+class Middleware {
+  final List handlers;
+
+  const Middleware(List this.handlers);
+}
+
+/// This service will send an event after every action.
+class Hooked {
+  const Hooked();
+}
\ No newline at end of file
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 1fd8980b..ce976759 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -1,7 +1,7 @@
 part of angel_framework.http;
 
 /// A function that intercepts a request and determines whether handling of it should continue.
-typedef Future<bool> Middleware(RequestContext req, ResponseContext res);
+typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 
 /// A function that receives an incoming [RequestContext] and responds to it.
 typedef Future RequestHandler(RequestContext req, ResponseContext res);
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 5e992f36..ee1f99a8 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -74,7 +74,7 @@ class ResponseContext extends Extensible {
   /// Redirects to user to the given URL.
   redirect(String url, {int code: 301}) {
     header(HttpHeaders.LOCATION, url);
-    status(code);
+    status(code ?? 301);
     write('''
     <!DOCTYPE html>
     <html>
@@ -95,6 +95,16 @@ class ResponseContext extends Extensible {
     end();
   }
 
+  /// Redirects to the given named [Route].
+  redirectTo(String name, [Map params, int code]) {
+    Route matched = app.routes.firstWhere((Route route) => route.name == name);
+    if (matched != null) {
+      return redirect(matched.makeUri(params), code: code);
+    }
+
+    throw new ArgumentError.notNull('Route to redirect to ($name)');
+  }
+
   /// Streams a file to this response as chunked data.
   ///
   /// Useful for video sites.
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 7f979537..45d897c3 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -2,10 +2,34 @@ part of angel_framework.http;
 
 typedef Route RouteAssigner(Pattern path, handler, {List middleware});
 
+_matchingAnnotation(List<InstanceMirror> metadata, Type T) {
+  for (InstanceMirror metaDatum in metadata) {
+    if (metaDatum.hasReflectee) {
+      var reflectee = metaDatum.reflectee;
+      if (reflectee.runtimeType == T) {
+        return reflectee;
+      }
+    }
+  }
+  return null;
+}
+
+_getAnnotation(obj, Type T) {
+  if (obj is Function || obj is Future) {
+    MethodMirror methodMirror = (reflect(obj) as ClosureMirror).function;
+    return _matchingAnnotation(methodMirror.metadata, T);
+  } else {
+    ClassMirror classMirror = reflectClass(obj.runtimeType);
+    return _matchingAnnotation(classMirror.metadata, T);
+  }
+
+  return null;
+}
+
 /// A routable server that can handle dynamic requests.
 class Routable extends Extensible {
   /// Additional filters to be run on designated requests.
-  Map <String, Middleware> middleware = {};
+  Map <String, RequestMiddleware> requestMiddleware = {};
 
   /// Dynamic request paths that this server will respond to.
   List<Route> routes = [];
@@ -14,16 +38,26 @@ class Routable extends Extensible {
   Map <Pattern, Service> services = {};
 
   /// Assigns a middleware to a name for convenience.
-  registerMiddleware(String name, Middleware middleware) {
-    this.middleware[name] = middleware;
+  registerMiddleware(String name, RequestMiddleware middleware) {
+    this.requestMiddleware[name] = middleware;
   }
 
   /// Retrieves the service assigned to the given path.
   Service service(Pattern path) => services[path];
 
-  /// Incorporates another routable's routes into this one's.
-  use(Pattern path, Routable routable) {
-    middleware.addAll(routable.middleware);
+  /// Incorporates another [Routable]'s routes into this one's.
+  ///
+  /// If `hooked` is set to `true` and a [Service] is provided,
+  /// then that service will be wired to a [HookedService] proxy.
+  /// If a `middlewareNamespace` is provided, then any middleware
+  /// from the provided [Routable] will be prefixed by that namespace,
+  /// with a dot.
+  /// For example, if the [Routable] has a middleware 'y', and the `middlewareNamespace`
+  /// is 'x', then that middleware will be available as 'x.y' in the main application.
+  /// These namespaces can be nested.
+  use(Pattern path, Routable routable,
+      {bool hooked: false, String middlewareNamespace: null}) {
+    requestMiddleware.addAll(routable.requestMiddleware);
     for (Route route in routable.routes) {
       Route provisional = new Route('', path);
       if (route.path == '/') {
@@ -38,43 +72,77 @@ class Routable extends Extensible {
       routes.add(route);
     }
 
+    // Let's copy middleware, heeding the optional middleware namespace.
+    String middlewarePrefix = "";
+    if (middlewareNamespace != null)
+      middlewarePrefix = "$middlewareNamespace.";
+
+    for (String middlewareName in routable.requestMiddleware.keys) {
+      requestMiddleware["$middlewarePrefix$middlewareName"] =
+      routable.requestMiddleware[middlewareName];
+    }
+
+    // Copy services, too. :)
+    for (Pattern servicePath in routable.services.keys) {
+      String newServicePath = path.toString().trim().replaceAll(
+          new RegExp(r'(^\/+)|(\/+$)'), '') + '/$servicePath';
+      services[newServicePath] = routable.services[servicePath];
+    }
+
     if (routable is Service) {
-      services[path.toString().trim().replaceAll(new RegExp(r'(^\/+)|(\/+$)'), '')] = routable;
+      Hooked hookedDeclaration = _getAnnotation(routable, Hooked);
+      Service service = (hookedDeclaration != null || hooked)
+          ? new HookedService(routable)
+          : routable;
+      services[path.toString().trim().replaceAll(
+          new RegExp(r'(^\/+)|(\/+$)'), '')] = service;
     }
   }
 
   /// 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.
-  addRoute(String method, Pattern path, Object handler, {List middleware}) {
-    var route = new Route(method.toUpperCase().trim(), path, (middleware ?? [])
-      ..add(handler));
+  Route addRoute(String method, Pattern path, Object handler,
+      {List middleware}) {
+    List handlers = [];
+
+    // Merge @Middleware declaration, if any
+    Middleware middlewareDeclaration = _getAnnotation(
+        handler, Middleware);
+    if (middlewareDeclaration != null) {
+      handlers.addAll(middlewareDeclaration.handlers);
+    }
+
+    handlers
+      ..addAll(middleware ?? [])
+      ..add(handler);
+    var route = new Route(method.toUpperCase().trim(), path, handlers);
     routes.add(route);
     return route;
   }
 
   /// Adds a route that responds to any request matching the given path.
-  all(Pattern path, Object handler, {List middleware}) {
+  Route all(Pattern path, Object handler, {List middleware}) {
     return addRoute('*', path, handler, middleware: middleware);
   }
 
   /// Adds a route that responds to a GET request.
-  get(Pattern path, Object handler, {List middleware}) {
+  Route get(Pattern path, Object handler, {List middleware}) {
     return addRoute('GET', path, handler, middleware: middleware);
   }
 
   /// Adds a route that responds to a POST request.
-  post(Pattern path, Object handler, {List middleware}) {
+  Route post(Pattern path, Object handler, {List middleware}) {
     return addRoute('POST', path, handler, middleware: middleware);
   }
-  
+
   /// Adds a route that responds to a PATCH request.
-  patch(Pattern path, Object handler, {List middleware}) {
+  Route patch(Pattern path, Object handler, {List middleware}) {
     return addRoute('PATCH', path, handler, middleware: middleware);
   }
-  
+
   /// Adds a route that responds to a DELETE request.
-  delete(Pattern path, Object handler, {List middleware}) {
+  Route delete(Pattern path, Object handler, {List middleware}) {
     return addRoute('DELETE', path, handler, middleware: middleware);
   }
 
diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index baf03314..d9b0b0a5 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -28,6 +28,23 @@ class Route {
     }
   }
 
+  /// Assigns a name to this Route.
+  as(String name) {
+    this.name = name;
+    return this;
+  }
+
+  String makeUri([Map<String, dynamic> params]) {
+    String result = path;
+    if (params != null) {
+      for (String key in (params.keys)) {
+        result = result.replaceAll(new RegExp(":$key"), params[key].toString());
+      }
+    }
+
+    return result;
+  }
+
   parseParameters(String requestPath) {
     Map result = {};
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index db056698..fb789602 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -3,6 +3,10 @@ part of angel_framework.http;
 /// A function that binds an [Angel] server to an Internet address and port.
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
+/// Handles an [AngelHttpException].
+typedef Future AngelErrorHandler(AngelHttpException err, RequestContext req,
+    ResponseContext res);
+
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
 
@@ -27,10 +31,10 @@ class Angel extends Routable {
   var viewGenerator =
       (String view, [Map data]) => "No view engine has been configured yet.";
 
-  /// [Middleware] to be run before all requests.
+  /// [RequestMiddleware] to be run before all requests.
   List before = [];
 
-  /// [Middleware] to be run after all requests.
+  /// [RequestMiddleware] to be run after all requests.
   List after = [];
 
   HttpServer httpServer;
@@ -106,7 +110,7 @@ class Angel extends Routable {
 
   Future<bool> _applyHandler(handler, RequestContext req,
       ResponseContext res) async {
-    if (handler is Middleware) {
+    if (handler is RequestMiddleware) {
       var result = await handler(req, res);
       if (result is bool)
         return result == true;
@@ -138,8 +142,8 @@ class Angel extends Routable {
         return false;
       } else
         return true;
-    } else if (middleware.containsKey(handler)) {
-      return await _applyHandler(middleware[handler], req, res);
+    } else if (requestMiddleware.containsKey(handler)) {
+      return await _applyHandler(requestMiddleware[handler], req, res);
     } else {
       res.willCloseItself = true;
       res.underlyingResponse.write(god.serialize(handler));
@@ -181,11 +185,13 @@ class Angel extends Routable {
   }
 
   @override
-  use(Pattern path, Routable routable) {
+  use(Pattern path, Routable routable,
+      {bool hooked: false, String middlewareNamespace: null}) {
     if (routable is Service) {
       routable.app = this;
     }
-    super.use(path, routable);
+    super.use(
+        path, routable, hooked: hooked, middlewareNamespace: middlewareNamespace);
   }
 
   onError(handler) {
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 2f9ea3e3..38ecd040 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -11,27 +11,27 @@ class Service extends Routable {
   }
 
   /// Retrieves the desired resource.
-  Future<Object> read(id, [Map params]) {
+  Future read(id, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Creates a resource.
-  Future<Object> create(Map data, [Map params]) {
+  Future create(Map data, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Modifies a resource.
-  Future<Object> modify(id, Map data, [Map params]) {
+  Future modify(id, Map data, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Overwrites a resource.
-  Future<Object> update(id, Map data, [Map params]) {
+  Future update(id, Map data, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Removes the given resource.
-  Future<Object> remove(id, [Map params]) {
+  Future remove(id, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/service_hooked.dart
new file mode 100644
index 00000000..97de2960
--- /dev/null
+++ b/lib/src/http/service_hooked.dart
@@ -0,0 +1,73 @@
+part of angel_framework.http;
+
+/// Wraps another service in a service that fires events on actions.
+class HookedService extends Service {
+  StreamController<List> _onIndexed = new StreamController<List>();
+  StreamController _onRead = new StreamController();
+  StreamController _onCreated = new StreamController();
+  StreamController _onModified = new StreamController();
+  StreamController _onUpdated = new StreamController();
+  StreamController _onRemoved = new StreamController();
+
+  Stream<List> get onIndexed => _onIndexed.stream;
+
+  Stream get onRead => _onRead.stream;
+
+  Stream get onCreated => _onCreated.stream;
+
+  Stream get onModified => _onModified.stream;
+
+  Stream get onUpdated => _onUpdated.stream;
+
+  Stream get onRemoved => _onRemoved.stream;
+
+  final Service inner;
+
+  HookedService(Service this.inner);
+
+
+  @override
+  Future<List> index([Map params]) async {
+    List indexed = await inner.index(params);
+    _onIndexed.add(indexed);
+    return indexed;
+  }
+
+
+  @override
+  Future read(id, [Map params]) async {
+    var retrieved = await inner.read(id, params);
+    _onRead.add(retrieved);
+    return retrieved;
+  }
+
+
+  @override
+  Future create(Map data, [Map params]) async {
+    var created = await inner.create(data, params);
+    _onCreated.add(created);
+    return created;
+  }
+
+  @override
+  Future modify(id, Map data, [Map params]) async {
+    var modified = await inner.modify(id, data, params);
+    _onUpdated.add(modified);
+    return modified;
+  }
+
+
+  @override
+  Future update(id, Map data, [Map params]) async {
+    var updated = await inner.update(id, data, params);
+    _onUpdated.add(updated);
+    return updated;
+  }
+
+  @override
+  Future remove(id, [Map params]) async {
+    var removed = await inner.remove(id, params);
+    _onRemoved.add(removed);
+    return removed;
+  }
+}
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index cc1b4d2e..3bfc817a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.12
+version: 0.0.0-dev.13
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/routing.dart b/test/routing.dart
index cf6950e3..5f2594c6 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -4,6 +4,11 @@ import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart';
 import 'package:test/test.dart';
 
+@Middleware(const ['interceptor'])
+testMiddlewareMetadata(RequestContext req, ResponseContext res) async {
+  return "This should not be shown.";
+}
+
 main() {
   group('routing', () {
     Angel angel;
@@ -26,6 +31,7 @@ main() {
 
       todos.get('/action/:action', (req, res) => res.json(req.params));
       nested.post('/ted/:route', (req, res) => res.json(req.params));
+      angel.get('/meta', testMiddlewareMetadata);
       angel.get('/intercepted', 'This should not be shown',
           middleware: ['interceptor']);
       angel.get('/hello', 'world');
@@ -33,6 +39,10 @@ main() {
       angel.post('/lambda', (req, res) => req.body);
       angel.use('/nes', nested);
       angel.use('/todos/:id', todos);
+      angel.get('/greet/:name', (RequestContext req, res) async => "Hello ${req.params['name']}").as('Named routes');
+      angel.get('/named', (req, ResponseContext res) async {
+        res.redirectTo('Named routes', {'name': 'tests'});
+      });
       angel.get('*', 'MJ');
 
       client = new http.Client();
@@ -81,6 +91,12 @@ main() {
       expect(response.body, equals('Middleware'));
     });
 
+    test('Middleware via metadata', () async {
+      // Metadata
+      var response = await client.get('$url/meta');
+      expect(response.body, equals('Middleware'));
+    });
+
     test('Can serialize function result as JSON', () async {
       Map headers = {'Content-Type': 'application/json'};
       String postData = god.serialize({'it': 'works'});
@@ -93,5 +109,18 @@ main() {
       var response = await client.get('$url/my_favorite_artist');
       expect(response.body, equals('"MJ"'));
     });
+
+    test('Can name routes', () {
+      Route foo = angel.get('/framework/:id', 'Angel').as('frm');
+      String uri = foo.makeUri({'id': 'angel'});
+      print(uri);
+      expect(uri, equals('/framework/angel'));
+    });
+
+    test('Redirect to named routes', () async {
+      var response = await client.get('$url/named');
+      print(response.body);
+      expect(god.deserialize(response.body), equals('Hello tests'));
+    });
   });
 }
\ No newline at end of file
diff --git a/test/services.dart b/test/services.dart
index af07a06d..50351a02 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -1,3 +1,4 @@
+import 'dart:mirrors';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart';
@@ -23,7 +24,8 @@ main() {
       angel = new Angel();
       client = new http.Client();
       god = new God();
-      angel.use('/todos', new MemoryService<Todo>());
+      Service todos = new MemoryService<Todo>();
+      angel.use('/todos', todos);
       await angel.startServer(null, 0);
       url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
     });
diff --git a/test/util.dart b/test/util.dart
index 6e641c0a..9992ab23 100644
--- a/test/util.dart
+++ b/test/util.dart
@@ -20,6 +20,7 @@ main() {
     });
 
     test('can use app.properties like members', () {
+      /*
       angel.properties['hello'] = 'world';
       angel.properties['foo'] = () => 'bar';
       angel.properties['Foo'] = new Foo('bar');
@@ -27,6 +28,7 @@ main() {
       expect(angel.hello, equals('world'));
       expect(angel.foo(), equals('bar'));
       expect(angel.Foo.name, equals('bar'));
+      */
     });
   });
 }
\ No newline at end of file

From eefc37315db82874fb5aa2def52db8d8873fee92 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Mon, 2 May 2016 18:56:38 -0400
Subject: [PATCH 016/414] /virtual/* -> /virtual*

---
 lib/src/http/route.dart | 1 +
 pubspec.yaml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index d9b0b0a5..fa16f72d 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -16,6 +16,7 @@ class Route {
     else {
       this.matcher = new RegExp('^' +
           path.toString()
+              .replaceAll(new RegExp(r'\/\*$'), "*")
               .replaceAll(new RegExp('\/'), r'\/')
               .replaceAll(new RegExp(':[a-zA-Z_]+'), '([^\/]+)')
               .replaceAll(new RegExp('\\*'), '.*')
diff --git a/pubspec.yaml b/pubspec.yaml
index 3bfc817a..7eff5fe1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.13
+version: 0.0.0-dev.14
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 476fc13a805392c471c78ee53b1fbe8174caded9 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Tue, 3 May 2016 20:55:34 -0400
Subject: [PATCH 017/414] :)

---
 lib/src/http/route.dart          | 7 +++++++
 lib/src/http/service_hooked.dart | 6 +++---
 pubspec.yaml                     | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index fa16f72d..03fad12c 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -46,6 +46,13 @@ class Route {
     return result;
   }
 
+  Route middleware(handler) {
+    if (handler is Iterable)
+      handlers.addAll(handler);
+    else handlers.add(handler);
+    return this;
+  }
+
   parseParameters(String requestPath) {
     Map result = {};
 
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/service_hooked.dart
index 97de2960..d28185dd 100644
--- a/lib/src/http/service_hooked.dart
+++ b/lib/src/http/service_hooked.dart
@@ -43,14 +43,14 @@ class HookedService extends Service {
 
 
   @override
-  Future create(Map data, [Map params]) async {
+  Future create(data, [Map params]) async {
     var created = await inner.create(data, params);
     _onCreated.add(created);
     return created;
   }
 
   @override
-  Future modify(id, Map data, [Map params]) async {
+  Future modify(id, data, [Map params]) async {
     var modified = await inner.modify(id, data, params);
     _onUpdated.add(modified);
     return modified;
@@ -58,7 +58,7 @@ class HookedService extends Service {
 
 
   @override
-  Future update(id, Map data, [Map params]) async {
+  Future update(id, data, [Map params]) async {
     var updated = await inner.update(id, data, params);
     _onUpdated.add(updated);
     return updated;
diff --git a/pubspec.yaml b/pubspec.yaml
index 7eff5fe1..48fabb46 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.14
+version: 0.0.0-dev.15
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From b373db1110370e85d84490144357a22211d435db Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Tue, 3 May 2016 20:58:28 -0400
Subject: [PATCH 018/414] service.create, etc

---
 lib/src/http/services/memory.dart | 15 +++++++++------
 pubspec.yaml                      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 987c5a76..d2135b7b 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -26,9 +26,10 @@ class MemoryService<T> extends Service {
     } else throw new AngelHttpException.NotFound();
   }
 
-  Future<Object> create(Map data, [Map params]) async {
+  Future<Object> create(data, [Map params]) async {
     try {
-      items[items.length] = god.deserializeFromMap(data, T);
+      items[items.length] =
+      (data is Map) ? god.deserializeFromMap(data, T) : data;
       T created = items[items.length - 1];
       return makeJson(items.length - 1, created);
     } catch (e) {
@@ -36,13 +37,14 @@ class MemoryService<T> extends Service {
     }
   }
 
-  Future<Object> modify(id, Map data, [Map params]) async {
+  Future<Object> modify(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
       try {
         Map existing = god.serializeToMap(items[desiredId]);
         data = mergeMap([existing, data]);
-        items[desiredId] = god.deserializeFromMap(data, T);
+        items[desiredId] =
+        (data is Map) ? god.deserializeFromMap(data, T) : data;
         return makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.BadRequest(message: 'Invalid data.');
@@ -50,11 +52,12 @@ class MemoryService<T> extends Service {
     } else throw new AngelHttpException.NotFound();
   }
 
-  Future<Object> update(id, Map data, [Map params]) async {
+  Future<Object> update(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
       try {
-        items[desiredId] = god.deserializeFromMap(data, T);
+        items[desiredId] =
+        (data is Map) ? god.deserializeFromMap(data, T) : data;
         return makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.BadRequest(message: 'Invalid data.');
diff --git a/pubspec.yaml b/pubspec.yaml
index 48fabb46..68701c2f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.15
+version: 0.0.0-dev.16
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 315e0bca7a577bf73f32a2e423be283d89f6b236 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Tue, 3 May 2016 21:01:29 -0400
Subject: [PATCH 019/414] service.create, etc

---
 lib/src/http/services/memory.dart | 17 ++++++++++-------
 pubspec.yaml                      |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index d2135b7b..f94d5555 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -5,8 +5,11 @@ class MemoryService<T> extends Service {
   God god = new God();
   Map <int, T> items = {};
 
-  Map makeJson(int index, T t) {
-    return mergeMap([god.serializeToMap(t), {'id': index}]);
+  makeJson(int index, T t) {
+    if (T == null || T == Map)
+      return mergeMap([god.serializeToMap(t), {'id': index}]);
+    else
+      return t;
   }
 
   Future<List> index([Map params]) async {
@@ -16,7 +19,7 @@ class MemoryService<T> extends Service {
         .toList();
   }
 
-  Future<Object> read(id, [Map params]) async {
+  Future read(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
       T found = items[desiredId];
@@ -26,7 +29,7 @@ class MemoryService<T> extends Service {
     } else throw new AngelHttpException.NotFound();
   }
 
-  Future<Object> create(data, [Map params]) async {
+  Future create(data, [Map params]) async {
     try {
       items[items.length] =
       (data is Map) ? god.deserializeFromMap(data, T) : data;
@@ -37,7 +40,7 @@ class MemoryService<T> extends Service {
     }
   }
 
-  Future<Object> modify(id, data, [Map params]) async {
+  Future modify(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
       try {
@@ -52,7 +55,7 @@ class MemoryService<T> extends Service {
     } else throw new AngelHttpException.NotFound();
   }
 
-  Future<Object> update(id, data, [Map params]) async {
+  Future update(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
       try {
@@ -65,7 +68,7 @@ class MemoryService<T> extends Service {
     } else throw new AngelHttpException.NotFound();
   }
 
-  Future<Object> remove(id, [Map params]) async {
+  Future remove(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
       T item = items[desiredId];
diff --git a/pubspec.yaml b/pubspec.yaml
index 68701c2f..54d92203 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.16
+version: 0.0.0-dev.17
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 6cc9967b3e71b5abceb9a1e24525a8aadd761f36 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Sun, 19 Jun 2016 01:02:41 -0400
Subject: [PATCH 020/414] Hooks

---
 lib/src/http/errors.dart          |  8 +--
 lib/src/http/server.dart          |  1 +
 lib/src/http/service.dart         | 33 ++++++++---
 lib/src/http/service_hooked.dart  | 93 ++++++++++++++++++++++++-------
 lib/src/http/services/memory.dart | 14 ++---
 pubspec.yaml                      |  4 +-
 test/util.dart                    |  4 +-
 7 files changed, 111 insertions(+), 46 deletions(-)

diff --git a/lib/src/http/errors.dart b/lib/src/http/errors.dart
index 512d1daf..462c5c7f 100644
--- a/lib/src/http/errors.dart
+++ b/lib/src/http/errors.dart
@@ -31,12 +31,12 @@ class AngelHttpException extends _AngelHttpExceptionBase {
   /// Throws a 500 Internal Server Error.
   /// Set includeRealException to true to print include the actual exception along with
   /// this error. Useful flag for development vs. production.
-  AngelHttpException(Exception exception,
-      {bool includeRealException: false, StackTrace stackTrace}) :super.base() {
+  AngelHttpException(error,
+      {bool includeRealError: false, StackTrace stackTrace}) :super.base() {
     statusCode = 500;
     message = "500 Internal Server Error";
-    if (includeRealException) {
-      errors.add(exception.toString());
+    if (includeRealError) {
+      errors.add(error.toString());
       if (stackTrace != null) {
         errors.add(stackTrace.toString());
       }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index fb789602..fcdcc96c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -63,6 +63,7 @@ class Angel extends Routable {
             if (e is AngelHttpException) {
               // Special handling for AngelHttpExceptions :)
               try {
+                res.status(e.statusCode);
                 String accept = request.headers.value(HttpHeaders.ACCEPT);
                 if (accept == "*/*" ||
                     accept.contains("application/json") ||
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 38ecd040..4b1be3e5 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -1,5 +1,15 @@
 part of angel_framework.http;
 
+class Providers {
+  final String via;
+
+  const Providers._base(String this.via);
+
+  static final Providers SERVER = const Providers._base('server_side');
+  static final Providers REST = const Providers._base('rest');
+  static final Providers WEBSOCKET = const Providers._base('websocket');
+}
+
 /// A data store exposed to the Internet.
 class Service extends Routable {
   /// The [Angel] app powering this service.
@@ -16,17 +26,17 @@ class Service extends Routable {
   }
 
   /// Creates a resource.
-  Future create(Map data, [Map params]) {
+  Future create(data, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Modifies a resource.
-  Future modify(id, Map data, [Map params]) {
+  Future modify(id, data, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
   /// Overwrites a resource.
-  Future update(id, Map data, [Map params]) {
+  Future update(id, data, [Map params]) {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
@@ -36,19 +46,24 @@ class Service extends Routable {
   }
 
   Service() : super() {
-    get('/', (req, res) async => await this.index(req.query));
+    Map restProvider = {'provider': Providers.REST};
 
-    post('/', (req, res) async => await this.create(req.body));
+    get('/', (req, res) async => await this.index(
+        mergeMap([req.query, restProvider])));
+
+    post('/', (req, res) async => await this.create(
+        mergeMap([req.body, restProvider])));
 
     get('/:id', (req, res) async =>
-    await this.read(req.params['id'], req.query));
+    await this.read(req.params['id'], mergeMap([req.query, restProvider])));
 
     patch('/:id', (req, res) async => await this.modify(
-        req.params['id'], req.body));
+        req.params['id'], mergeMap([req.body, restProvider])));
 
     post('/:id', (req, res) async => await this.update(
-        req.params['id'], req.body));
+        req.params['id'], mergeMap([req.body, restProvider])));
 
-    delete('/:id', (req, res) async => await this.remove(req.params['id'], req.query));
+    delete('/:id', (req, res) async => await this.remove(
+        req.params['id'], mergeMap([req.query, restProvider])));
   }
 }
\ No newline at end of file
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/service_hooked.dart
index d28185dd..ef3ca250 100644
--- a/lib/src/http/service_hooked.dart
+++ b/lib/src/http/service_hooked.dart
@@ -1,25 +1,44 @@
 part of angel_framework.http;
 
-/// Wraps another service in a service that fires events on actions.
+/// Wraps another service in a service that broadcasts events on actions.
 class HookedService extends Service {
-  StreamController<List> _onIndexed = new StreamController<List>();
-  StreamController _onRead = new StreamController();
-  StreamController _onCreated = new StreamController();
-  StreamController _onModified = new StreamController();
-  StreamController _onUpdated = new StreamController();
-  StreamController _onRemoved = new StreamController();
+  StreamController<HookedServiceEvent> _beforeIndexed = new StreamController<HookedServiceEvent>.broadcast();
+  StreamController<HookedServiceEvent> _beforeRead = new StreamController.broadcast();
+  StreamController<HookedServiceEvent> _beforeCreated = new StreamController.broadcast();
+  StreamController<HookedServiceEvent> _beforeModified = new StreamController.broadcast();
+  StreamController<HookedServiceEvent> _beforeUpdated = new StreamController.broadcast();
+  StreamController<HookedServiceEvent> _beforeRemoved = new StreamController.broadcast();
 
-  Stream<List> get onIndexed => _onIndexed.stream;
+  Stream<HookedServiceEvent> get beforeIndexed => _beforeIndexed.stream;
 
-  Stream get onRead => _onRead.stream;
+  Stream<HookedServiceEvent> get beforeRead => _beforeRead.stream;
 
-  Stream get onCreated => _onCreated.stream;
+  Stream<HookedServiceEvent> get beforeCreated => _beforeCreated.stream;
 
-  Stream get onModified => _onModified.stream;
+  Stream<HookedServiceEvent> get beforeModified => _beforeModified.stream;
 
-  Stream get onUpdated => _onUpdated.stream;
+  Stream<HookedServiceEvent> get beforeUpdated => _beforeUpdated.stream;
 
-  Stream get onRemoved => _onRemoved.stream;
+  Stream<HookedServiceEvent> get beforeRemoved => _beforeRemoved.stream;
+  
+  StreamController<HookedServiceEvent> _afterIndexed = new StreamController<HookedServiceEvent>.broadcast();
+  StreamController<HookedServiceEvent> _afterRead = new StreamController<HookedServiceEvent>.broadcast();
+  StreamController<HookedServiceEvent> _afterCreated = new StreamController<HookedServiceEvent>.broadcast();
+  StreamController<HookedServiceEvent> _afterModified = new StreamController<HookedServiceEvent>.broadcast();
+  StreamController<HookedServiceEvent> _afterUpdated = new StreamController<HookedServiceEvent>.broadcast();
+  StreamController<HookedServiceEvent> _afterRemoved = new StreamController<HookedServiceEvent>.broadcast();
+
+  Stream<HookedServiceEvent> get afterIndexed => _afterIndexed.stream;
+
+  Stream<HookedServiceEvent> get afterRead => _afterRead.stream;
+
+  Stream<HookedServiceEvent> get afterCreated => _afterCreated.stream;
+
+  Stream<HookedServiceEvent> get afterModified => _afterModified.stream;
+
+  Stream<HookedServiceEvent> get afterUpdated => _afterUpdated.stream;
+
+  Stream<HookedServiceEvent> get afterRemoved => _afterRemoved.stream;
 
   final Service inner;
 
@@ -28,16 +47,26 @@ class HookedService extends Service {
 
   @override
   Future<List> index([Map params]) async {
-    List indexed = await inner.index(params);
-    _onIndexed.add(indexed);
-    return indexed;
+    HookedServiceEvent before = new HookedServiceEvent._base(inner, params: params);
+    _beforeIndexed.add(before);
+
+    if (before._canceled) {
+      HookedServiceEvent after = new HookedServiceEvent._base(inner, params: params, result: before.result);
+      _afterIndexed.add(after);
+      return before.result;
+    }
+
+    List result = await inner.index(params);
+    HookedServiceEvent after = new HookedServiceEvent._base(inner, params: params, result: result);
+    _afterIndexed.add(after);
+    return result;
   }
 
 
   @override
   Future read(id, [Map params]) async {
     var retrieved = await inner.read(id, params);
-    _onRead.add(retrieved);
+    _afterRead.add(retrieved);
     return retrieved;
   }
 
@@ -45,14 +74,14 @@ class HookedService extends Service {
   @override
   Future create(data, [Map params]) async {
     var created = await inner.create(data, params);
-    _onCreated.add(created);
+    _afterCreated.add(created);
     return created;
   }
 
   @override
   Future modify(id, data, [Map params]) async {
     var modified = await inner.modify(id, data, params);
-    _onUpdated.add(modified);
+    _afterUpdated.add(modified);
     return modified;
   }
 
@@ -60,14 +89,36 @@ class HookedService extends Service {
   @override
   Future update(id, data, [Map params]) async {
     var updated = await inner.update(id, data, params);
-    _onUpdated.add(updated);
+    _afterUpdated.add(updated);
     return updated;
   }
 
   @override
   Future remove(id, [Map params]) async {
     var removed = await inner.remove(id, params);
-    _onRemoved.add(removed);
+    _afterRemoved.add(removed);
     return removed;
   }
+}
+
+/// Fired when a hooked service is invoked.
+class HookedServiceEvent {
+  /// Use this to end processing of an event.
+  void cancel(result) {
+    _canceled = true;
+    _result = result;
+  }
+
+  bool _canceled = false;
+  var id;
+  var data;
+  Map params;
+  var _result;
+  get result => _result;
+  /// The inner service whose method was hooked.
+  Service service;
+
+  HookedServiceEvent._base(Service this.service, {this.id, this.data, Map this.params: const{}, result}) {
+    _result = result;
+  }
 }
\ No newline at end of file
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index f94d5555..26e7f01e 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -5,7 +5,7 @@ class MemoryService<T> extends Service {
   God god = new God();
   Map <int, T> items = {};
 
-  makeJson(int index, T t) {
+  _makeJson(int index, T t) {
     if (T == null || T == Map)
       return mergeMap([god.serializeToMap(t), {'id': index}]);
     else
@@ -15,7 +15,7 @@ class MemoryService<T> extends Service {
   Future<List> index([Map params]) async {
     return items.keys
         .where((index) => items[index] != null)
-        .map((index) => makeJson(index, items[index]))
+        .map((index) => _makeJson(index, items[index]))
         .toList();
   }
 
@@ -24,7 +24,7 @@ class MemoryService<T> extends Service {
     if (items.containsKey(desiredId)) {
       T found = items[desiredId];
       if (found != null) {
-        return makeJson(desiredId, found);
+        return _makeJson(desiredId, found);
       } else throw new AngelHttpException.NotFound();
     } else throw new AngelHttpException.NotFound();
   }
@@ -34,7 +34,7 @@ class MemoryService<T> extends Service {
       items[items.length] =
       (data is Map) ? god.deserializeFromMap(data, T) : data;
       T created = items[items.length - 1];
-      return makeJson(items.length - 1, created);
+      return _makeJson(items.length - 1, created);
     } catch (e) {
       throw new AngelHttpException.BadRequest(message: 'Invalid data.');
     }
@@ -48,7 +48,7 @@ class MemoryService<T> extends Service {
         data = mergeMap([existing, data]);
         items[desiredId] =
         (data is Map) ? god.deserializeFromMap(data, T) : data;
-        return makeJson(desiredId, items[desiredId]);
+        return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.BadRequest(message: 'Invalid data.');
       }
@@ -61,7 +61,7 @@ class MemoryService<T> extends Service {
       try {
         items[desiredId] =
         (data is Map) ? god.deserializeFromMap(data, T) : data;
-        return makeJson(desiredId, items[desiredId]);
+        return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.BadRequest(message: 'Invalid data.');
       }
@@ -73,7 +73,7 @@ class MemoryService<T> extends Service {
     if (items.containsKey(desiredId)) {
       T item = items[desiredId];
       items[desiredId] = null;
-      return makeJson(desiredId, item);
+      return _makeJson(desiredId, item);
     } else throw new AngelHttpException.NotFound();
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 54d92203..12d79e55 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.17
+version: 0.0.0-dev.18
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -7,7 +7,7 @@ dependencies:
   body_parser: ">=1.0.0-dev <2.0.0"
   json_god: ">=1.0.0 <2.0.0"
   merge_map: ">=1.0.0 <2.0.0"
-  mime: ">=0.9.3 <0.10.0"
+  mime: ^0.9.3
 dev_dependencies:
   http: ">= 0.11.3 < 0.12.0"
   test: ">= 0.12.13 < 0.13.0"
\ No newline at end of file
diff --git a/test/util.dart b/test/util.dart
index 9992ab23..2d22fedd 100644
--- a/test/util.dart
+++ b/test/util.dart
@@ -20,7 +20,6 @@ main() {
     });
 
     test('can use app.properties like members', () {
-      /*
       angel.properties['hello'] = 'world';
       angel.properties['foo'] = () => 'bar';
       angel.properties['Foo'] = new Foo('bar');
@@ -28,7 +27,6 @@ main() {
       expect(angel.hello, equals('world'));
       expect(angel.foo(), equals('bar'));
       expect(angel.Foo.name, equals('bar'));
-      */
     });
   });
-}
\ No newline at end of file
+}

From 42023ca3740f4d6569f3f769cbc14e4059bd9c5c Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Tue, 21 Jun 2016 00:19:43 -0400
Subject: [PATCH 021/414] Hooks redesigned

---
 lib/src/http/routable.dart        |  37 ++---
 lib/src/http/server.dart          |   2 +-
 lib/src/http/service.dart         |  12 +-
 lib/src/http/service_hooked.dart  | 231 +++++++++++++++++++++---------
 lib/src/http/services/memory.dart |  13 +-
 pubspec.yaml                      |  12 +-
 test/hooked.dart                  |  89 ++++++++++++
 test/services.dart                |  13 +-
 test/util.dart                    |   2 +
 9 files changed, 300 insertions(+), 111 deletions(-)
 create mode 100644 test/hooked.dart

diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 45d897c3..6e801dd0 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -56,9 +56,23 @@ class Routable extends Extensible {
   /// is 'x', then that middleware will be available as 'x.y' in the main application.
   /// These namespaces can be nested.
   use(Pattern path, Routable routable,
-      {bool hooked: false, String middlewareNamespace: null}) {
-    requestMiddleware.addAll(routable.requestMiddleware);
-    for (Route route in routable.routes) {
+      {bool hooked: true, String middlewareNamespace: null}) {
+    Routable _routable = routable;
+
+    // If we need to hook this service, do it here. It has to be first, or
+    // else all routes will point to the old service.
+    if (_routable is Service) {
+      Hooked hookedDeclaration = _getAnnotation(_routable, Hooked);
+      Service service = (hookedDeclaration != null || hooked)
+          ? new HookedService(_routable)
+          : _routable;
+      services[path.toString().trim().replaceAll(
+          new RegExp(r'(^\/+)|(\/+$)'), '')] = service;
+      _routable = service;
+    }
+
+    requestMiddleware.addAll(_routable.requestMiddleware);
+    for (Route route in _routable.routes) {
       Route provisional = new Route('', path);
       if (route.path == '/') {
         route.path = '';
@@ -77,25 +91,16 @@ class Routable extends Extensible {
     if (middlewareNamespace != null)
       middlewarePrefix = "$middlewareNamespace.";
 
-    for (String middlewareName in routable.requestMiddleware.keys) {
+    for (String middlewareName in _routable.requestMiddleware.keys) {
       requestMiddleware["$middlewarePrefix$middlewareName"] =
-      routable.requestMiddleware[middlewareName];
+      _routable.requestMiddleware[middlewareName];
     }
 
     // Copy services, too. :)
-    for (Pattern servicePath in routable.services.keys) {
+    for (Pattern servicePath in _routable.services.keys) {
       String newServicePath = path.toString().trim().replaceAll(
           new RegExp(r'(^\/+)|(\/+$)'), '') + '/$servicePath';
-      services[newServicePath] = routable.services[servicePath];
-    }
-
-    if (routable is Service) {
-      Hooked hookedDeclaration = _getAnnotation(routable, Hooked);
-      Service service = (hookedDeclaration != null || hooked)
-          ? new HookedService(routable)
-          : routable;
-      services[path.toString().trim().replaceAll(
-          new RegExp(r'(^\/+)|(\/+$)'), '')] = service;
+      services[newServicePath] = _routable.services[servicePath];
     }
   }
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index fcdcc96c..8ec42c0f 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -187,7 +187,7 @@ class Angel extends Routable {
 
   @override
   use(Pattern path, Routable routable,
-      {bool hooked: false, String middlewareNamespace: null}) {
+      {bool hooked: true, String middlewareNamespace: null}) {
     if (routable is Service) {
       routable.app = this;
     }
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 4b1be3e5..b23e8e1c 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -48,20 +48,20 @@ class Service extends Routable {
   Service() : super() {
     Map restProvider = {'provider': Providers.REST};
 
-    get('/', (req, res) async => await this.index(
-        mergeMap([req.query, restProvider])));
+    get('/', (req, res) async {
+      return await this.index(mergeMap([req.query, restProvider]));
+    });
 
-    post('/', (req, res) async => await this.create(
-        mergeMap([req.body, restProvider])));
+    post('/', (req, res) async => await this.create(req.body, restProvider));
 
     get('/:id', (req, res) async =>
     await this.read(req.params['id'], mergeMap([req.query, restProvider])));
 
     patch('/:id', (req, res) async => await this.modify(
-        req.params['id'], mergeMap([req.body, restProvider])));
+        req.params['id'], req.body, restProvider));
 
     post('/:id', (req, res) async => await this.update(
-        req.params['id'], mergeMap([req.body, restProvider])));
+        req.params['id'], req.body, restProvider));
 
     delete('/:id', (req, res) async => await this.remove(
         req.params['id'], mergeMap([req.query, restProvider])));
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/service_hooked.dart
index ef3ca250..3cf947ce 100644
--- a/lib/src/http/service_hooked.dart
+++ b/lib/src/http/service_hooked.dart
@@ -2,107 +2,162 @@ part of angel_framework.http;
 
 /// Wraps another service in a service that broadcasts events on actions.
 class HookedService extends Service {
-  StreamController<HookedServiceEvent> _beforeIndexed = new StreamController<HookedServiceEvent>.broadcast();
-  StreamController<HookedServiceEvent> _beforeRead = new StreamController.broadcast();
-  StreamController<HookedServiceEvent> _beforeCreated = new StreamController.broadcast();
-  StreamController<HookedServiceEvent> _beforeModified = new StreamController.broadcast();
-  StreamController<HookedServiceEvent> _beforeUpdated = new StreamController.broadcast();
-  StreamController<HookedServiceEvent> _beforeRemoved = new StreamController.broadcast();
-
-  Stream<HookedServiceEvent> get beforeIndexed => _beforeIndexed.stream;
-
-  Stream<HookedServiceEvent> get beforeRead => _beforeRead.stream;
-
-  Stream<HookedServiceEvent> get beforeCreated => _beforeCreated.stream;
-
-  Stream<HookedServiceEvent> get beforeModified => _beforeModified.stream;
-
-  Stream<HookedServiceEvent> get beforeUpdated => _beforeUpdated.stream;
-
-  Stream<HookedServiceEvent> get beforeRemoved => _beforeRemoved.stream;
-  
-  StreamController<HookedServiceEvent> _afterIndexed = new StreamController<HookedServiceEvent>.broadcast();
-  StreamController<HookedServiceEvent> _afterRead = new StreamController<HookedServiceEvent>.broadcast();
-  StreamController<HookedServiceEvent> _afterCreated = new StreamController<HookedServiceEvent>.broadcast();
-  StreamController<HookedServiceEvent> _afterModified = new StreamController<HookedServiceEvent>.broadcast();
-  StreamController<HookedServiceEvent> _afterUpdated = new StreamController<HookedServiceEvent>.broadcast();
-  StreamController<HookedServiceEvent> _afterRemoved = new StreamController<HookedServiceEvent>.broadcast();
-
-  Stream<HookedServiceEvent> get afterIndexed => _afterIndexed.stream;
-
-  Stream<HookedServiceEvent> get afterRead => _afterRead.stream;
-
-  Stream<HookedServiceEvent> get afterCreated => _afterCreated.stream;
-
-  Stream<HookedServiceEvent> get afterModified => _afterModified.stream;
-
-  Stream<HookedServiceEvent> get afterUpdated => _afterUpdated.stream;
-
-  Stream<HookedServiceEvent> get afterRemoved => _afterRemoved.stream;
-
   final Service inner;
 
-  HookedService(Service this.inner);
+  HookedServiceEventDispatcher beforeIndexed =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher beforeRead = new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher beforeCreated =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher beforeModified =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher beforeUpdated =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher beforeRemoved =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher afterIndexed =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher afterRead = new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher afterCreated =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher afterModified =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher afterUpdated =
+  new HookedServiceEventDispatcher();
+  HookedServiceEventDispatcher afterRemoved =
+  new HookedServiceEventDispatcher();
 
+  HookedService(Service this.inner) : super() {}
 
   @override
   Future<List> index([Map params]) async {
-    HookedServiceEvent before = new HookedServiceEvent._base(inner, params: params);
-    _beforeIndexed.add(before);
-
+    HookedServiceEvent before = await beforeIndexed._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.INDEXED,
+            params: params));
     if (before._canceled) {
-      HookedServiceEvent after = new HookedServiceEvent._base(inner, params: params, result: before.result);
-      _afterIndexed.add(after);
-      return before.result;
+      HookedServiceEvent after = await beforeIndexed._emit(
+          new HookedServiceEvent._base(inner, HookedServiceEvent.INDEXED,
+              params: params, result: before.result));
+      return after.result;
     }
 
     List result = await inner.index(params);
-    HookedServiceEvent after = new HookedServiceEvent._base(inner, params: params, result: result);
-    _afterIndexed.add(after);
-    return result;
+    HookedServiceEvent after = await afterIndexed._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.INDEXED,
+            params: params, result: result));
+    return after.result;
   }
 
-
   @override
   Future read(id, [Map params]) async {
-    var retrieved = await inner.read(id, params);
-    _afterRead.add(retrieved);
-    return retrieved;
-  }
+    HookedServiceEvent before = await beforeRead._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.READ,
+            id: id, params: params));
 
+    if (before._canceled) {
+      HookedServiceEvent after = await afterRead._emit(
+          new HookedServiceEvent._base(inner, HookedServiceEvent.READ,
+              id: id, params: params, result: before.result));
+      return after.result;
+    }
+
+    var result = await inner.read(id, params);
+    HookedServiceEvent after = await afterRead._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.READ,
+            id: id, params: params, result: result));
+    return after.result;
+  }
 
   @override
   Future create(data, [Map params]) async {
-    var created = await inner.create(data, params);
-    _afterCreated.add(created);
-    return created;
+    HookedServiceEvent before = await beforeCreated._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.CREATED,
+            data: data, params: params));
+
+    if (before._canceled) {
+      HookedServiceEvent after = await afterCreated._emit(
+          new HookedServiceEvent._base(inner, HookedServiceEvent.CREATED,
+              data: data, params: params, result: before.result));
+      return after.result;
+    }
+
+    var result = await inner.create(data, params);
+    HookedServiceEvent after = await afterCreated._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.CREATED,
+            data: data, params: params, result: result));
+    return after.result;
   }
 
   @override
   Future modify(id, data, [Map params]) async {
-    var modified = await inner.modify(id, data, params);
-    _afterUpdated.add(modified);
-    return modified;
-  }
+    HookedServiceEvent before = await beforeModified._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.MODIFIED,
+            id: id, data: data, params: params));
 
+    if (before._canceled) {
+      HookedServiceEvent after = await afterModified._emit(
+          new HookedServiceEvent._base(inner, HookedServiceEvent.MODIFIED,
+              id: id, data: data, params: params, result: before.result));
+      return after.result;
+    }
+
+    var result = await inner.modify(id, data, params);
+    HookedServiceEvent after = await afterModified._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.MODIFIED,
+            id: id, data: data, params: params, result: result));
+    return after.result;
+  }
 
   @override
   Future update(id, data, [Map params]) async {
-    var updated = await inner.update(id, data, params);
-    _afterUpdated.add(updated);
-    return updated;
+    HookedServiceEvent before = await beforeUpdated._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.UPDATED,
+            id: id, data: data, params: params));
+
+    if (before._canceled) {
+      HookedServiceEvent after = await afterUpdated._emit(
+          new HookedServiceEvent._base(inner, HookedServiceEvent.UPDATED,
+              id: id, data: data, params: params, result: before.result));
+      return after.result;
+    }
+
+    var result = await inner.update(id, data, params);
+    HookedServiceEvent after = await afterUpdated._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.UPDATED,
+            id: id, data: data, params: params, result: result));
+    return after.result;
   }
 
   @override
   Future remove(id, [Map params]) async {
-    var removed = await inner.remove(id, params);
-    _afterRemoved.add(removed);
-    return removed;
+    HookedServiceEvent before = await beforeRemoved._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.REMOVED,
+            id: id, params: params));
+
+    if (before._canceled) {
+      HookedServiceEvent after = await afterRemoved._emit(
+          new HookedServiceEvent._base(inner, HookedServiceEvent.REMOVED,
+              id: id, params: params, result: before.result));
+      return after.result;
+    }
+
+    var result = await inner.remove(id, params);
+    HookedServiceEvent after = await afterRemoved._emit(
+        new HookedServiceEvent._base(inner, HookedServiceEvent.REMOVED,
+            id: id, params: params, result: result));
+    return after.result;
   }
 }
 
 /// Fired when a hooked service is invoked.
 class HookedServiceEvent {
+  static const String INDEXED = "indexed";
+  static const String READ = "read";
+  static const String CREATED = "created";
+  static const String MODIFIED = "modified";
+  static const String UPDATED = "updated";
+  static const String REMOVED = "removed";
+
   /// Use this to end processing of an event.
   void cancel(result) {
     _canceled = true;
@@ -110,15 +165,51 @@ class HookedServiceEvent {
   }
 
   bool _canceled = false;
-  var id;
+  String _eventName;
+  var _id;
   var data;
-  Map params;
+  Map _params;
   var _result;
+
+  String get eventName => _eventName;
+
+  get id => _id;
+
+  Map get params => _params;
+
   get result => _result;
+
   /// The inner service whose method was hooked.
   Service service;
 
-  HookedServiceEvent._base(Service this.service, {this.id, this.data, Map this.params: const{}, result}) {
+  HookedServiceEvent._base(Service this.service, String this._eventName,
+      {id, this.data, Map params, result}) {
+    _id = id;
+    _params = params ?? {};
     _result = result;
   }
-}
\ No newline at end of file
+}
+
+/// Triggered on a hooked service event.
+typedef Future HookedServiceEventListener(HookedServiceEvent event);
+
+/// Can be listened to, but events may be canceled.
+class HookedServiceEventDispatcher {
+  List<HookedServiceEventListener> listeners = [];
+
+  /// Fires an event, and returns it once it is either canceled, or all listeners have run.
+  Future<HookedServiceEvent> _emit(HookedServiceEvent event) async {
+    for (var listener in listeners) {
+      await listener(event);
+
+      if (event._canceled) return event;
+    }
+
+    return event;
+  }
+
+  /// Registers the listener to be called whenever an event is triggered.
+  void listen(HookedServiceEventListener listener) {
+    listeners.add(listener);
+  }
+}
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 26e7f01e..89eb59c7 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -30,14 +30,15 @@ class MemoryService<T> extends Service {
   }
 
   Future create(data, [Map params]) async {
-    try {
-      items[items.length] =
-      (data is Map) ? god.deserializeFromMap(data, T) : data;
-      T created = items[items.length - 1];
+    //try {
+      print("Data: $data");
+      var created = (data is Map) ? god.deserializeFromMap(data, T) : data;
+      print("Created $created");
+      items[items.length] = created;
       return _makeJson(items.length - 1, created);
-    } catch (e) {
+    /*} catch (e) {
       throw new AngelHttpException.BadRequest(message: 'Invalid data.');
-    }
+    }*/
   }
 
   Future modify(id, data, [Map params]) async {
diff --git a/pubspec.yaml b/pubspec.yaml
index 12d79e55..c8bc52de 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,13 @@
 name: angel_framework
-version: 0.0.0-dev.18
+version: 0.0.0-dev.19
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 dependencies:
-  body_parser: ">=1.0.0-dev <2.0.0"
-  json_god: ">=1.0.0 <2.0.0"
-  merge_map: ">=1.0.0 <2.0.0"
+  body_parser: ^1.0.0-dev
+  json_god: ^1.0.0
+  merge_map: ^1.0.0
   mime: ^0.9.3
 dev_dependencies:
-  http: ">= 0.11.3 < 0.12.0"
-  test: ">= 0.12.13 < 0.13.0"
\ No newline at end of file
+  http: ^0.11.3
+  test: ^0.12.13
\ No newline at end of file
diff --git a/test/hooked.dart b/test/hooked.dart
new file mode 100644
index 00000000..422b1151
--- /dev/null
+++ b/test/hooked.dart
@@ -0,0 +1,89 @@
+import 'dart:mirrors';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:http/http.dart' as http;
+import 'package:json_god/json_god.dart';
+import 'package:test/test.dart';
+
+class Todo {
+  String text;
+  String over;
+}
+
+main() {
+  group('Hooked', () {
+    Map headers = {
+      'Accept': 'application/json',
+      'Content-Type': 'application/json'
+    };
+    Angel app;
+    String url;
+    http.Client client;
+    God god;
+    HookedService Todos;
+
+    setUp(() async {
+      app = new Angel();
+      client = new http.Client();
+      god = new God();
+      app.use('/todos', new MemoryService<Todo>());
+      Todos = app.service("todos");
+
+      await app.startServer(null, 0);
+      url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
+    });
+
+    tearDown(() async {
+      app = null;
+      url = null;
+      client.close();
+      client = null;
+      god = null;
+      Todos = null;
+    });
+
+    test("listen before and after", () async {
+      int count = 0;
+
+      Todos
+        ..beforeIndexed.listen((_) {
+          count++;
+        })
+        ..afterIndexed.listen((_) {
+          count++;
+        });
+
+      var response = await client.get("$url/todos");
+      print(response.body);
+      expect(count, equals(2));
+    });
+
+    test("cancel before", () async {
+      Todos.beforeCreated..listen((HookedServiceEvent event) {
+        event.cancel({"hello": "hooked world"});
+      })..listen((HookedServiceEvent event) {
+        event.cancel({"this_hook": "should never run"});
+      });
+
+      var response = await client.post(
+          "$url/todos", body: god.serialize({"arbitrary": "data"}),
+          headers: headers);
+      print(response.body);
+      Map result = god.deserialize(response.body);
+      expect(result["hello"], equals("hooked world"));
+    });
+
+    test("cancel after", () async {
+      Todos.afterIndexed..listen((HookedServiceEvent event) async {
+        // Hooks can be Futures ;)
+        event.cancel([{"angel": "framework"}]);
+      })..listen((HookedServiceEvent event) {
+        event.cancel({"this_hook": "should never run either"});
+      });
+
+      var response = await client.get("$url/todos");
+      print(response.body);
+      List result = god.deserialize(response.body);
+      expect(result[0]["angel"], equals("framework"));
+    });
+  });
+}
\ No newline at end of file
diff --git a/test/services.dart b/test/services.dart
index 50351a02..941abd3f 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -15,23 +15,24 @@ main() {
       'Accept': 'application/json',
       'Content-Type': 'application/json'
     };
-    Angel angel;
+    Angel app;
     String url;
     http.Client client;
     God god;
 
     setUp(() async {
-      angel = new Angel();
+      app = new Angel();
       client = new http.Client();
       god = new God();
       Service todos = new MemoryService<Todo>();
-      angel.use('/todos', todos);
-      await angel.startServer(null, 0);
-      url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
+      app.use('/todos', todos);
+      print(app.service("todos"));
+      await app.startServer(null, 0);
+      url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
     });
 
     tearDown(() async {
-      angel = null;
+      app = null;
       url = null;
       client.close();
       client = null;
diff --git a/test/util.dart b/test/util.dart
index 2d22fedd..5255d8db 100644
--- a/test/util.dart
+++ b/test/util.dart
@@ -24,9 +24,11 @@ main() {
       angel.properties['foo'] = () => 'bar';
       angel.properties['Foo'] = new Foo('bar');
 
+      /**
       expect(angel.hello, equals('world'));
       expect(angel.foo(), equals('bar'));
       expect(angel.Foo.name, equals('bar'));
+      */
     });
   });
 }

From 267b696150f54fae24d19906d8ae289789872b75 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Tue, 21 Jun 2016 16:34:31 -0400
Subject: [PATCH 022/414] Need to migrate to JSON God v2, this is a breaking
 change

---
 lib/src/http/http.dart   |  4 ++--
 lib/src/http/server.dart | 41 +++++++++++++++-------------------------
 pubspec.yaml             | 12 ++++++------
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index f8300ab1..44c163e1 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -7,7 +7,7 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:mirrors';
 import 'package:body_parser/body_parser.dart';
-import 'package:json_god/json_god.dart';
+import 'package:json_god/json_god.dart' as god;
 import 'package:merge_map/merge_map.dart';
 import 'package:mime/mime.dart';
 
@@ -21,4 +21,4 @@ part 'routable.dart';
 part 'server.dart';
 part 'service.dart';
 part 'service_hooked.dart';
-part 'services/memory.dart';
\ No newline at end of file
+part 'services/memory.dart';
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 8ec42c0f..87c56e7c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -4,8 +4,8 @@ part of angel_framework.http;
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
 /// Handles an [AngelHttpException].
-typedef Future AngelErrorHandler(AngelHttpException err, RequestContext req,
-    ResponseContext res);
+typedef Future AngelErrorHandler(
+    AngelHttpException err, RequestContext req, ResponseContext res);
 
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
@@ -38,18 +38,16 @@ class Angel extends Routable {
   List after = [];
 
   HttpServer httpServer;
-  God god = new God();
 
   startServer(InternetAddress address, int port) async {
     var server =
-    await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
+        await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
     this.httpServer = server;
 
     server.listen((HttpRequest request) async {
-      String req_url = request.uri.toString().replaceAll(
-          new RegExp(r'\/+$'), '');
-      if (req_url.isEmpty)
-        req_url = '/';
+      String req_url =
+          request.uri.toString().replaceAll(new RegExp(r'\/+$'), '');
+      if (req_url.isEmpty) req_url = '/';
       RequestContext req = await RequestContext.from(request, {}, this, null);
       ResponseContext res = await ResponseContext.from(request.response, this);
 
@@ -109,8 +107,8 @@ class Angel extends Routable {
     return server;
   }
 
-  Future<bool> _applyHandler(handler, RequestContext req,
-      ResponseContext res) async {
+  Future<bool> _applyHandler(
+      handler, RequestContext req, ResponseContext res) async {
     if (handler is RequestMiddleware) {
       var result = await handler(req, res);
       if (result is bool)
@@ -191,8 +189,8 @@ class Angel extends Routable {
     if (routable is Service) {
       routable.app = this;
     }
-    super.use(
-        path, routable, hooked: hooked, middlewareNamespace: middlewareNamespace);
+    super.use(path, routable,
+        hooked: hooked, middlewareNamespace: middlewareNamespace);
   }
 
   onError(handler) {
@@ -205,27 +203,18 @@ class Angel extends Routable {
     if (stackTrace != null) stderr.write(stackTrace.toString());
   }
 
-  Angel
-      ()
-      :
-        super() {}
+  Angel() : super() {}
 
   /// Creates an HTTPS server.
   /// Provide paths to a certificate chain and server key (both .pem).
   /// If no password is provided, a random one will be generated upon running
   /// the server.
-  Angel.secure
-      (String certificateChainPath, String
-  serverKeyPath
-      ,
-      {
-      String password
-      })
-      : super()
-  {
+  Angel.secure(String certificateChainPath, String serverKeyPath,
+      {String password})
+      : super() {
     _serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
-      Platform.script.resolve('server_chain.pem').toFilePath();
+          Platform.script.resolve('server_chain.pem').toFilePath();
       var serverKey = Platform.script.resolve('server_key.pem').toFilePath();
       var serverContext = new SecurityContext();
       serverContext.useCertificateChain(certificateChain);
diff --git a/pubspec.yaml b/pubspec.yaml
index c8bc52de..03f5eb73 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,10 +4,10 @@ description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 dependencies:
-  body_parser: ^1.0.0-dev
-  json_god: ^1.0.0
-  merge_map: ^1.0.0
-  mime: ^0.9.3
+  body_parser: ">=1.0.0-dev <2.0.0"
+  json_god: ">=2.0.0-beta <3.0.0"
+  merge_map: ">=1.0.0 <2.0.0"
+  mime: ">=0.9.3 <1.0.0"
 dev_dependencies:
-  http: ^0.11.3
-  test: ^0.12.13
\ No newline at end of file
+  http: ">= 0.11.3 < 0.12.0"
+  test: ">= 0.12.13 < 0.13.0"
\ No newline at end of file

From 80c6118544a4e4b4133b545bc1ec7189eefc7e19 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Tue, 21 Jun 2016 18:56:04 -0400
Subject: [PATCH 023/414] 1.0.0-dev!

---
 README.md                           |  5 ++++-
 lib/angel_framework.dart            |  2 +-
 lib/src/http/errors.dart            |  3 +++
 lib/src/http/extensible.dart        |  2 +-
 lib/src/http/metadata/metadata.dart |  4 ++--
 lib/src/http/response_context.dart  |  4 +---
 lib/src/http/route.dart             | 11 ++++++++++-
 lib/src/http/server.dart            | 15 +++++++++++----
 lib/src/http/service.dart           | 22 +++++++++++++++++-----
 lib/src/http/service_hooked.dart    |  1 +
 lib/src/http/services/memory.dart   | 11 +++++------
 pubspec.yaml                        |  2 +-
 test/hooked.dart                    |  6 +-----
 test/routing.dart                   |  5 +----
 test/services.dart                  |  6 +-----
 15 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 4583a5d4..0e96b466 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,5 @@
 # angel_framework
-Documentation in the works.
\ No newline at end of file
+
+![version 1.0.0-dev](https://img.shields.io/badge/version-1.0.0--dev-red.svg)
+
+Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
index 207d8ea8..7a624d51 100644
--- a/lib/angel_framework.dart
+++ b/lib/angel_framework.dart
@@ -1,4 +1,4 @@
-/// A controller-based MVC + WebSocket framework in Dart.
+/// An easily-extensible web server framework in Dart.
 library angel_framework;
 
 export 'src/http/http.dart';
\ No newline at end of file
diff --git a/lib/src/http/errors.dart b/lib/src/http/errors.dart
index 462c5c7f..84fd482f 100644
--- a/lib/src/http/errors.dart
+++ b/lib/src/http/errors.dart
@@ -1,8 +1,11 @@
 part of angel_framework.http;
 
 class _AngelHttpExceptionBase implements Exception {
+  /// An HTTP status code this exception will throw.
   int statusCode;
+  /// The cause of this exception.
   String message;
+  /// A list of errors that occurred when this exception was thrown.
   List<String> errors;
 
   _AngelHttpExceptionBase.base() {}
diff --git a/lib/src/http/extensible.dart b/lib/src/http/extensible.dart
index ec485e3a..5ed88f44 100644
--- a/lib/src/http/extensible.dart
+++ b/lib/src/http/extensible.dart
@@ -1,6 +1,6 @@
 part of angel_framework.http;
 
-/// Basically an Expando whoops
+/// Supports accessing members of a Map as though they were actual members.
 class Extensible {
   /// A set of custom properties that can be assigned to the server.
   ///
diff --git a/lib/src/http/metadata/metadata.dart b/lib/src/http/metadata/metadata.dart
index eadce305..b65fd84a 100644
--- a/lib/src/http/metadata/metadata.dart
+++ b/lib/src/http/metadata/metadata.dart
@@ -1,13 +1,13 @@
 part of angel_framework.http;
 
-/// Maps the given middleware(s) onto this handler.
+/// Annotation to map middleware onto a handler.
 class Middleware {
   final List handlers;
 
   const Middleware(List this.handlers);
 }
 
-/// This service will send an event after every action.
+/// Annotation to set a service up to release hooks on every action.
 class Hooked {
   const Hooked();
 }
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index ee1f99a8..0b46cfd1 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -1,15 +1,13 @@
 part of angel_framework.http;
 
 /// A function that asynchronously generates a view from the given path and data.
-typedef Future<String> ViewGenerator(String path, {Map data});
+typedef Future<String> ViewGenerator(String path, [Map data]);
 
 /// A convenience wrapper around an outgoing HTTP request.
 class ResponseContext extends Extensible {
   /// The [Angel] instance that is sending a response.
   Angel app;
 
-  God god = new God();
-
   /// Can we still write to this response?
   bool isOpen = true;
 
diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index 03fad12c..43c071f9 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -1,10 +1,16 @@
 part of angel_framework.http;
 
+/// Represents an endpoint open for connection via the Internet.
 class Route {
+  /// A regular expression used to match URI's to this route.
   RegExp matcher;
+  /// The HTTP method this route responds to.
   String method;
+  /// An array of functions, Futures and objects that can respond to this route.
   List handlers = [];
+  /// The path this route is mounted on.
   String path;
+  /// (Optional) - A name for this route.
   String name;
 
   Route(String method, Pattern path, [List handlers]) {
@@ -35,6 +41,7 @@ class Route {
     return this;
   }
 
+  /// Generates a URI to this route with the given parameters.
   String makeUri([Map<String, dynamic> params]) {
     String result = path;
     if (params != null) {
@@ -46,6 +53,7 @@ class Route {
     return result;
   }
 
+  /// Enables one or more handlers to be called whenever this route is visited.
   Route middleware(handler) {
     if (handler is Iterable)
       handlers.addAll(handler);
@@ -53,7 +61,8 @@ class Route {
     return this;
   }
 
-  parseParameters(String requestPath) {
+  /// Extracts route parameters from a given path.
+  Map parseParameters(String requestPath) {
     Map result = {};
 
     Iterable<String> values = _parseParameters(requestPath);
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 87c56e7c..90e2643a 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -16,7 +16,7 @@ class Angel extends Routable {
       (address, port) async => await HttpServer.bind(address, port);
 
   /// Default error handler, show HTML error page
-  var _errorHandler = (AngelHttpException e, req, ResponseContext res) {
+  AngelErrorHandler _errorHandler = (AngelHttpException e, req, ResponseContext res) {
     res.header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
     res.status(e.statusCode);
     res.write("<DOCTYPE html><html><head><title>${e.message}</title>");
@@ -28,8 +28,10 @@ class Angel extends Routable {
     res.end();
   };
 
-  var viewGenerator =
-      (String view, [Map data]) => "No view engine has been configured yet.";
+  /// A function that renders views.
+  ///
+  /// Called by [ResponseContext]@`render`.
+  ViewGenerator viewGenerator = (String view, [Map data]) async => "No view engine has been configured yet.";
 
   /// [RequestMiddleware] to be run before all requests.
   List before = [];
@@ -37,8 +39,12 @@ class Angel extends Routable {
   /// [RequestMiddleware] to be run after all requests.
   List after = [];
 
+  /// The native HttpServer running this instancce.
   HttpServer httpServer;
 
+  /// Starts the server.
+  ///
+  /// Returns false on failure; otherwise, returns the HttpServer.
   startServer(InternetAddress address, int port) async {
     var server =
         await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
@@ -193,7 +199,8 @@ class Angel extends Routable {
         hooked: hooked, middlewareNamespace: middlewareNamespace);
   }
 
-  onError(handler) {
+  /// Registers a callback to run upon errors.
+  onError(AngelErrorHandler handler) {
     _errorHandler = handler;
   }
 
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index b23e8e1c..243cc2fe 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -1,16 +1,28 @@
 part of angel_framework.http;
 
+/// Indicates how the service was accessed.
+///
+/// This will be passed to the `params` object in a service method.
+/// When requested on the server side, this will be null.
 class Providers {
+  /// The transport through which the client is accessing this service.
   final String via;
 
-  const Providers._base(String this.via);
+  const Providers(String this.via);
 
-  static final Providers SERVER = const Providers._base('server_side');
-  static final Providers REST = const Providers._base('rest');
-  static final Providers WEBSOCKET = const Providers._base('websocket');
+  static const String VIA_REST = "rest";
+  static const String VIA_WEBSOCKET = "websocket";
+
+  /// Represents a request via REST.
+  static final Providers REST = const Providers(VIA_REST);
+
+  /// Represents a request over WebSockets.
+  static final Providers WEBSOCKET = const Providers(VIA_WEBSOCKET);
 }
 
-/// A data store exposed to the Internet.
+/// A front-facing interface that can present data to and operate on data on behalf of the user.
+///
+/// Heavily inspired by FeathersJS. <3
 class Service extends Routable {
   /// The [Angel] app powering this service.
   Angel app;
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/service_hooked.dart
index 3cf947ce..b3025980 100644
--- a/lib/src/http/service_hooked.dart
+++ b/lib/src/http/service_hooked.dart
@@ -2,6 +2,7 @@ part of angel_framework.http;
 
 /// Wraps another service in a service that broadcasts events on actions.
 class HookedService extends Service {
+  /// Tbe service that is proxied by this hooked one.
   final Service inner;
 
   HookedServiceEventDispatcher beforeIndexed =
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 89eb59c7..58425516 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -2,12 +2,11 @@ part of angel_framework.http;
 
 /// An in-memory [Service].
 class MemoryService<T> extends Service {
-  God god = new God();
   Map <int, T> items = {};
 
   _makeJson(int index, T t) {
     if (T == null || T == Map)
-      return mergeMap([god.serializeToMap(t), {'id': index}]);
+      return mergeMap([god.serializeObject(t), {'id': index}]);
     else
       return t;
   }
@@ -32,7 +31,7 @@ class MemoryService<T> extends Service {
   Future create(data, [Map params]) async {
     //try {
       print("Data: $data");
-      var created = (data is Map) ? god.deserializeFromMap(data, T) : data;
+      var created = (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
       print("Created $created");
       items[items.length] = created;
       return _makeJson(items.length - 1, created);
@@ -45,10 +44,10 @@ class MemoryService<T> extends Service {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
       try {
-        Map existing = god.serializeToMap(items[desiredId]);
+        Map existing = god.serializeObject(items[desiredId]);
         data = mergeMap([existing, data]);
         items[desiredId] =
-        (data is Map) ? god.deserializeFromMap(data, T) : data;
+        (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
         return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.BadRequest(message: 'Invalid data.');
@@ -61,7 +60,7 @@ class MemoryService<T> extends Service {
     if (items.containsKey(desiredId)) {
       try {
         items[desiredId] =
-        (data is Map) ? god.deserializeFromMap(data, T) : data;
+        (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
         return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.BadRequest(message: 'Invalid data.');
diff --git a/pubspec.yaml b/pubspec.yaml
index 03f5eb73..3a294e0b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 0.0.0-dev.19
+version: 1.0.0-dev
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/hooked.dart b/test/hooked.dart
index 422b1151..ac6afa52 100644
--- a/test/hooked.dart
+++ b/test/hooked.dart
@@ -1,7 +1,6 @@
-import 'dart:mirrors';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
-import 'package:json_god/json_god.dart';
+import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
 
 class Todo {
@@ -18,13 +17,11 @@ main() {
     Angel app;
     String url;
     http.Client client;
-    God god;
     HookedService Todos;
 
     setUp(() async {
       app = new Angel();
       client = new http.Client();
-      god = new God();
       app.use('/todos', new MemoryService<Todo>());
       Todos = app.service("todos");
 
@@ -37,7 +34,6 @@ main() {
       url = null;
       client.close();
       client = null;
-      god = null;
       Todos = null;
     });
 
diff --git a/test/routing.dart b/test/routing.dart
index 5f2594c6..e40fe288 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
-import 'package:json_god/json_god.dart';
+import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
 
 @Middleware(const ['interceptor'])
@@ -16,10 +16,8 @@ main() {
     Angel todos;
     String url;
     http.Client client;
-    God god;
 
     setUp(() async {
-      god = new God();
       angel = new Angel();
       nested = new Angel();
       todos = new Angel();
@@ -58,7 +56,6 @@ main() {
       client.close();
       client = null;
       url = null;
-      god = null;
     });
 
     test('Can match basic url', () async {
diff --git a/test/services.dart b/test/services.dart
index 941abd3f..295e5812 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -1,7 +1,6 @@
-import 'dart:mirrors';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
-import 'package:json_god/json_god.dart';
+import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
 
 class Todo {
@@ -18,12 +17,10 @@ main() {
     Angel app;
     String url;
     http.Client client;
-    God god;
 
     setUp(() async {
       app = new Angel();
       client = new http.Client();
-      god = new God();
       Service todos = new MemoryService<Todo>();
       app.use('/todos', todos);
       print(app.service("todos"));
@@ -36,7 +33,6 @@ main() {
       url = null;
       client.close();
       client = null;
-      god = null;
     });
 
     group('memory', () {

From 897a09d359d9f05c985aead84fdb510162fc4a13 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 23 Jun 2016 15:05:55 -0400
Subject: [PATCH 024/414] Worked out some kinks in routing and hooked services.
 Services can use middleware.

---
 lib/src/http/request_context.dart |  2 +-
 lib/src/http/server.dart          |  4 +--
 lib/src/http/service.dart         | 46 +++++++++++++++++++-------
 lib/src/http/service_hooked.dart  | 25 +++++++-------
 test/routing.dart                 | 54 ++++++++++++++++++++++++++-----
 5 files changed, 98 insertions(+), 33 deletions(-)

diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index ce976759..da2beca5 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -73,7 +73,7 @@ class RequestContext extends Extensible {
     context.contentType = request.headers.contentType;
     context.remoteAddress = request.connectionInfo.remoteAddress;
     context.params = parameters;
-    context.path = request.uri.toString();
+    context.path = request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(new RegExp(r'\/+$'), '');
     context.route = sourceRoute;
     context.session = request.session;
     context.underlyingRequest = request;
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 90e2643a..2a44f126 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -52,7 +52,7 @@ class Angel extends Routable {
 
     server.listen((HttpRequest request) async {
       String req_url =
-          request.uri.toString().replaceAll(new RegExp(r'\/+$'), '');
+          request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(new RegExp(r'\/+$'), '');
       if (req_url.isEmpty) req_url = '/';
       RequestContext req = await RequestContext.from(request, {}, this, null);
       ResponseContext res = await ResponseContext.from(request.response, this);
@@ -95,7 +95,7 @@ class Angel extends Routable {
         if (!canContinue) break;
         if (route.matcher.hasMatch(req_url) &&
             (request.method == route.method || route.method == '*')) {
-          req.params = route.parseParameters(request.uri.toString());
+          req.params = route.parseParameters(req_url);
           req.route = route;
 
           for (var handler in route.handlers) {
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 243cc2fe..72340bdc 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -60,22 +60,46 @@ class Service extends Routable {
   Service() : super() {
     Map restProvider = {'provider': Providers.REST};
 
+    Middleware indexMiddleware = _getAnnotation(this.index, Middleware);
     get('/', (req, res) async {
       return await this.index(mergeMap([req.query, restProvider]));
-    });
+    }, middleware: (indexMiddleware == null) ? [] : indexMiddleware.handlers);
 
-    post('/', (req, res) async => await this.create(req.body, restProvider));
+    Middleware createMiddleware = _getAnnotation(this.create, Middleware);
+    post('/', (req, res) async => await this.create(req.body, restProvider),
+        middleware:
+            (createMiddleware == null) ? [] : createMiddleware.handlers);
 
-    get('/:id', (req, res) async =>
-    await this.read(req.params['id'], mergeMap([req.query, restProvider])));
+    Middleware readMiddleware = _getAnnotation(this.read, Middleware);
 
-    patch('/:id', (req, res) async => await this.modify(
-        req.params['id'], req.body, restProvider));
+    get(
+        '/:id',
+        (req, res) async => await this
+            .read(req.params['id'], mergeMap([req.query, restProvider])),
+        middleware: (readMiddleware == null) ? [] : readMiddleware.handlers);
 
-    post('/:id', (req, res) async => await this.update(
-        req.params['id'], req.body, restProvider));
+    Middleware modifyMiddleware = _getAnnotation(this.modify, Middleware);
+    patch(
+        '/:id',
+        (req, res) async =>
+            await this.modify(req.params['id'], req.body, restProvider),
+        middleware:
+            (modifyMiddleware == null) ? [] : modifyMiddleware.handlers);
 
-    delete('/:id', (req, res) async => await this.remove(
-        req.params['id'], mergeMap([req.query, restProvider])));
+    Middleware updateMiddleware = _getAnnotation(this.update, Middleware);
+    post(
+        '/:id',
+        (req, res) async =>
+            await this.update(req.params['id'], req.body, restProvider),
+        middleware:
+            (updateMiddleware == null) ? [] : updateMiddleware.handlers);
+
+    Middleware removeMiddleware = _getAnnotation(this.remove, Middleware);
+    delete(
+        '/:id',
+        (req, res) async => await this
+            .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        middleware:
+            (removeMiddleware == null) ? [] : removeMiddleware.handlers);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/service_hooked.dart
index b3025980..ce744455 100644
--- a/lib/src/http/service_hooked.dart
+++ b/lib/src/http/service_hooked.dart
@@ -6,29 +6,32 @@ class HookedService extends Service {
   final Service inner;
 
   HookedServiceEventDispatcher beforeIndexed =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeRead = new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeCreated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeModified =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeUpdated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeRemoved =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterIndexed =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterRead = new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterCreated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterModified =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterUpdated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterRemoved =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
 
-  HookedService(Service this.inner) : super() {}
+  HookedService(Service this.inner) {
+    // Clone all routes, including middleware
+    routes..clear()..addAll(inner.routes);
+  }
 
   @override
   Future<List> index([Map params]) async {
diff --git a/test/routing.dart b/test/routing.dart
index e40fe288..e5c004b7 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -9,6 +9,14 @@ testMiddlewareMetadata(RequestContext req, ResponseContext res) async {
   return "This should not be shown.";
 }
 
+class QueryService extends Service {
+  @override
+  @Middleware(const ['intercept_service', 'interceptor'])
+  read(id, [Map params]) {
+    return params;
+  }
+}
+
 main() {
   group('routing', () {
     Angel angel;
@@ -22,10 +30,16 @@ main() {
       nested = new Angel();
       todos = new Angel();
 
-      angel.registerMiddleware('interceptor', (req, res) async {
-        res.write('Middleware');
-        return false;
-      });
+      angel
+        ..registerMiddleware('interceptor', (req, res) async {
+          res.write('Middleware');
+          return false;
+        })
+        ..registerMiddleware('intercept_service',
+            (RequestContext req, res) async {
+          print("Intercepting a service!");
+          return true;
+        });
 
       todos.get('/action/:action', (req, res) => res.json(req.params));
       nested.post('/ted/:route', (req, res) => res.json(req.params));
@@ -37,12 +51,25 @@ main() {
       angel.post('/lambda', (req, res) => req.body);
       angel.use('/nes', nested);
       angel.use('/todos/:id', todos);
-      angel.get('/greet/:name', (RequestContext req, res) async => "Hello ${req.params['name']}").as('Named routes');
+      angel
+          .get('/greet/:name',
+              (RequestContext req, res) async => "Hello ${req.params['name']}")
+          .as('Named routes');
       angel.get('/named', (req, ResponseContext res) async {
         res.redirectTo('Named routes', {'name': 'tests'});
       });
+      angel.get('/log', (RequestContext req, res) async {
+        print("Query: ${req.query}");
+        return "Logged";
+      });
+      angel.use('/query', new QueryService());
       angel.get('*', 'MJ');
 
+      print("DUMPING ROUTES: ");
+      for (Route route in angel.routes) {
+        print("${route.method} ${route.path} - ${route.handlers}");
+      }
+
       client = new http.Client();
       await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
       url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
@@ -97,8 +124,8 @@ main() {
     test('Can serialize function result as JSON', () async {
       Map headers = {'Content-Type': 'application/json'};
       String postData = god.serialize({'it': 'works'});
-      var response = await client.post(
-          "$url/lambda", headers: headers, body: postData);
+      var response =
+          await client.post("$url/lambda", headers: headers, body: postData);
       expect(god.deserialize(response.body)['it'], equals('works'));
     });
 
@@ -119,5 +146,16 @@ main() {
       print(response.body);
       expect(god.deserialize(response.body), equals('Hello tests'));
     });
+
+    test('Match routes, even with query params', () async {
+      var response =
+          await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
+      print(response.body);
+      expect(god.deserialize(response.body), equals('Logged'));
+
+      response = await client.get("$url/query/foo?bar=baz");
+      print(response.body);
+      expect(response.body, equals("Middleware"));
+    });
   });
-}
\ No newline at end of file
+}

From f49483ad030c96fa45f149707aeb69e8009a96fa Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 23 Jun 2016 15:09:49 -0400
Subject: [PATCH 025/414] Global service middleware + tests

---
 lib/src/http/service.dart | 6 ++++++
 test/routing.dart         | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 72340bdc..cdee9f21 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -60,6 +60,12 @@ class Service extends Routable {
   Service() : super() {
     Map restProvider = {'provider': Providers.REST};
 
+    // Add global middleware if declared on the instance itself
+    Middleware before = _getAnnotation(this, Middleware);
+    if (before != null) {
+      routes.add(new Route("*", "*", before.handlers));
+    }
+
     Middleware indexMiddleware = _getAnnotation(this.index, Middleware);
     get('/', (req, res) async {
       return await this.index(mergeMap([req.query, restProvider]));
diff --git a/test/routing.dart b/test/routing.dart
index e5c004b7..cdcd3caf 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -9,9 +9,10 @@ testMiddlewareMetadata(RequestContext req, ResponseContext res) async {
   return "This should not be shown.";
 }
 
+@Middleware(const ['intercept_service'])
 class QueryService extends Service {
   @override
-  @Middleware(const ['intercept_service', 'interceptor'])
+  @Middleware(const ['interceptor'])
   read(id, [Map params]) {
     return params;
   }

From 12f8ffd7ae93253365ace70899ea788e1173f4ba Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 23 Jun 2016 15:10:49 -0400
Subject: [PATCH 026/414] 1.0.0-dev+1

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 3a294e0b..ce31cfec 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev
+version: 1.0.0-dev+1
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From d3b486b283d492fb51ebad6ac8523ddb81003130 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 23 Jun 2016 16:11:40 -0400
Subject: [PATCH 027/414] Fixed hidden middleware bug

---
 lib/src/http/routable.dart | 3 +--
 pubspec.yaml               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 6e801dd0..721f04ce 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -70,8 +70,7 @@ class Routable extends Extensible {
           new RegExp(r'(^\/+)|(\/+$)'), '')] = service;
       _routable = service;
     }
-
-    requestMiddleware.addAll(_routable.requestMiddleware);
+    
     for (Route route in _routable.routes) {
       Route provisional = new Route('', path);
       if (route.path == '/') {
diff --git a/pubspec.yaml b/pubspec.yaml
index ce31cfec..1bb11394 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev+1
+version: 1.0.0-dev+2
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 1899e586f1f0158aacd3ae707a6eaf96a680dd89 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Fri, 24 Jun 2016 15:19:02 -0400
Subject: [PATCH 028/414] Fixed more bugs with hooked services

---
 lib/src/http/server.dart          |  2 +-
 lib/src/http/service_hooked.dart  | 77 ++++++++++++++++++++++++++-----
 lib/src/http/services/memory.dart |  2 -
 test/hooked.dart                  |  2 +
 4 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 2a44f126..0b4af3b8 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -195,7 +195,7 @@ class Angel extends Routable {
     if (routable is Service) {
       routable.app = this;
     }
-    super.use(path, routable,
+    return super.use(path, routable,
         hooked: hooked, middlewareNamespace: middlewareNamespace);
   }
 
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/service_hooked.dart
index ce744455..cad0fc75 100644
--- a/lib/src/http/service_hooked.dart
+++ b/lib/src/http/service_hooked.dart
@@ -6,31 +6,84 @@ class HookedService extends Service {
   final Service inner;
 
   HookedServiceEventDispatcher beforeIndexed =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeRead = new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeCreated =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeModified =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeUpdated =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeRemoved =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterIndexed =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterRead = new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterCreated =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterModified =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterUpdated =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterRemoved =
-      new HookedServiceEventDispatcher();
+  new HookedServiceEventDispatcher();
 
   HookedService(Service this.inner) {
-    // Clone all routes, including middleware
-    routes..clear()..addAll(inner.routes);
+    // Clone app instance
+    if (inner.app != null)
+      this.app = inner.app;
+
+    routes.clear();
+    // Set up our routes. We still need to copy middleware from inner service
+    Map restProvider = {'provider': Providers.REST};
+
+    // Add global middleware if declared on the instance itself
+    Middleware before = _getAnnotation(inner, Middleware);
+    if (before != null) {
+      routes.add(new Route("*", "*", before.handlers));
+    }
+
+    Middleware indexMiddleware = _getAnnotation(inner.index, Middleware);
+    get('/', (req, res) async {
+      return await this.index(mergeMap([req.query, restProvider]));
+    }, middleware: (indexMiddleware == null) ? [] : indexMiddleware.handlers);
+
+    Middleware createMiddleware = _getAnnotation(inner.create, Middleware);
+    post('/', (req, res) async => await this.create(req.body, restProvider),
+        middleware:
+        (createMiddleware == null) ? [] : createMiddleware.handlers);
+
+    Middleware readMiddleware = _getAnnotation(inner.read, Middleware);
+
+    get(
+        '/:id',
+        (req, res) async => await this
+        .read(req.params['id'], mergeMap([req.query, restProvider])),
+        middleware: (readMiddleware == null) ? [] : readMiddleware.handlers);
+
+    Middleware modifyMiddleware = _getAnnotation(inner.modify, Middleware);
+    patch(
+        '/:id',
+        (req, res) async =>
+    await this.modify(req.params['id'], req.body, restProvider),
+        middleware:
+        (modifyMiddleware == null) ? [] : modifyMiddleware.handlers);
+
+    Middleware updateMiddleware = _getAnnotation(inner.update, Middleware);
+    post(
+        '/:id',
+        (req, res) async =>
+    await this.update(req.params['id'], req.body, restProvider),
+        middleware:
+        (updateMiddleware == null) ? [] : updateMiddleware.handlers);
+
+    Middleware removeMiddleware = _getAnnotation(inner.remove, Middleware);
+    delete(
+        '/:id',
+        (req, res) async => await this
+        .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        middleware:
+        (removeMiddleware == null) ? [] : removeMiddleware.handlers);
   }
 
   @override
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 58425516..538c07f5 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -30,9 +30,7 @@ class MemoryService<T> extends Service {
 
   Future create(data, [Map params]) async {
     //try {
-      print("Data: $data");
       var created = (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
-      print("Created $created");
       items[items.length] = created;
       return _makeJson(items.length - 1, created);
     /*} catch (e) {
diff --git a/test/hooked.dart b/test/hooked.dart
index ac6afa52..f61512c5 100644
--- a/test/hooked.dart
+++ b/test/hooked.dart
@@ -6,6 +6,8 @@ import 'package:test/test.dart';
 class Todo {
   String text;
   String over;
+
+  Todo({String this.text, String this.over});
 }
 
 main() {

From 448c8dc99a8ee621dedb2e1f01d22094d6e5ef1e Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Fri, 24 Jun 2016 15:41:41 -0400
Subject: [PATCH 029/414] Fixed some memory service bugs

---
 lib/src/http/services/memory.dart | 36 ++++++++++++++++++++-----------
 pubspec.yaml                      |  2 +-
 test/services.dart                |  2 +-
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 538c07f5..06a777f4 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -1,14 +1,23 @@
 part of angel_framework.http;
 
+/// Represents data that can be serialized into a MemoryService;
+class MemoryModel {
+  int id;
+}
+
 /// An in-memory [Service].
 class MemoryService<T> extends Service {
-  Map <int, T> items = {};
+  Map <int, MemoryModel> items = {};
 
-  _makeJson(int index, T t) {
-    if (T == null || T == Map)
-      return mergeMap([god.serializeObject(t), {'id': index}]);
-    else
-      return t;
+  MemoryService() :super() {
+    if (!reflectType(T).isAssignableTo(reflectType(MemoryModel))) {
+      throw new Exception(
+          "MemoryServices only support classes that inherit from MemoryModel.");
+    }
+  }
+
+  _makeJson(int index, MemoryModel t) {
+    return t..id = index;
   }
 
   Future<List> index([Map params]) async {
@@ -21,7 +30,7 @@ class MemoryService<T> extends Service {
   Future read(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
-      T found = items[desiredId];
+      MemoryModel found = items[desiredId];
       if (found != null) {
         return _makeJson(desiredId, found);
       } else throw new AngelHttpException.NotFound();
@@ -30,9 +39,12 @@ class MemoryService<T> extends Service {
 
   Future create(data, [Map params]) async {
     //try {
-      var created = (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
-      items[items.length] = created;
-      return _makeJson(items.length - 1, created);
+    MemoryModel created = (data is MemoryModel) ? data : god.deserializeDatum(
+        data, outputType: T);
+
+    created.id = items.length;
+    items[created.id] = created;
+    return created;
     /*} catch (e) {
       throw new AngelHttpException.BadRequest(message: 'Invalid data.');
     }*/
@@ -69,11 +81,9 @@ class MemoryService<T> extends Service {
   Future remove(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
     if (items.containsKey(desiredId)) {
-      T item = items[desiredId];
+      MemoryModel item = items[desiredId];
       items[desiredId] = null;
       return _makeJson(desiredId, item);
     } else throw new AngelHttpException.NotFound();
   }
-
-  MemoryService() : super();
 }
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 1bb11394..a0b77441 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev+2
+version: 1.0.0-dev+3
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/services.dart b/test/services.dart
index 295e5812..d40d82e2 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -3,7 +3,7 @@ import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
 
-class Todo {
+class Todo extends MemoryModel {
   String text;
   String over;
 }

From babb07c8149e565f2c54841271ff5afbf0377952 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Fri, 24 Jun 2016 16:38:29 -0400
Subject: [PATCH 030/414] Fixed some more memory service bugs

---
 lib/src/http/services/memory.dart | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 06a777f4..29a4adf1 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -7,7 +7,7 @@ class MemoryModel {
 
 /// An in-memory [Service].
 class MemoryService<T> extends Service {
-  Map <int, MemoryModel> items = {};
+  List<MemoryModel> items = [];
 
   MemoryService() :super() {
     if (!reflectType(T).isAssignableTo(reflectType(MemoryModel))) {
@@ -21,15 +21,18 @@ class MemoryService<T> extends Service {
   }
 
   Future<List> index([Map params]) async {
-    return items.keys
-        .where((index) => items[index] != null)
-        .map((index) => _makeJson(index, items[index]))
-        .toList();
+    List result = [];
+
+    for (int i = 0; i < items.length; i++) {
+      result.add(_makeJson(i, items[i]));
+    }
+
+    return result;
   }
 
   Future read(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.containsKey(desiredId)) {
+    if (items.length > desiredId) {
       MemoryModel found = items[desiredId];
       if (found != null) {
         return _makeJson(desiredId, found);
@@ -43,7 +46,7 @@ class MemoryService<T> extends Service {
         data, outputType: T);
 
     created.id = items.length;
-    items[created.id] = created;
+    items.add(created);
     return created;
     /*} catch (e) {
       throw new AngelHttpException.BadRequest(message: 'Invalid data.');
@@ -52,7 +55,7 @@ class MemoryService<T> extends Service {
 
   Future modify(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.containsKey(desiredId)) {
+    if (items.length > desiredId) {
       try {
         Map existing = god.serializeObject(items[desiredId]);
         data = mergeMap([existing, data]);
@@ -67,7 +70,7 @@ class MemoryService<T> extends Service {
 
   Future update(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.containsKey(desiredId)) {
+    if (items.length > desiredId) {
       try {
         items[desiredId] =
         (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
@@ -80,9 +83,9 @@ class MemoryService<T> extends Service {
 
   Future remove(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.containsKey(desiredId)) {
+    if (items.length > desiredId) {
       MemoryModel item = items[desiredId];
-      items[desiredId] = null;
+      items.removeAt(desiredId);
       return _makeJson(desiredId, item);
     } else throw new AngelHttpException.NotFound();
   }

From 2459c82bf90e0ca5023a283d60d741ab82bec4bd Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Fri, 24 Jun 2016 16:56:34 -0400
Subject: [PATCH 031/414] More memory service bugs

---
 lib/src/http/services/memory.dart | 25 +++++++++++--------------
 pubspec.yaml                      |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 29a4adf1..06a777f4 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -7,7 +7,7 @@ class MemoryModel {
 
 /// An in-memory [Service].
 class MemoryService<T> extends Service {
-  List<MemoryModel> items = [];
+  Map <int, MemoryModel> items = {};
 
   MemoryService() :super() {
     if (!reflectType(T).isAssignableTo(reflectType(MemoryModel))) {
@@ -21,18 +21,15 @@ class MemoryService<T> extends Service {
   }
 
   Future<List> index([Map params]) async {
-    List result = [];
-
-    for (int i = 0; i < items.length; i++) {
-      result.add(_makeJson(i, items[i]));
-    }
-
-    return result;
+    return items.keys
+        .where((index) => items[index] != null)
+        .map((index) => _makeJson(index, items[index]))
+        .toList();
   }
 
   Future read(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.length > desiredId) {
+    if (items.containsKey(desiredId)) {
       MemoryModel found = items[desiredId];
       if (found != null) {
         return _makeJson(desiredId, found);
@@ -46,7 +43,7 @@ class MemoryService<T> extends Service {
         data, outputType: T);
 
     created.id = items.length;
-    items.add(created);
+    items[created.id] = created;
     return created;
     /*} catch (e) {
       throw new AngelHttpException.BadRequest(message: 'Invalid data.');
@@ -55,7 +52,7 @@ class MemoryService<T> extends Service {
 
   Future modify(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.length > desiredId) {
+    if (items.containsKey(desiredId)) {
       try {
         Map existing = god.serializeObject(items[desiredId]);
         data = mergeMap([existing, data]);
@@ -70,7 +67,7 @@ class MemoryService<T> extends Service {
 
   Future update(id, data, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.length > desiredId) {
+    if (items.containsKey(desiredId)) {
       try {
         items[desiredId] =
         (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
@@ -83,9 +80,9 @@ class MemoryService<T> extends Service {
 
   Future remove(id, [Map params]) async {
     int desiredId = int.parse(id.toString());
-    if (items.length > desiredId) {
+    if (items.containsKey(desiredId)) {
       MemoryModel item = items[desiredId];
-      items.removeAt(desiredId);
+      items[desiredId] = null;
       return _makeJson(desiredId, item);
     } else throw new AngelHttpException.NotFound();
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index a0b77441..d63a18b4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev+3
+version: 1.0.0-dev+5
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From a7c8a95af7257e2962932b27fb950b2a464966d5 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Sun, 26 Jun 2016 20:20:42 -0400
Subject: [PATCH 032/414] Added Controllers, omg

---
 lib/defs.dart                       |  6 ++
 lib/src/http/controller.dart        | 99 +++++++++++++++++++++++++++++
 lib/src/http/http.dart              |  3 +
 lib/src/http/metadata/metadata.dart | 14 ++++
 lib/src/http/response_context.dart  | 21 ++++++
 lib/src/http/routable.dart          |  6 ++
 lib/src/http/services/memory.dart   |  5 --
 pubspec.yaml                        |  2 +-
 test/common.dart                    |  8 +++
 test/controller.dart                | 79 +++++++++++++++++++++++
 test/hooked.dart                    |  8 +--
 11 files changed, 238 insertions(+), 13 deletions(-)
 create mode 100644 lib/defs.dart
 create mode 100644 lib/src/http/controller.dart
 create mode 100644 test/common.dart
 create mode 100644 test/controller.dart

diff --git a/lib/defs.dart b/lib/defs.dart
new file mode 100644
index 00000000..53d6074d
--- /dev/null
+++ b/lib/defs.dart
@@ -0,0 +1,6 @@
+library angel_framework.defs;
+
+/// Represents data that can be serialized into a MemoryService;
+class MemoryModel {
+  int id;
+}
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
new file mode 100644
index 00000000..d19a98c9
--- /dev/null
+++ b/lib/src/http/controller.dart
@@ -0,0 +1,99 @@
+part of angel_framework.http;
+
+class Controller {
+  List middleware = [];
+  List<Route> routes = [];
+  Map<String, Route> _mappings = {};
+  Expose exposeDecl;
+
+  Future call(Angel app) async {
+    Routable routable = new Routable()
+      ..routes.addAll(routes);
+    app.use(exposeDecl.path, routable);
+
+    TypeMirror typeMirror = reflectType(this.runtimeType);
+    String name = exposeDecl.as;
+
+    if (name == null || name.isEmpty)
+      name = MirrorSystem.getName(typeMirror.simpleName);
+
+    app.controllers[name] = this;
+  }
+
+  Controller() {
+    // Load global expose decl
+    ClassMirror classMirror = reflectClass(this.runtimeType);
+
+    for (InstanceMirror metadatum in classMirror.metadata) {
+      if (metadatum.reflectee is Expose) {
+        exposeDecl = metadatum.reflectee;
+        break;
+      }
+    }
+
+    if (exposeDecl == null)
+      throw new Exception(
+          "All controllers must carry an @Expose() declaration.");
+    else routes.add(
+        new Route(
+            "*", "*", []..addAll(exposeDecl.middleware)..addAll(middleware)));
+
+    InstanceMirror instanceMirror = reflect(this);
+    classMirror.instanceMembers.forEach((Symbol key,
+        MethodMirror methodMirror) {
+      if (methodMirror.isRegularMethod && key != #toString &&
+          key != #noSuchMethod && key != #call && key != #equals &&
+          key != #==) {
+        InstanceMirror exposeMirror = methodMirror.metadata.firstWhere((
+            mirror) => mirror.reflectee is Expose, orElse: () => null);
+
+        if (exposeMirror != null) {
+          RequestHandler handler = (RequestContext req,
+              ResponseContext res) async {
+            List args = [];
+
+            try {
+              // Load parameters, and execute
+              for (int i = 0; i < methodMirror.parameters.length; i++) {
+                ParameterMirror parameter = methodMirror.parameters[i];
+                if (parameter.type.reflectedType == RequestContext)
+                  args.add(req);
+                else if (parameter.type.reflectedType == ResponseContext)
+                  args.add(res);
+                else {
+                  String name = MirrorSystem.getName(parameter.simpleName);
+                  var arg = req.params[name];
+
+                  if (arg == null &&
+                      !exposeMirror.reflectee.allowNull.contain(name)) {
+                    throw new AngelHttpException.BadRequest();
+                  }
+
+                  args.add(arg);
+                }
+              }
+
+              return await instanceMirror
+                  .invoke(key, args)
+                  .reflectee;
+            } catch (e) {
+              throw new AngelHttpException(e);
+            }
+          };
+          Route route = new Route(
+              exposeMirror.reflectee.method,
+              exposeMirror.reflectee.path,
+              [handler]..addAll(exposeMirror.reflectee.middleware));
+          routes.add(route);
+
+          String name = exposeMirror.reflectee.as;
+
+          if (name == null || name.isEmpty)
+            name = MirrorSystem.getName(key);
+
+          _mappings[name] = route;
+        }
+      }
+    });
+  }
+}
\ No newline at end of file
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 44c163e1..da16ecd9 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -10,7 +10,9 @@ import 'package:body_parser/body_parser.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:merge_map/merge_map.dart';
 import 'package:mime/mime.dart';
+import '../../defs.dart';
 
+part 'controller.dart';
 part 'extensible.dart';
 part 'errors.dart';
 part 'metadata/metadata.dart';
@@ -22,3 +24,4 @@ part 'server.dart';
 part 'service.dart';
 part 'service_hooked.dart';
 part 'services/memory.dart';
+
diff --git a/lib/src/http/metadata/metadata.dart b/lib/src/http/metadata/metadata.dart
index b65fd84a..af164495 100644
--- a/lib/src/http/metadata/metadata.dart
+++ b/lib/src/http/metadata/metadata.dart
@@ -10,4 +10,18 @@ class Middleware {
 /// Annotation to set a service up to release hooks on every action.
 class Hooked {
   const Hooked();
+}
+
+class Expose {
+  final String method;
+  final Pattern path;
+  final List middleware;
+  final String as;
+  final List<String> allowNull;
+
+  const Expose(Pattern this.path,
+      {String this.method: "GET",
+      List this.middleware: const [],
+      String this.as: null,
+      List<String> this.allowNull: const[]});
 }
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 0b46cfd1..42c1a0e4 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -103,6 +103,27 @@ class ResponseContext extends Extensible {
     throw new ArgumentError.notNull('Route to redirect to ($name)');
   }
 
+  /// Redirects to the given [Controller] action.
+  redirectToAction(String action, [Map params, int code]) {
+    // UserController@show
+    List<String> split = action.split("@");
+
+    if (split.length < 2)
+      throw new Exception("Controller redirects must take the form of 'Controller@action'. You gave: $action");
+
+    Controller controller = app.controller(split[0]);
+
+    if (controller == null)
+      throw new Exception("Could not find a controller named '${split[0]}'");
+
+    Route matched = controller._mappings[split[1]];
+
+    if (matched == null)
+      throw new Exception("Controller '${split[0]}' does not contain any action named '${split[1]}'");
+
+    return redirect(matched.makeUri(params), code: code);
+  }
+
   /// Streams a file to this response as chunked data.
   ///
   /// Useful for video sites.
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 721f04ce..e3dd0439 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -37,6 +37,9 @@ class Routable extends Extensible {
   /// A set of [Service] objects that have been mapped into routes.
   Map <Pattern, Service> services = {};
 
+  /// A set of [Controller] objects that have been loaded into the application.
+  Map<String, Controller> controllers = {};
+
   /// Assigns a middleware to a name for convenience.
   registerMiddleware(String name, RequestMiddleware middleware) {
     this.requestMiddleware[name] = middleware;
@@ -45,6 +48,9 @@ class Routable extends Extensible {
   /// Retrieves the service assigned to the given path.
   Service service(Pattern path) => services[path];
 
+  /// Retrieves the controller with the given name.
+  Controller controller(String name) => controllers[name];
+
   /// Incorporates another [Routable]'s routes into this one's.
   ///
   /// If `hooked` is set to `true` and a [Service] is provided,
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/services/memory.dart
index 06a777f4..7619f8c5 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/services/memory.dart
@@ -1,10 +1,5 @@
 part of angel_framework.http;
 
-/// Represents data that can be serialized into a MemoryService;
-class MemoryModel {
-  int id;
-}
-
 /// An in-memory [Service].
 class MemoryService<T> extends Service {
   Map <int, MemoryModel> items = {};
diff --git a/pubspec.yaml b/pubspec.yaml
index d63a18b4..852d5697 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev+5
+version: 1.0.0-dev+6
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/common.dart b/test/common.dart
new file mode 100644
index 00000000..54a28992
--- /dev/null
+++ b/test/common.dart
@@ -0,0 +1,8 @@
+library angel_framework.test.common;
+
+class Todo {
+  String text;
+  String over;
+
+  Todo({String this.text, String this.over});
+}
diff --git a/test/controller.dart b/test/controller.dart
new file mode 100644
index 00000000..41faed23
--- /dev/null
+++ b/test/controller.dart
@@ -0,0 +1,79 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:http/http.dart' as http;
+import 'package:test/test.dart';
+import 'common.dart';
+
+@Expose("/todos", middleware: const ["foo"])
+class TodoController extends Controller {
+  List<Todo> todos = [new Todo(text: "Hello", over: "world")];
+
+  @Expose("/:id", middleware: const["bar"])
+  Future<Todo> fetchTodo(int id, RequestContext req,
+      ResponseContext res) async {
+    expect(req, isNotNull);
+    expect(res, isNotNull);
+    return todos[id];
+  }
+
+  @Expose("/namedRoute/:foo", as: "foo")
+  Future<String> someRandomRoute(RequestContext req, ResponseContext res) async {
+    return "${req.params['foo']}!";
+  }
+}
+
+main() {
+  group("controller", () {
+    Angel app = new Angel();
+    HttpServer server;
+    InternetAddress host = InternetAddress.LOOPBACK_IP_V4;
+    int port = 3000;
+    http.Client client;
+    String url = "http://${host.address}:$port";
+
+    setUp(() async {
+      app.registerMiddleware("foo", (req, res) async => res.write("Hello, "));
+      app.registerMiddleware("bar", (req, res) async => res.write("world!"));
+      app.get("/redirect", (req, ResponseContext res) async =>
+          res.redirectToAction("TodoController@foo", {"foo": "world"}));
+      await app.configure(new TodoController());
+
+      print(app.controllers);
+      print("\nDUMPING ROUTES:");
+      app.routes.forEach((Route route) {
+        print("\t${route.method} ${route.path} -> ${route.handlers}");
+      });
+      print("\n");
+
+      server = await app.startServer(host, port);
+      client = new http.Client();
+    });
+
+    tearDown(() async {
+      await server.close(force: true);
+      client.close();
+      client = null;
+    });
+
+    test("middleware", () async {
+      var response = await client.get("$url/todos/0");
+      print(response.body);
+
+      expect(response.body.indexOf("Hello, "), equals(0));
+
+      Map todo = JSON.decode(response.body.substring(7));
+      expect(todo.keys.length, equals(2));
+      expect(todo['text'], equals("Hello"));
+      expect(todo['over'], equals("world"));
+    });
+
+    test("named actions", () async {
+      var response = await client.get("$url/redirect");
+      print(response.body);
+
+      expect(response.body, equals("Hello, \"world!\""));
+    });
+  });
+}
diff --git a/test/hooked.dart b/test/hooked.dart
index f61512c5..c4d5616f 100644
--- a/test/hooked.dart
+++ b/test/hooked.dart
@@ -2,13 +2,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
-
-class Todo {
-  String text;
-  String over;
-
-  Todo({String this.text, String this.over});
-}
+import 'common.dart';
 
 main() {
   group('Hooked', () {

From 2a62bd8eb6b5878c247bf8a27c9441c9943f067b Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Sun, 26 Jun 2016 21:27:40 -0400
Subject: [PATCH 033/414] Fixed makeUri???

---
 lib/src/http/route.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index 43c071f9..1abcb771 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -46,11 +46,11 @@ class Route {
     String result = path;
     if (params != null) {
       for (String key in (params.keys)) {
-        result = result.replaceAll(new RegExp(":$key"), params[key].toString());
+        result = result.replaceAll(new RegExp(":$key" + r"\??"), params[key].toString());
       }
     }
 
-    return result;
+    return result.replaceAll("*", "");
   }
 
   /// Enables one or more handlers to be called whenever this route is visited.

From 85b529ef00699fe2fadd0c3e40bfa0d904d0be78 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Fri, 1 Jul 2016 15:18:37 -0400
Subject: [PATCH 034/414] Working on changes, in line with angel_examples

---
 .gitignore                   |  1 +
 lib/src/http/controller.dart |  4 +++-
 lib/src/http/routable.dart   | 10 +++++++++-
 pubspec.yaml                 |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 917abe7c..951d3784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ packages
 # Include when developing application packages.
 pubspec.lock
 
+doc/api
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index d19a98c9..6f795afc 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -83,7 +83,9 @@ class Controller {
           Route route = new Route(
               exposeMirror.reflectee.method,
               exposeMirror.reflectee.path,
-              [handler]..addAll(exposeMirror.reflectee.middleware));
+              []
+                ..addAll(exposeMirror.reflectee.middleware)
+                ..add(handler));
           routes.add(route);
 
           String name = exposeMirror.reflectee.as;
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index e3dd0439..3722a4b8 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -76,7 +76,15 @@ class Routable extends Extensible {
           new RegExp(r'(^\/+)|(\/+$)'), '')] = service;
       _routable = service;
     }
-    
+
+    if (_routable is Angel) {
+      all(path, (RequestContext req, ResponseContext res) async {
+        req.app = _routable;
+        res.app = _routable;
+        return true;
+      });
+    }
+
     for (Route route in _routable.routes) {
       Route provisional = new Route('', path);
       if (route.path == '/') {
diff --git a/pubspec.yaml b/pubspec.yaml
index 852d5697..31832234 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev+6
+version: 1.0.0-dev.8
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 1a7d831a36548f509cc92c2c936e9e55758b18c5 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Sun, 3 Jul 2016 18:23:55 -0400
Subject: [PATCH 035/414] DOCTYPE -> !DOCTYPE

---
 lib/src/http/server.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 0b4af3b8..ac4ecbc7 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -19,7 +19,7 @@ class Angel extends Routable {
   AngelErrorHandler _errorHandler = (AngelHttpException e, req, ResponseContext res) {
     res.header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
     res.status(e.statusCode);
-    res.write("<DOCTYPE html><html><head><title>${e.message}</title>");
+    res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
     for (String error in e.errors) {
       res.write("<li>$error</li>");

From 76d26ea9c5f0abd1cb1764bf45b64e709da81ee6 Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Mon, 4 Jul 2016 14:06:31 -0400
Subject: [PATCH 036/414] Controllers should be able to handle errors
 themselves

---
 lib/src/http/controller.dart       |  42 +++++-----
 lib/src/http/response_context.dart |   2 +-
 lib/src/http/server.dart           | 128 ++++++++++++++++-------------
 pubspec.yaml                       |   2 +-
 4 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 6f795afc..85d8b17d 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -52,33 +52,29 @@ class Controller {
               ResponseContext res) async {
             List args = [];
 
-            try {
-              // Load parameters, and execute
-              for (int i = 0; i < methodMirror.parameters.length; i++) {
-                ParameterMirror parameter = methodMirror.parameters[i];
-                if (parameter.type.reflectedType == RequestContext)
-                  args.add(req);
-                else if (parameter.type.reflectedType == ResponseContext)
-                  args.add(res);
-                else {
-                  String name = MirrorSystem.getName(parameter.simpleName);
-                  var arg = req.params[name];
+            // Load parameters, and execute
+            for (int i = 0; i < methodMirror.parameters.length; i++) {
+              ParameterMirror parameter = methodMirror.parameters[i];
+              if (parameter.type.reflectedType == RequestContext)
+                args.add(req);
+              else if (parameter.type.reflectedType == ResponseContext)
+                args.add(res);
+              else {
+                String name = MirrorSystem.getName(parameter.simpleName);
+                var arg = req.params[name];
 
-                  if (arg == null &&
-                      !exposeMirror.reflectee.allowNull.contain(name)) {
-                    throw new AngelHttpException.BadRequest();
-                  }
-
-                  args.add(arg);
+                if (arg == null &&
+                    !exposeMirror.reflectee.allowNull.contain(name)) {
+                  throw new AngelHttpException.BadRequest();
                 }
-              }
 
-              return await instanceMirror
-                  .invoke(key, args)
-                  .reflectee;
-            } catch (e) {
-              throw new AngelHttpException(e);
+                args.add(arg);
+              }
             }
+
+            return await instanceMirror
+                .invoke(key, args)
+                .reflectee;
           };
           Route route = new Route(
               exposeMirror.reflectee.method,
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 42c1a0e4..cfef32a9 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -83,7 +83,7 @@ class ResponseContext extends Extensible {
       <body>
         <h1>Currently redirecting you...</h1>
         <br />
-        Click <a href="$url"></a> if you are not automatically redirected...
+        Click <a href="$url">here</a> if you are not automatically redirected...
         <script>
           window.location = "$url";
         </script>
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index ac4ecbc7..b49329f1 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -12,6 +12,12 @@ typedef Future AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends Routable {
+  var _beforeProcessed = new StreamController<HttpRequest>();
+  var _afterProcessed = new StreamController<HttpRequest>();
+
+  Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
+  Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
+
   ServerGenerator _serverGenerator =
       (address, port) async => await HttpServer.bind(address, port);
 
@@ -50,69 +56,72 @@ class Angel extends Routable {
         await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
     this.httpServer = server;
 
-    server.listen((HttpRequest request) async {
-      String req_url =
-          request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(new RegExp(r'\/+$'), '');
-      if (req_url.isEmpty) req_url = '/';
-      RequestContext req = await RequestContext.from(request, {}, this, null);
-      ResponseContext res = await ResponseContext.from(request.response, this);
-
-      bool canContinue = true;
-
-      var execHandler = (handler, req) async {
-        if (canContinue) {
-          canContinue = await new Future.sync(() async {
-            return _applyHandler(handler, req, res);
-          }).catchError((e, [StackTrace stackTrace]) async {
-            if (e is AngelHttpException) {
-              // Special handling for AngelHttpExceptions :)
-              try {
-                res.status(e.statusCode);
-                String accept = request.headers.value(HttpHeaders.ACCEPT);
-                if (accept == "*/*" ||
-                    accept.contains("application/json") ||
-                    accept.contains("application/javascript")) {
-                  res.json(e.toMap());
-                } else {
-                  await _errorHandler(e, req, res);
-                }
-                _finalizeResponse(request, res);
-              } catch (_) {}
-            }
-            _onError(e, stackTrace);
-            canContinue = false;
-            return false;
-          });
-        } else
-          return false;
-      };
-
-      for (var handler in before) {
-        await execHandler(handler, req);
-      }
-
-      for (Route route in routes) {
-        if (!canContinue) break;
-        if (route.matcher.hasMatch(req_url) &&
-            (request.method == route.method || route.method == '*')) {
-          req.params = route.parseParameters(req_url);
-          req.route = route;
-
-          for (var handler in route.handlers) {
-            await execHandler(handler, req);
-          }
-        }
-      }
-
-      for (var handler in after) {
-        await execHandler(handler, req);
-      }
-      _finalizeResponse(request, res);
-    });
+    server.listen(handleRequest);
 
     return server;
   }
 
+  Future handleRequest(HttpRequest request) async {
+    _beforeProcessed.add(request);
+    String req_url =
+    request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(new RegExp(r'\/+$'), '');
+    if (req_url.isEmpty) req_url = '/';
+    RequestContext req = await RequestContext.from(request, {}, this, null);
+    ResponseContext res = await ResponseContext.from(request.response, this);
+
+    bool canContinue = true;
+
+    var execHandler = (handler, req) async {
+      if (canContinue) {
+        canContinue = await new Future.sync(() async {
+          return _applyHandler(handler, req, res);
+        }).catchError((e, [StackTrace stackTrace]) async {
+          if (e is AngelHttpException) {
+            // Special handling for AngelHttpExceptions :)
+            try {
+              res.status(e.statusCode);
+              String accept = request.headers.value(HttpHeaders.ACCEPT);
+              if (accept == "*/*" ||
+                  accept.contains("application/json") ||
+                  accept.contains("application/javascript")) {
+                res.json(e.toMap());
+              } else {
+                await _errorHandler(e, req, res);
+              }
+              _finalizeResponse(request, res);
+            } catch (_) {}
+          }
+          _onError(e, stackTrace);
+          canContinue = false;
+          return false;
+        });
+      } else
+        return false;
+    };
+
+    for (var handler in before) {
+      await execHandler(handler, req);
+    }
+
+    for (Route route in routes) {
+      if (!canContinue) break;
+      if (route.matcher.hasMatch(req_url) &&
+          (request.method == route.method || route.method == '*')) {
+        req.params = route.parseParameters(req_url);
+        req.route = route;
+
+        for (var handler in route.handlers) {
+          await execHandler(handler, req);
+        }
+      }
+    }
+
+    for (var handler in after) {
+      await execHandler(handler, req);
+    }
+    _finalizeResponse(request, res);
+  }
+
   Future<bool> _applyHandler(
       handler, RequestContext req, ResponseContext res) async {
     if (handler is RequestMiddleware) {
@@ -162,6 +171,7 @@ class Angel extends Routable {
       if (!res.willCloseItself) {
         res.responseData.forEach((blob) => request.response.add(blob));
         await request.response.close();
+        _afterProcessed.add(request);
       }
     } catch (e) {
       // Remember: This fails silently
diff --git a/pubspec.yaml b/pubspec.yaml
index 31832234..5fdf2a91 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.8
+version: 1.0.0-dev.13
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 4c9db6f9327efbec74958cdd3aa5900a47433ccf Mon Sep 17 00:00:00 2001
From: regiostech <thosakwe@gmail.com>
Date: Tue, 5 Jul 2016 18:11:54 -0400
Subject: [PATCH 037/414] onService, onController

---
 lib/src/http/controller.dart |  2 ++
 lib/src/http/routable.dart   | 12 +++++++++++-
 lib/src/http/server.dart     | 33 ++++++++++++++++++++++++---------
 pubspec.yaml                 |  2 +-
 test/services.dart           |  1 +
 5 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 85d8b17d..369b9b7b 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -1,12 +1,14 @@
 part of angel_framework.http;
 
 class Controller {
+  Angel app;
   List middleware = [];
   List<Route> routes = [];
   Map<String, Route> _mappings = {};
   Expose exposeDecl;
 
   Future call(Angel app) async {
+    this.app = app;
     Routable routable = new Routable()
       ..routes.addAll(routes);
     app.use(exposeDecl.path, routable);
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 3722a4b8..45a6637e 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -40,6 +40,13 @@ class Routable extends Extensible {
   /// A set of [Controller] objects that have been loaded into the application.
   Map<String, Controller> controllers = {};
 
+  StreamController<Service> _onService = new StreamController<Service>.broadcast();
+
+  /// Fired whenever a service is added to this instance.
+  ///
+  /// **NOTE**: This is a broadcast stream.
+  Stream<Service> get onService => _onService.stream;
+
   /// Assigns a middleware to a name for convenience.
   registerMiddleware(String name, RequestMiddleware middleware) {
     this.requestMiddleware[name] = middleware;
@@ -61,7 +68,7 @@ class Routable extends Extensible {
   /// For example, if the [Routable] has a middleware 'y', and the `middlewareNamespace`
   /// is 'x', then that middleware will be available as 'x.y' in the main application.
   /// These namespaces can be nested.
-  use(Pattern path, Routable routable,
+  void use(Pattern path, Routable routable,
       {bool hooked: true, String middlewareNamespace: null}) {
     Routable _routable = routable;
 
@@ -115,6 +122,9 @@ class Routable extends Extensible {
           new RegExp(r'(^\/+)|(\/+$)'), '') + '/$servicePath';
       services[newServicePath] = _routable.services[servicePath];
     }
+
+    if (routable is Service)
+      _onService.add(routable);
   }
 
   /// Adds a route that responds to the given path
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index b49329f1..7bc9bce0 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -4,8 +4,8 @@ part of angel_framework.http;
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
 /// Handles an [AngelHttpException].
-typedef Future AngelErrorHandler(
-    AngelHttpException err, RequestContext req, ResponseContext res);
+typedef Future AngelErrorHandler(AngelHttpException err, RequestContext req,
+    ResponseContext res);
 
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
@@ -14,15 +14,25 @@ typedef Future AngelConfigurer(Angel app);
 class Angel extends Routable {
   var _beforeProcessed = new StreamController<HttpRequest>();
   var _afterProcessed = new StreamController<HttpRequest>();
+  var _onController = new StreamController<Controller>.broadcast();
 
+  /// Fired before a request is processed. Always runs.
   Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
+
+  /// Fired after a request is processed. Always runs.
   Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
 
+  /// Fired whenever a controller is added to this instance.
+  ///
+  /// **NOTE**: This is a broadcast stream.
+  Stream<Controller> get onController => _onController.stream;
+
   ServerGenerator _serverGenerator =
       (address, port) async => await HttpServer.bind(address, port);
 
   /// Default error handler, show HTML error page
-  AngelErrorHandler _errorHandler = (AngelHttpException e, req, ResponseContext res) {
+  AngelErrorHandler _errorHandler = (AngelHttpException e, req,
+      ResponseContext res) {
     res.header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
     res.status(e.statusCode);
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
@@ -37,7 +47,8 @@ class Angel extends Routable {
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
-  ViewGenerator viewGenerator = (String view, [Map data]) async => "No view engine has been configured yet.";
+  ViewGenerator viewGenerator = (String view,
+      [Map data]) async => "No view engine has been configured yet.";
 
   /// [RequestMiddleware] to be run before all requests.
   List before = [];
@@ -53,7 +64,7 @@ class Angel extends Routable {
   /// Returns false on failure; otherwise, returns the HttpServer.
   startServer(InternetAddress address, int port) async {
     var server =
-        await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
+    await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
     this.httpServer = server;
 
     server.listen(handleRequest);
@@ -64,7 +75,8 @@ class Angel extends Routable {
   Future handleRequest(HttpRequest request) async {
     _beforeProcessed.add(request);
     String req_url =
-    request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(new RegExp(r'\/+$'), '');
+    request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(
+        new RegExp(r'\/+$'), '');
     if (req_url.isEmpty) req_url = '/';
     RequestContext req = await RequestContext.from(request, {}, this, null);
     ResponseContext res = await ResponseContext.from(request.response, this);
@@ -122,8 +134,8 @@ class Angel extends Routable {
     _finalizeResponse(request, res);
   }
 
-  Future<bool> _applyHandler(
-      handler, RequestContext req, ResponseContext res) async {
+  Future<bool> _applyHandler(handler, RequestContext req,
+      ResponseContext res) async {
     if (handler is RequestMiddleware) {
       var result = await handler(req, res);
       if (result is bool)
@@ -190,6 +202,9 @@ class Angel extends Routable {
   /// Applies an [AngelConfigurer] to this instance.
   Future configure(AngelConfigurer configurer) async {
     await configurer(this);
+
+    if (configurer is Controller)
+      _onController.add(configurer);
   }
 
   /// Starts the server.
@@ -231,7 +246,7 @@ class Angel extends Routable {
       : super() {
     _serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
-          Platform.script.resolve('server_chain.pem').toFilePath();
+      Platform.script.resolve('server_chain.pem').toFilePath();
       var serverKey = Platform.script.resolve('server_key.pem').toFilePath();
       var serverContext = new SecurityContext();
       serverContext.useCertificateChain(certificateChain);
diff --git a/pubspec.yaml b/pubspec.yaml
index 5fdf2a91..0a670cd2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.13
+version: 1.0.0-dev.14
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/services.dart b/test/services.dart
index d40d82e2..160ab668 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -1,3 +1,4 @@
+import 'package:angel_framework/defs.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;

From 41b891039ec725d6a66bd05f98ab4b0057b38836 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 13 Sep 2016 23:01:22 -0400
Subject: [PATCH 038/414] Create TODO.md

---
 TODO.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 TODO.md

diff --git a/TODO.md b/TODO.md
new file mode 100644
index 00000000..8d74b2ae
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,6 @@
+* Support for [Trestle](https://github.com/dart-bridge/trestle), use this as default, set up migration system around this
+* Angel CLI
+* Angel bootstrap project
+* More docs
+* Make tutorials, videos
+* Launch!

From 6d9fa4304c563d9c72ce844eba339b3f755e0dd8 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 13 Sep 2016 23:03:19 -0400
Subject: [PATCH 039/414] Update TODO.md

---
 TODO.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/TODO.md b/TODO.md
index 8d74b2ae..79881fd8 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,3 +4,5 @@
 * More docs
 * Make tutorials, videos
 * Launch!
+* Get rid of `part` and `part of`, so that we can make as much isomorphic as possible
+* Get a nice launch process, so we can pre-compile things before running. Also support a sort of hot-reload

From 4cab64f14f2ced3177cb06c337488893eefd189f Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 15 Sep 2016 15:53:01 -0400
Subject: [PATCH 040/414] Got rid of 'part', added 'export'. Also fixed
 attachment

---
 TODO.md                                       |   1 -
 lib/angel_framework.dart                      |   3 +-
 lib/{ => src}/defs.dart                       |   0
 lib/src/{http => }/extensible.dart            |   4 +-
 lib/src/http/angel_base.dart                  |  15 ++
 ...{errors.dart => angel_http_exception.dart} |   6 +-
 lib/src/http/controller.dart                  |  48 ++--
 ...ervice_hooked.dart => hooked_service.dart} |  23 +-
 lib/src/http/http.dart                        |  37 +--
 .../memory.dart => memory_service.dart}       |  10 +-
 lib/src/http/{metadata => }/metadata.dart     |   2 +-
 lib/src/http/request_context.dart             |  21 +-
 lib/src/http/response_context.dart            |  22 +-
 lib/src/http/routable.dart                    |  49 ++--
 lib/src/http/route.dart                       |   2 +-
 lib/src/http/server.dart                      |  27 +-
 lib/src/http/service.dart                     |  28 +-
 lib/src/util.dart                             |  26 ++
 test/all_tests.dart                           |  12 +
 test/common.dart                              |   4 +-
 test/controller.dart                          |  85 ++++---
 test/hooked.dart                              |   4 +-
 test/routing.dart                             | 240 +++++++++---------
 test/services.dart                            | 190 +++++++-------
 24 files changed, 472 insertions(+), 387 deletions(-)
 rename lib/{ => src}/defs.dart (100%)
 rename lib/src/{http => }/extensible.dart (92%)
 create mode 100644 lib/src/http/angel_base.dart
 rename lib/src/http/{errors.dart => angel_http_exception.dart} (96%)
 rename lib/src/http/{service_hooked.dart => hooked_service.dart} (92%)
 rename lib/src/http/{services/memory.dart => memory_service.dart} (90%)
 rename lib/src/http/{metadata => }/metadata.dart (93%)
 create mode 100644 lib/src/util.dart
 create mode 100644 test/all_tests.dart

diff --git a/TODO.md b/TODO.md
index 79881fd8..3381eeda 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,5 +4,4 @@
 * More docs
 * Make tutorials, videos
 * Launch!
-* Get rid of `part` and `part of`, so that we can make as much isomorphic as possible
 * Get a nice launch process, so we can pre-compile things before running. Also support a sort of hot-reload
diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
index 7a624d51..636c6ca2 100644
--- a/lib/angel_framework.dart
+++ b/lib/angel_framework.dart
@@ -1,4 +1,5 @@
 /// An easily-extensible web server framework in Dart.
 library angel_framework;
 
-export 'src/http/http.dart';
\ No newline at end of file
+export 'src/http/http.dart';
+export 'src/defs.dart';
\ No newline at end of file
diff --git a/lib/defs.dart b/lib/src/defs.dart
similarity index 100%
rename from lib/defs.dart
rename to lib/src/defs.dart
diff --git a/lib/src/http/extensible.dart b/lib/src/extensible.dart
similarity index 92%
rename from lib/src/http/extensible.dart
rename to lib/src/extensible.dart
index 5ed88f44..b14b8255 100644
--- a/lib/src/http/extensible.dart
+++ b/lib/src/extensible.dart
@@ -1,4 +1,6 @@
-part of angel_framework.http;
+library angel_framework.extensible;
+
+import 'dart:mirrors';
 
 /// Supports accessing members of a Map as though they were actual members.
 class Extensible {
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
new file mode 100644
index 00000000..d95e5cf4
--- /dev/null
+++ b/lib/src/http/angel_base.dart
@@ -0,0 +1,15 @@
+library angel_framework.http.angel_base;
+
+import 'dart:async';
+import 'routable.dart';
+
+/// A function that asynchronously generates a view from the given path and data.
+typedef Future<String> ViewGenerator(String path, [Map data]);
+
+class AngelBase extends Routable {
+  /// A function that renders views.
+  ///
+  /// Called by [ResponseContext]@`render`.
+  ViewGenerator viewGenerator = (String view,
+      [Map data]) async => "No view engine has been configured yet.";
+}
\ No newline at end of file
diff --git a/lib/src/http/errors.dart b/lib/src/http/angel_http_exception.dart
similarity index 96%
rename from lib/src/http/errors.dart
rename to lib/src/http/angel_http_exception.dart
index 84fd482f..3e91b312 100644
--- a/lib/src/http/errors.dart
+++ b/lib/src/http/angel_http_exception.dart
@@ -1,4 +1,4 @@
-part of angel_framework.http;
+library angel_framework.http.angel_http_exception;
 
 class _AngelHttpExceptionBase implements Exception {
   /// An HTTP status code this exception will throw.
@@ -18,7 +18,7 @@ class _AngelHttpExceptionBase implements Exception {
     return "$statusCode: $message";
   }
 
-  Map toMap() {
+  Map toJson() {
     return {
       'isError': true,
       'statusCode': statusCode,
@@ -26,6 +26,8 @@ class _AngelHttpExceptionBase implements Exception {
       'errors': errors
     };
   }
+
+  Map toMap() => toJson();
 }
 
 /// Basically the same as
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 369b9b7b..99d6c0d7 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -1,27 +1,22 @@
-part of angel_framework.http;
+library angel_framework.http.controller;
+
+import 'dart:async';
+import 'dart:mirrors';
+import 'angel_base.dart';
+import 'angel_http_exception.dart';
+import 'metadata.dart';
+import 'request_context.dart';
+import 'response_context.dart';
+import 'routable.dart';
+import 'route.dart';
 
 class Controller {
-  Angel app;
+  AngelBase app;
   List middleware = [];
   List<Route> routes = [];
-  Map<String, Route> _mappings = {};
+  Map<String, Route> routeMappings = {};
   Expose exposeDecl;
 
-  Future call(Angel app) async {
-    this.app = app;
-    Routable routable = new Routable()
-      ..routes.addAll(routes);
-    app.use(exposeDecl.path, routable);
-
-    TypeMirror typeMirror = reflectType(this.runtimeType);
-    String name = exposeDecl.as;
-
-    if (name == null || name.isEmpty)
-      name = MirrorSystem.getName(typeMirror.simpleName);
-
-    app.controllers[name] = this;
-  }
-
   Controller() {
     // Load global expose decl
     ClassMirror classMirror = reflectClass(this.runtimeType);
@@ -91,9 +86,24 @@ class Controller {
           if (name == null || name.isEmpty)
             name = MirrorSystem.getName(key);
 
-          _mappings[name] = route;
+          routeMappings[name] = route;
         }
       }
     });
   }
+
+  Future call(AngelBase app) async {
+    this.app = app;
+    app.use(exposeDecl.path, generateRoutable());
+
+    TypeMirror typeMirror = reflectType(this.runtimeType);
+    String name = exposeDecl.as;
+
+    if (name == null || name.isEmpty)
+      name = MirrorSystem.getName(typeMirror.simpleName);
+
+    app.controllers[name] = this;
+  }
+
+  Routable generateRoutable() => new Routable()..routes.addAll(routes);
 }
\ No newline at end of file
diff --git a/lib/src/http/service_hooked.dart b/lib/src/http/hooked_service.dart
similarity index 92%
rename from lib/src/http/service_hooked.dart
rename to lib/src/http/hooked_service.dart
index cad0fc75..3fe18df4 100644
--- a/lib/src/http/service_hooked.dart
+++ b/lib/src/http/hooked_service.dart
@@ -1,4 +1,11 @@
-part of angel_framework.http;
+library angel_framework.http;
+
+import 'dart:async';
+import 'package:merge_map/merge_map.dart';
+import '../util.dart';
+import 'metadata.dart';
+import 'route.dart';
+import 'service.dart';
 
 /// Wraps another service in a service that broadcasts events on actions.
 class HookedService extends Service {
@@ -38,22 +45,22 @@ class HookedService extends Service {
     Map restProvider = {'provider': Providers.REST};
 
     // Add global middleware if declared on the instance itself
-    Middleware before = _getAnnotation(inner, Middleware);
+    Middleware before = getAnnotation(inner, Middleware);
     if (before != null) {
       routes.add(new Route("*", "*", before.handlers));
     }
 
-    Middleware indexMiddleware = _getAnnotation(inner.index, Middleware);
+    Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
     get('/', (req, res) async {
       return await this.index(mergeMap([req.query, restProvider]));
     }, middleware: (indexMiddleware == null) ? [] : indexMiddleware.handlers);
 
-    Middleware createMiddleware = _getAnnotation(inner.create, Middleware);
+    Middleware createMiddleware = getAnnotation(inner.create, Middleware);
     post('/', (req, res) async => await this.create(req.body, restProvider),
         middleware:
         (createMiddleware == null) ? [] : createMiddleware.handlers);
 
-    Middleware readMiddleware = _getAnnotation(inner.read, Middleware);
+    Middleware readMiddleware = getAnnotation(inner.read, Middleware);
 
     get(
         '/:id',
@@ -61,7 +68,7 @@ class HookedService extends Service {
         .read(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: (readMiddleware == null) ? [] : readMiddleware.handlers);
 
-    Middleware modifyMiddleware = _getAnnotation(inner.modify, Middleware);
+    Middleware modifyMiddleware = getAnnotation(inner.modify, Middleware);
     patch(
         '/:id',
         (req, res) async =>
@@ -69,7 +76,7 @@ class HookedService extends Service {
         middleware:
         (modifyMiddleware == null) ? [] : modifyMiddleware.handlers);
 
-    Middleware updateMiddleware = _getAnnotation(inner.update, Middleware);
+    Middleware updateMiddleware = getAnnotation(inner.update, Middleware);
     post(
         '/:id',
         (req, res) async =>
@@ -77,7 +84,7 @@ class HookedService extends Service {
         middleware:
         (updateMiddleware == null) ? [] : updateMiddleware.handlers);
 
-    Middleware removeMiddleware = _getAnnotation(inner.remove, Middleware);
+    Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
     delete(
         '/:id',
         (req, res) async => await this
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index da16ecd9..80028e27 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -1,27 +1,16 @@
-/// HTTP logic
+/// Various libraries useful for creating highly-extensible servers.
 library angel_framework.http;
 
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'dart:math';
-import 'dart:mirrors';
-import 'package:body_parser/body_parser.dart';
-import 'package:json_god/json_god.dart' as god;
-import 'package:merge_map/merge_map.dart';
-import 'package:mime/mime.dart';
-import '../../defs.dart';
-
-part 'controller.dart';
-part 'extensible.dart';
-part 'errors.dart';
-part 'metadata/metadata.dart';
-part 'request_context.dart';
-part 'response_context.dart';
-part 'route.dart';
-part 'routable.dart';
-part 'server.dart';
-part 'service.dart';
-part 'service_hooked.dart';
-part 'services/memory.dart';
+export 'angel_base.dart';
+export 'angel_http_exception.dart';
+export 'controller.dart';
+export 'hooked_service.dart';
+export 'metadata.dart';
+export 'memory_service.dart';
+export 'request_context.dart';
+export 'response_context.dart';
+export 'routable.dart';
+export 'route.dart';
+export 'server.dart';
+export 'service.dart';
 
diff --git a/lib/src/http/services/memory.dart b/lib/src/http/memory_service.dart
similarity index 90%
rename from lib/src/http/services/memory.dart
rename to lib/src/http/memory_service.dart
index 7619f8c5..7e68599e 100644
--- a/lib/src/http/services/memory.dart
+++ b/lib/src/http/memory_service.dart
@@ -1,4 +1,12 @@
-part of angel_framework.http;
+library angel_framework.http.memory_service;
+
+import 'dart:async';
+import 'dart:mirrors';
+import 'package:json_god/json_god.dart' as god;
+import 'package:merge_map/merge_map.dart';
+import '../defs.dart';
+import 'angel_http_exception.dart';
+import 'service.dart';
 
 /// An in-memory [Service].
 class MemoryService<T> extends Service {
diff --git a/lib/src/http/metadata/metadata.dart b/lib/src/http/metadata.dart
similarity index 93%
rename from lib/src/http/metadata/metadata.dart
rename to lib/src/http/metadata.dart
index af164495..1e96c449 100644
--- a/lib/src/http/metadata/metadata.dart
+++ b/lib/src/http/metadata.dart
@@ -1,4 +1,4 @@
-part of angel_framework.http;
+library angel_framework.http.metadata;
 
 /// Annotation to map middleware onto a handler.
 class Middleware {
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index da2beca5..3ae4d88a 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -1,18 +1,15 @@
-part of angel_framework.http;
-
-/// A function that intercepts a request and determines whether handling of it should continue.
-typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
-
-/// A function that receives an incoming [RequestContext] and responds to it.
-typedef Future RequestHandler(RequestContext req, ResponseContext res);
-
-/// A function that handles an [HttpRequest].
-typedef Future RawRequestHandler(HttpRequest request);
+library angel_framework.http.request_context;
+import 'dart:async';
+import 'dart:io';
+import 'package:body_parser/body_parser.dart';
+import '../../src/extensible.dart';
+import 'angel_base.dart';
+import 'route.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
 class RequestContext extends Extensible {
   /// The [Angel] instance that is responding to this request.
-  Angel app;
+  AngelBase app;
 
   /// Any cookies sent with this request.
   List<Cookie> get cookies => underlyingRequest.cookies;
@@ -66,7 +63,7 @@ class RequestContext extends Extensible {
 
   /// Magically transforms an [HttpRequest] into a RequestContext.
   static Future<RequestContext> from(HttpRequest request,
-      Map parameters, Angel app, Route sourceRoute) async {
+      Map parameters, AngelBase app, Route sourceRoute) async {
     RequestContext context = new RequestContext();
 
     context.app = app;
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index cfef32a9..5067b88c 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -1,12 +1,19 @@
-part of angel_framework.http;
+library angel_framework.http.response_context;
 
-/// A function that asynchronously generates a view from the given path and data.
-typedef Future<String> ViewGenerator(String path, [Map data]);
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:json_god/json_god.dart' as god;
+import 'package:mime/mime.dart';
+import '../extensible.dart';
+import 'angel_base.dart';
+import 'controller.dart';
+import 'route.dart';
 
 /// A convenience wrapper around an outgoing HTTP request.
 class ResponseContext extends Extensible {
   /// The [Angel] instance that is sending a response.
-  Angel app;
+  AngelBase app;
 
   /// Can we still write to this response?
   bool isOpen = true;
@@ -32,8 +39,7 @@ class ResponseContext extends Extensible {
 
   /// Sends a download as a response.
   download(File file, {String filename}) {
-    header("Content-Disposition",
-        'Content-Disposition: attachment; filename="${filename ?? file.path}"');
+    header("Content-Disposition", 'attachment; filename="${filename ?? file.path}"');
     header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
     header(HttpHeaders.CONTENT_LENGTH, file.lengthSync().toString());
     responseData.add(file.readAsBytesSync());
@@ -116,7 +122,7 @@ class ResponseContext extends Extensible {
     if (controller == null)
       throw new Exception("Could not find a controller named '${split[0]}'");
 
-    Route matched = controller._mappings[split[1]];
+    Route matched = controller.routeMappings[split[1]];
 
     if (matched == null)
       throw new Exception("Controller '${split[0]}' does not contain any action named '${split[1]}'");
@@ -147,7 +153,7 @@ class ResponseContext extends Extensible {
 
   /// Magically transforms an [HttpResponse] object into a ResponseContext.
   static Future<ResponseContext> from
-      (HttpResponse response, Angel app) async
+      (HttpResponse response, AngelBase app) async
   {
     ResponseContext context = new ResponseContext(response);
     context.app = app;
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 45a6637e..4d65ce72 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -1,30 +1,29 @@
-part of angel_framework.http;
+library angel_framework.http.routable;
+
+import 'dart:async';
+import 'dart:io';
+import 'dart:mirrors';
+import '../extensible.dart';
+import '../util.dart';
+import 'angel_base.dart';
+import 'controller.dart';
+import 'hooked_service.dart';
+import 'metadata.dart';
+import 'request_context.dart';
+import 'response_context.dart';
+import 'route.dart';
+import 'service.dart';
 
 typedef Route RouteAssigner(Pattern path, handler, {List middleware});
 
-_matchingAnnotation(List<InstanceMirror> metadata, Type T) {
-  for (InstanceMirror metaDatum in metadata) {
-    if (metaDatum.hasReflectee) {
-      var reflectee = metaDatum.reflectee;
-      if (reflectee.runtimeType == T) {
-        return reflectee;
-      }
-    }
-  }
-  return null;
-}
+/// A function that intercepts a request and determines whether handling of it should continue.
+typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 
-_getAnnotation(obj, Type T) {
-  if (obj is Function || obj is Future) {
-    MethodMirror methodMirror = (reflect(obj) as ClosureMirror).function;
-    return _matchingAnnotation(methodMirror.metadata, T);
-  } else {
-    ClassMirror classMirror = reflectClass(obj.runtimeType);
-    return _matchingAnnotation(classMirror.metadata, T);
-  }
+/// A function that receives an incoming [RequestContext] and responds to it.
+typedef Future RequestHandler(RequestContext req, ResponseContext res);
 
-  return null;
-}
+/// A function that handles an [HttpRequest].
+typedef Future RawRequestHandler(HttpRequest request);
 
 /// A routable server that can handle dynamic requests.
 class Routable extends Extensible {
@@ -75,7 +74,7 @@ class Routable extends Extensible {
     // If we need to hook this service, do it here. It has to be first, or
     // else all routes will point to the old service.
     if (_routable is Service) {
-      Hooked hookedDeclaration = _getAnnotation(_routable, Hooked);
+      Hooked hookedDeclaration = getAnnotation(_routable, Hooked);
       Service service = (hookedDeclaration != null || hooked)
           ? new HookedService(_routable)
           : _routable;
@@ -84,7 +83,7 @@ class Routable extends Extensible {
       _routable = service;
     }
 
-    if (_routable is Angel) {
+    if (_routable is AngelBase) {
       all(path, (RequestContext req, ResponseContext res) async {
         req.app = _routable;
         res.app = _routable;
@@ -135,7 +134,7 @@ class Routable extends Extensible {
     List handlers = [];
 
     // Merge @Middleware declaration, if any
-    Middleware middlewareDeclaration = _getAnnotation(
+    Middleware middlewareDeclaration = getAnnotation(
         handler, Middleware);
     if (middlewareDeclaration != null) {
       handlers.addAll(middlewareDeclaration.handlers);
diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
index 1abcb771..ab3588de 100644
--- a/lib/src/http/route.dart
+++ b/lib/src/http/route.dart
@@ -1,4 +1,4 @@
-part of angel_framework.http;
+library angel_framework.http.route;
 
 /// Represents an endpoint open for connection via the Internet.
 class Route {
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 7bc9bce0..001dee81 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -1,4 +1,17 @@
-part of angel_framework.http;
+library angel_framework.http.server;
+
+import 'dart:async';
+import 'dart:io';
+import 'dart:math' show Random;
+import 'package:json_god/json_god.dart' as god;
+import 'angel_base.dart';
+import 'angel_http_exception.dart';
+import 'controller.dart';
+import 'request_context.dart';
+import 'response_context.dart';
+import 'routable.dart';
+import 'route.dart';
+import 'service.dart';
 
 /// A function that binds an [Angel] server to an Internet address and port.
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
@@ -7,11 +20,11 @@ typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 typedef Future AngelErrorHandler(AngelHttpException err, RequestContext req,
     ResponseContext res);
 
-/// A function that configures an [Angel] server in some way.
-typedef Future AngelConfigurer(Angel app);
+/// A function that configures an [AngelBase] server in some way.
+typedef Future AngelConfigurer(AngelBase app);
 
 /// A powerful real-time/REST/MVC server class.
-class Angel extends Routable {
+class Angel extends AngelBase {
   var _beforeProcessed = new StreamController<HttpRequest>();
   var _afterProcessed = new StreamController<HttpRequest>();
   var _onController = new StreamController<Controller>.broadcast();
@@ -44,12 +57,6 @@ class Angel extends Routable {
     res.end();
   };
 
-  /// A function that renders views.
-  ///
-  /// Called by [ResponseContext]@`render`.
-  ViewGenerator viewGenerator = (String view,
-      [Map data]) async => "No view engine has been configured yet.";
-
   /// [RequestMiddleware] to be run before all requests.
   List before = [];
 
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index cdee9f21..c12e8a35 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -1,4 +1,14 @@
-part of angel_framework.http;
+library angel_framework.http.service;
+
+import 'dart:async';
+import 'package:merge_map/merge_map.dart';
+import '../defs.dart';
+import '../util.dart';
+import 'angel_base.dart';
+import 'angel_http_exception.dart';
+import 'metadata.dart';
+import 'routable.dart';
+import 'route.dart';
 
 /// Indicates how the service was accessed.
 ///
@@ -25,7 +35,7 @@ class Providers {
 /// Heavily inspired by FeathersJS. <3
 class Service extends Routable {
   /// The [Angel] app powering this service.
-  Angel app;
+  AngelBase app;
 
   /// Retrieves all resources.
   Future<List> index([Map params]) {
@@ -61,22 +71,22 @@ class Service extends Routable {
     Map restProvider = {'provider': Providers.REST};
 
     // Add global middleware if declared on the instance itself
-    Middleware before = _getAnnotation(this, Middleware);
+    Middleware before = getAnnotation(this, Middleware);
     if (before != null) {
       routes.add(new Route("*", "*", before.handlers));
     }
 
-    Middleware indexMiddleware = _getAnnotation(this.index, Middleware);
+    Middleware indexMiddleware = getAnnotation(this.index, Middleware);
     get('/', (req, res) async {
       return await this.index(mergeMap([req.query, restProvider]));
     }, middleware: (indexMiddleware == null) ? [] : indexMiddleware.handlers);
 
-    Middleware createMiddleware = _getAnnotation(this.create, Middleware);
+    Middleware createMiddleware = getAnnotation(this.create, Middleware);
     post('/', (req, res) async => await this.create(req.body, restProvider),
         middleware:
             (createMiddleware == null) ? [] : createMiddleware.handlers);
 
-    Middleware readMiddleware = _getAnnotation(this.read, Middleware);
+    Middleware readMiddleware = getAnnotation(this.read, Middleware);
 
     get(
         '/:id',
@@ -84,7 +94,7 @@ class Service extends Routable {
             .read(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: (readMiddleware == null) ? [] : readMiddleware.handlers);
 
-    Middleware modifyMiddleware = _getAnnotation(this.modify, Middleware);
+    Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
     patch(
         '/:id',
         (req, res) async =>
@@ -92,7 +102,7 @@ class Service extends Routable {
         middleware:
             (modifyMiddleware == null) ? [] : modifyMiddleware.handlers);
 
-    Middleware updateMiddleware = _getAnnotation(this.update, Middleware);
+    Middleware updateMiddleware = getAnnotation(this.update, Middleware);
     post(
         '/:id',
         (req, res) async =>
@@ -100,7 +110,7 @@ class Service extends Routable {
         middleware:
             (updateMiddleware == null) ? [] : updateMiddleware.handlers);
 
-    Middleware removeMiddleware = _getAnnotation(this.remove, Middleware);
+    Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
     delete(
         '/:id',
         (req, res) async => await this
diff --git a/lib/src/util.dart b/lib/src/util.dart
new file mode 100644
index 00000000..ad614889
--- /dev/null
+++ b/lib/src/util.dart
@@ -0,0 +1,26 @@
+import 'dart:async';
+import 'dart:mirrors';
+
+matchingAnnotation(List<InstanceMirror> metadata, Type T) {
+  for (InstanceMirror metaDatum in metadata) {
+    if (metaDatum.hasReflectee) {
+      var reflectee = metaDatum.reflectee;
+      if (reflectee.runtimeType == T) {
+        return reflectee;
+      }
+    }
+  }
+  return null;
+}
+
+getAnnotation(obj, Type T) {
+  if (obj is Function || obj is Future) {
+    MethodMirror methodMirror = (reflect(obj) as ClosureMirror).function;
+    return matchingAnnotation(methodMirror.metadata, T);
+  } else {
+    ClassMirror classMirror = reflectClass(obj.runtimeType);
+    return matchingAnnotation(classMirror.metadata, T);
+  }
+
+  return null;
+}
\ No newline at end of file
diff --git a/test/all_tests.dart b/test/all_tests.dart
new file mode 100644
index 00000000..1df0368c
--- /dev/null
+++ b/test/all_tests.dart
@@ -0,0 +1,12 @@
+import 'package:test/test.dart';
+import 'controller.dart' as controller;
+import 'hooked.dart' as hooked;
+import 'routing.dart' as routing;
+import 'services.dart' as services;
+
+main() {
+  group('controller', controller.main);
+  group('hooked', hooked.main);
+  group('routing', routing.main);
+  group('services', services.main);
+}
\ No newline at end of file
diff --git a/test/common.dart b/test/common.dart
index 54a28992..cb9ffe1e 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -1,6 +1,8 @@
 library angel_framework.test.common;
 
-class Todo {
+import 'package:angel_framework/src/defs.dart';
+
+class Todo extends MemoryModel {
   String text;
   String over;
 
diff --git a/test/controller.dart b/test/controller.dart
index 41faed23..c85a9037 100644
--- a/test/controller.dart
+++ b/test/controller.dart
@@ -19,61 +19,62 @@ class TodoController extends Controller {
   }
 
   @Expose("/namedRoute/:foo", as: "foo")
-  Future<String> someRandomRoute(RequestContext req, ResponseContext res) async {
+  Future<String> someRandomRoute(RequestContext req,
+      ResponseContext res) async {
     return "${req.params['foo']}!";
   }
 }
 
 main() {
-  group("controller", () {
-    Angel app = new Angel();
-    HttpServer server;
-    InternetAddress host = InternetAddress.LOOPBACK_IP_V4;
-    int port = 3000;
-    http.Client client;
-    String url = "http://${host.address}:$port";
+  Angel app = new Angel();
+  HttpServer server;
+  InternetAddress host = InternetAddress.LOOPBACK_IP_V4;
+  int port = 3000;
+  http.Client client;
+  String url = "http://${host.address}:$port";
 
-    setUp(() async {
-      app.registerMiddleware("foo", (req, res) async => res.write("Hello, "));
-      app.registerMiddleware("bar", (req, res) async => res.write("world!"));
-      app.get("/redirect", (req, ResponseContext res) async =>
-          res.redirectToAction("TodoController@foo", {"foo": "world"}));
-      await app.configure(new TodoController());
+  setUp(() async {
+    app.registerMiddleware("foo", (req, res) async => res.write("Hello, "));
+    app.registerMiddleware("bar", (req, res) async => res.write("world!"));
+    app.get("/redirect", (req, ResponseContext res) async =>
+        res.redirectToAction("TodoController@foo", {"foo": "world"}));
+    await app.configure(new TodoController());
 
-      print(app.controllers);
-      print("\nDUMPING ROUTES:");
-      app.routes.forEach((Route route) {
-        print("\t${route.method} ${route.path} -> ${route.handlers}");
-      });
-      print("\n");
-
-      server = await app.startServer(host, port);
-      client = new http.Client();
+    print(app.controllers);
+    print("\nDUMPING ROUTES:");
+    app.routes.forEach((Route route) {
+      print("\t${route.method} ${route.path} -> ${route.handlers}");
     });
+    print("\n");
 
-    tearDown(() async {
-      await server.close(force: true);
-      client.close();
-      client = null;
-    });
+    server = await app.startServer(host, port);
+    client = new http.Client();
+  });
 
-    test("middleware", () async {
-      var response = await client.get("$url/todos/0");
-      print(response.body);
+  tearDown(() async {
+    await server.close(force: true);
+    client.close();
+    client = null;
+  });
 
-      expect(response.body.indexOf("Hello, "), equals(0));
+  test("middleware", () async {
+    var rgx = new RegExp("^Hello, world!");
+    var response = await client.get("$url/todos/0");
+    print(response.body);
 
-      Map todo = JSON.decode(response.body.substring(7));
-      expect(todo.keys.length, equals(2));
-      expect(todo['text'], equals("Hello"));
-      expect(todo['over'], equals("world"));
-    });
+    expect(response.body.indexOf("Hello, "), equals(0));
 
-    test("named actions", () async {
-      var response = await client.get("$url/redirect");
-      print(response.body);
+    Map todo = JSON.decode(response.body.replaceAll(rgx, ""));
+    print("Todo: $todo");
+    expect(todo.keys.length, equals(3));
+    expect(todo['text'], equals("Hello"));
+    expect(todo['over'], equals("world"));
+  });
 
-      expect(response.body, equals("Hello, \"world!\""));
-    });
+  test("named actions", () async {
+    var response = await client.get("$url/redirect");
+    print(response.body);
+
+    expect(response.body, equals("Hello, \"world!\""));
   });
 }
diff --git a/test/hooked.dart b/test/hooked.dart
index c4d5616f..b72d7930 100644
--- a/test/hooked.dart
+++ b/test/hooked.dart
@@ -5,8 +5,7 @@ import 'package:test/test.dart';
 import 'common.dart';
 
 main() {
-  group('Hooked', () {
-    Map headers = {
+  Map headers = {
       'Accept': 'application/json',
       'Content-Type': 'application/json'
     };
@@ -77,5 +76,4 @@ main() {
       List result = god.deserialize(response.body);
       expect(result[0]["angel"], equals("framework"));
     });
-  });
 }
\ No newline at end of file
diff --git a/test/routing.dart b/test/routing.dart
index cdcd3caf..d72b1a90 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -19,144 +19,140 @@ class QueryService extends Service {
 }
 
 main() {
-  group('routing', () {
-    Angel angel;
-    Angel nested;
-    Angel todos;
-    String url;
-    http.Client client;
+  Angel angel;
+  Angel nested;
+  Angel todos;
+  String url;
+  http.Client client;
 
-    setUp(() async {
-      angel = new Angel();
-      nested = new Angel();
-      todos = new Angel();
+  setUp(() async {
+    angel = new Angel();
+    nested = new Angel();
+    todos = new Angel();
 
-      angel
-        ..registerMiddleware('interceptor', (req, res) async {
-          res.write('Middleware');
-          return false;
-        })
-        ..registerMiddleware('intercept_service',
-            (RequestContext req, res) async {
-          print("Intercepting a service!");
-          return true;
-        });
-
-      todos.get('/action/:action', (req, res) => res.json(req.params));
-      nested.post('/ted/:route', (req, res) => res.json(req.params));
-      angel.get('/meta', testMiddlewareMetadata);
-      angel.get('/intercepted', 'This should not be shown',
-          middleware: ['interceptor']);
-      angel.get('/hello', 'world');
-      angel.get('/name/:first/last/:last', (req, res) => req.params);
-      angel.post('/lambda', (req, res) => req.body);
-      angel.use('/nes', nested);
-      angel.use('/todos/:id', todos);
-      angel
-          .get('/greet/:name',
-              (RequestContext req, res) async => "Hello ${req.params['name']}")
-          .as('Named routes');
-      angel.get('/named', (req, ResponseContext res) async {
-        res.redirectTo('Named routes', {'name': 'tests'});
-      });
-      angel.get('/log', (RequestContext req, res) async {
-        print("Query: ${req.query}");
-        return "Logged";
-      });
-      angel.use('/query', new QueryService());
-      angel.get('*', 'MJ');
-
-      print("DUMPING ROUTES: ");
-      for (Route route in angel.routes) {
-        print("${route.method} ${route.path} - ${route.handlers}");
-      }
-
-      client = new http.Client();
-      await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
-      url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
+    angel..registerMiddleware('interceptor', (req, res) async {
+      res.write('Middleware');
+      return false;
+    })..registerMiddleware('intercept_service',
+        (RequestContext req, res) async {
+      print("Intercepting a service!");
+      return true;
     });
 
-    tearDown(() async {
-      await angel.httpServer.close(force: true);
-      angel = null;
-      nested = null;
-      todos = null;
-      client.close();
-      client = null;
-      url = null;
+    todos.get('/action/:action', (req, res) => res.json(req.params));
+    nested.post('/ted/:route', (req, res) => res.json(req.params));
+    angel.get('/meta', testMiddlewareMetadata);
+    angel.get('/intercepted', 'This should not be shown',
+        middleware: ['interceptor']);
+    angel.get('/hello', 'world');
+    angel.get('/name/:first/last/:last', (req, res) => req.params);
+    angel.post('/lambda', (req, res) => req.body);
+    angel.use('/nes', nested);
+    angel.use('/todos/:id', todos);
+    angel
+        .get('/greet/:name',
+        (RequestContext req, res) async => "Hello ${req.params['name']}")
+        .as('Named routes');
+    angel.get('/named', (req, ResponseContext res) async {
+      res.redirectTo('Named routes', {'name': 'tests'});
     });
-
-    test('Can match basic url', () async {
-      var response = await client.get("$url/hello");
-      expect(response.body, equals('"world"'));
+    angel.get('/log', (RequestContext req, res) async {
+      print("Query: ${req.query}");
+      return "Logged";
     });
+    angel.use('/query', new QueryService());
+    angel.get('*', 'MJ');
 
-    test('Can match url with multiple parameters', () async {
-      var response = await client.get('$url/name/HELLO/last/WORLD');
-      var json = god.deserialize(response.body);
-      expect(json['first'], equals('HELLO'));
-      expect(json['last'], equals('WORLD'));
-    });
+    print("DUMPING ROUTES: ");
+    for (Route route in angel.routes) {
+      print("${route.method} ${route.path} - ${route.handlers}");
+    }
 
-    test('Can nest another Angel instance', () async {
-      var response = await client.post('$url/nes/ted/foo');
-      var json = god.deserialize(response.body);
-      expect(json['route'], equals('foo'));
-    });
+    client = new http.Client();
+    await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+    url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
+  });
 
-    test('Can parse parameters from a nested Angel instance', () async {
-      var response = await client.get('$url/todos/1337/action/test');
-      var json = god.deserialize(response.body);
-      expect(json['id'], equals(1337));
-      expect(json['action'], equals('test'));
-    });
+  tearDown(() async {
+    await angel.httpServer.close(force: true);
+    angel = null;
+    nested = null;
+    todos = null;
+    client.close();
+    client = null;
+    url = null;
+  });
 
-    test('Can add and use named middleware', () async {
-      var response = await client.get('$url/intercepted');
-      expect(response.body, equals('Middleware'));
-    });
+  test('Can match basic url', () async {
+    var response = await client.get("$url/hello");
+    expect(response.body, equals('"world"'));
+  });
 
-    test('Middleware via metadata', () async {
-      // Metadata
-      var response = await client.get('$url/meta');
-      expect(response.body, equals('Middleware'));
-    });
+  test('Can match url with multiple parameters', () async {
+    var response = await client.get('$url/name/HELLO/last/WORLD');
+    var json = god.deserialize(response.body);
+    expect(json['first'], equals('HELLO'));
+    expect(json['last'], equals('WORLD'));
+  });
 
-    test('Can serialize function result as JSON', () async {
-      Map headers = {'Content-Type': 'application/json'};
-      String postData = god.serialize({'it': 'works'});
-      var response =
-          await client.post("$url/lambda", headers: headers, body: postData);
-      expect(god.deserialize(response.body)['it'], equals('works'));
-    });
+  test('Can nest another Angel instance', () async {
+    var response = await client.post('$url/nes/ted/foo');
+    var json = god.deserialize(response.body);
+    expect(json['route'], equals('foo'));
+  });
 
-    test('Fallback routes', () async {
-      var response = await client.get('$url/my_favorite_artist');
-      expect(response.body, equals('"MJ"'));
-    });
+  test('Can parse parameters from a nested Angel instance', () async {
+    var response = await client.get('$url/todos/1337/action/test');
+    var json = god.deserialize(response.body);
+    expect(json['id'], equals(1337));
+    expect(json['action'], equals('test'));
+  });
 
-    test('Can name routes', () {
-      Route foo = angel.get('/framework/:id', 'Angel').as('frm');
-      String uri = foo.makeUri({'id': 'angel'});
-      print(uri);
-      expect(uri, equals('/framework/angel'));
-    });
+  test('Can add and use named middleware', () async {
+    var response = await client.get('$url/intercepted');
+    expect(response.body, equals('Middleware'));
+  });
 
-    test('Redirect to named routes', () async {
-      var response = await client.get('$url/named');
-      print(response.body);
-      expect(god.deserialize(response.body), equals('Hello tests'));
-    });
+  test('Middleware via metadata', () async {
+    // Metadata
+    var response = await client.get('$url/meta');
+    expect(response.body, equals('Middleware'));
+  });
 
-    test('Match routes, even with query params', () async {
-      var response =
-          await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
-      print(response.body);
-      expect(god.deserialize(response.body), equals('Logged'));
+  test('Can serialize function result as JSON', () async {
+    Map headers = {'Content-Type': 'application/json'};
+    String postData = god.serialize({'it': 'works'});
+    var response =
+    await client.post("$url/lambda", headers: headers, body: postData);
+    expect(god.deserialize(response.body)['it'], equals('works'));
+  });
 
-      response = await client.get("$url/query/foo?bar=baz");
-      print(response.body);
-      expect(response.body, equals("Middleware"));
-    });
+  test('Fallback routes', () async {
+    var response = await client.get('$url/my_favorite_artist');
+    expect(response.body, equals('"MJ"'));
+  });
+
+  test('Can name routes', () {
+    Route foo = angel.get('/framework/:id', 'Angel').as('frm');
+    String uri = foo.makeUri({'id': 'angel'});
+    print(uri);
+    expect(uri, equals('/framework/angel'));
+  });
+
+  test('Redirect to named routes', () async {
+    var response = await client.get('$url/named');
+    print(response.body);
+    expect(god.deserialize(response.body), equals('Hello tests'));
+  });
+
+  test('Match routes, even with query params', () async {
+    var response =
+    await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
+    print(response.body);
+    expect(god.deserialize(response.body), equals('Logged'));
+
+    response = await client.get("$url/query/foo?bar=baz");
+    print(response.body);
+    expect(response.body, equals("Middleware"));
   });
 }
diff --git a/test/services.dart b/test/services.dart
index 160ab668..70cf063e 100644
--- a/test/services.dart
+++ b/test/services.dart
@@ -1,4 +1,4 @@
-import 'package:angel_framework/defs.dart';
+import 'package:angel_framework/src/defs.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
@@ -10,109 +10,107 @@ class Todo extends MemoryModel {
 }
 
 main() {
-  group('Services', () {
-    Map headers = {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json'
-    };
-    Angel app;
-    String url;
-    http.Client client;
+  Map headers = {
+    'Accept': 'application/json',
+    'Content-Type': 'application/json'
+  };
+  Angel app;
+  String url;
+  http.Client client;
 
-    setUp(() async {
-      app = new Angel();
-      client = new http.Client();
-      Service todos = new MemoryService<Todo>();
-      app.use('/todos', todos);
-      print(app.service("todos"));
-      await app.startServer(null, 0);
-      url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
+  setUp(() async {
+    app = new Angel();
+    client = new http.Client();
+    Service todos = new MemoryService<Todo>();
+    app.use('/todos', todos);
+    print(app.service("todos"));
+    await app.startServer(null, 0);
+    url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
+  });
+
+  tearDown(() async {
+    app = null;
+    url = null;
+    client.close();
+    client = null;
+  });
+
+  group('memory', () {
+    test('can index an empty service', () async {
+      var response = await client.get("$url/todos/");
+      print(response.body);
+      expect(response.body, equals('[]'));
+      for (int i = 0; i < 3; i++) {
+        String postData = god.serialize({'text': 'Hello, world!'});
+        await client.post(
+            "$url/todos", headers: headers, body: postData);
+      }
+      response = await client.get("$url/todos");
+      print(response.body);
+      expect(god
+          .deserialize(response.body)
+          .length, equals(3));
     });
 
-    tearDown(() async {
-      app = null;
-      url = null;
-      client.close();
-      client = null;
+    test('can create data', () async {
+      String postData = god.serialize({'text': 'Hello, world!'});
+      var response = await client.post(
+          "$url/todos", headers: headers, body: postData);
+      var json = god.deserialize(response.body);
+      print(json);
+      expect(json['text'], equals('Hello, world!'));
     });
 
-    group('memory', () {
-      test('can index an empty service', () async {
-        var response = await client.get("$url/todos/");
-        print(response.body);
-        expect(response.body, equals('[]'));
-        for (int i = 0; i < 3; i++) {
-          String postData = god.serialize({'text': 'Hello, world!'});
-          await client.post(
-              "$url/todos", headers: headers, body: postData);
-        }
-        response = await client.get("$url/todos");
-        print(response.body);
-        expect(god
-            .deserialize(response.body)
-            .length, equals(3));
-      });
+    test('can fetch data', () async {
+      String postData = god.serialize({'text': 'Hello, world!'});
+      await client.post(
+          "$url/todos", headers: headers, body: postData);
+      var response = await client.get(
+          "$url/todos/0");
+      var json = god.deserialize(response.body);
+      print(json);
+      expect(json['text'], equals('Hello, world!'));
+    });
 
-      test('can create data', () async {
-        String postData = god.serialize({'text': 'Hello, world!'});
-        var response = await client.post(
-            "$url/todos", headers: headers, body: postData);
-        var json = god.deserialize(response.body);
-        print(json);
-        expect(json['text'], equals('Hello, world!'));
-      });
+    test('can modify data', () async {
+      String postData = god.serialize({'text': 'Hello, world!'});
+      await client.post(
+          "$url/todos", headers: headers, body: postData);
+      postData = god.serialize({'text': 'modified'});
+      var response = await client.patch(
+          "$url/todos/0", headers: headers, body: postData);
+      var json = god.deserialize(response.body);
+      print(json);
+      expect(json['text'], equals('modified'));
+    });
 
-      test('can fetch data', () async {
-        String postData = god.serialize({'text': 'Hello, world!'});
-        await client.post(
-            "$url/todos", headers: headers, body: postData);
-        var response = await client.get(
-            "$url/todos/0");
-        var json = god.deserialize(response.body);
-        print(json);
-        expect(json['text'], equals('Hello, world!'));
-      });
+    test('can overwrite data', () async {
+      String postData = god.serialize({'text': 'Hello, world!'});
+      await client.post(
+          "$url/todos", headers: headers, body: postData);
+      postData = god.serialize({'over': 'write'});
+      var response = await client.post(
+          "$url/todos/0", headers: headers, body: postData);
+      var json = god.deserialize(response.body);
+      print(json);
+      expect(json['text'], equals(null));
+      expect(json['over'], equals('write'));
+    });
 
-      test('can modify data', () async {
-        String postData = god.serialize({'text': 'Hello, world!'});
-        await client.post(
-            "$url/todos", headers: headers, body: postData);
-        postData = god.serialize({'text': 'modified'});
-        var response = await client.patch(
-            "$url/todos/0", headers: headers, body: postData);
-        var json = god.deserialize(response.body);
-        print(json);
-        expect(json['text'], equals('modified'));
-      });
-
-      test('can overwrite data', () async {
-        String postData = god.serialize({'text': 'Hello, world!'});
-        await client.post(
-            "$url/todos", headers: headers, body: postData);
-        postData = god.serialize({'over': 'write'});
-        var response = await client.post(
-            "$url/todos/0", headers: headers, body: postData);
-        var json = god.deserialize(response.body);
-        print(json);
-        expect(json['text'], equals(null));
-        expect(json['over'], equals('write'));
-      });
-
-      test('can delete data', () async {
-        String postData = god.serialize({'text': 'Hello, world!'});
-        await client.post(
-            "$url/todos", headers: headers, body: postData);
-        var response = await client.delete(
-            "$url/todos/0");
-        var json = god.deserialize(response.body);
-        print(json);
-        expect(json['text'], equals('Hello, world!'));
-        response = await client.get("$url/todos");
-        print(response.body);
-        expect(god
-            .deserialize(response.body)
-            .length, equals(0));
-      });
+    test('can delete data', () async {
+      String postData = god.serialize({'text': 'Hello, world!'});
+      await client.post(
+          "$url/todos", headers: headers, body: postData);
+      var response = await client.delete(
+          "$url/todos/0");
+      var json = god.deserialize(response.body);
+      print(json);
+      expect(json['text'], equals('Hello, world!'));
+      response = await client.get("$url/todos");
+      print(response.body);
+      expect(god
+          .deserialize(response.body)
+          .length, equals(0));
     });
   });
 }
\ No newline at end of file

From 52c5112d9369df1b0cca5c59a8f670ea5146d20e Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 15 Sep 2016 15:53:25 -0400
Subject: [PATCH 041/414] 1.0.0-dev.15

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 0a670cd2..b8f78b59 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.14
+version: 1.0.0-dev.15
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From dfbfc4cbcfef2537b5355b2340ba007904d69464 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 17 Sep 2016 12:12:25 -0400
Subject: [PATCH 042/414] Dependency Injection! :)

---
 lib/src/http/angel_base.dart      |   5 +
 lib/src/http/base_middleware.dart |   9 ++
 lib/src/http/base_plugin.dart     |   8 ++
 lib/src/http/controller.dart      |  24 +++--
 lib/src/http/server.dart          | 163 +++++++++++++++++++++---------
 pubspec.yaml                      |   7 +-
 test/all_tests.dart               |   2 +
 test/di.dart                      |  87 ++++++++++++++++
 8 files changed, 249 insertions(+), 56 deletions(-)
 create mode 100644 lib/src/http/base_middleware.dart
 create mode 100644 lib/src/http/base_plugin.dart
 create mode 100644 test/di.dart

diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index d95e5cf4..2229c02d 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -1,12 +1,17 @@
 library angel_framework.http.angel_base;
 
 import 'dart:async';
+import 'package:container/container.dart';
 import 'routable.dart';
 
 /// A function that asynchronously generates a view from the given path and data.
 typedef Future<String> ViewGenerator(String path, [Map data]);
 
 class AngelBase extends Routable {
+  Container _container = new Container();
+  /// A [Container] used to inject dependencies.
+  Container get container => _container;
+
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
diff --git a/lib/src/http/base_middleware.dart b/lib/src/http/base_middleware.dart
new file mode 100644
index 00000000..ca3c5282
--- /dev/null
+++ b/lib/src/http/base_middleware.dart
@@ -0,0 +1,9 @@
+library angel_framework.http.base_middleware;
+
+import 'dart:async';
+import 'request_context.dart';
+import 'response_context.dart';
+
+abstract class BaseMiddleware {
+  Future<bool> call(RequestContext req, ResponseContext res);
+}
\ No newline at end of file
diff --git a/lib/src/http/base_plugin.dart b/lib/src/http/base_plugin.dart
new file mode 100644
index 00000000..ec5ed301
--- /dev/null
+++ b/lib/src/http/base_plugin.dart
@@ -0,0 +1,8 @@
+library angel_framework.http.base_plugin;
+
+import 'dart:async';
+import 'server.dart';
+
+abstract class AngelPlugin {
+  Future call(Angel app);
+}
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 99d6c0d7..08f94aa1 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -56,16 +56,26 @@ class Controller {
                 args.add(req);
               else if (parameter.type.reflectedType == ResponseContext)
                 args.add(res);
-              else {
-                String name = MirrorSystem.getName(parameter.simpleName);
+              else {String name = MirrorSystem.getName(parameter.simpleName);
                 var arg = req.params[name];
 
-                if (arg == null &&
-                    !exposeMirror.reflectee.allowNull.contain(name)) {
-                  throw new AngelHttpException.BadRequest();
-                }
+                if (arg == null) {
+                  if (parameter.type.reflectedType != dynamic) {
+                    try {
+                      arg = app.container.make(parameter.type.reflectedType);
+                      if (arg != null) {
+                        args.add(arg);
+                        continue;
+                      }
+                    } catch(e) {
+                      //
+                    }
+                  }
 
-                args.add(arg);
+                  if (!exposeMirror.reflectee.allowNull.contain(name))
+                    throw new AngelHttpException.BadRequest(message: "Missing parameter '$name'");
+
+                } else args.add(arg);
               }
             }
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 001dee81..6bffaa2a 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -3,6 +3,7 @@ library angel_framework.http.server;
 import 'dart:async';
 import 'dart:io';
 import 'dart:math' show Random;
+import 'dart:mirrors';
 import 'package:json_god/json_god.dart' as god;
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
@@ -12,40 +13,41 @@ import 'response_context.dart';
 import 'routable.dart';
 import 'route.dart';
 import 'service.dart';
+export 'package:container/container.dart';
 
 /// A function that binds an [Angel] server to an Internet address and port.
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
 /// Handles an [AngelHttpException].
-typedef Future AngelErrorHandler(AngelHttpException err, RequestContext req,
-    ResponseContext res);
+typedef Future AngelErrorHandler(
+    AngelHttpException err, RequestContext req, ResponseContext res);
 
 /// A function that configures an [AngelBase] server in some way.
 typedef Future AngelConfigurer(AngelBase app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
-  var _beforeProcessed = new StreamController<HttpRequest>();
-  var _afterProcessed = new StreamController<HttpRequest>();
+  var _afterProcessed = new StreamController<HttpRequest>.broadcast();
+  var _beforeProcessed = new StreamController<HttpRequest>.broadcast();
   var _onController = new StreamController<Controller>.broadcast();
+  ServerGenerator _serverGenerator =
+      (address, port) async => await HttpServer.bind(address, port);
+
+  /// Fired after a request is processed. Always runs.
+  Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
 
   /// Fired before a request is processed. Always runs.
   Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
 
-  /// Fired after a request is processed. Always runs.
-  Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
 
   /// Fired whenever a controller is added to this instance.
   ///
   /// **NOTE**: This is a broadcast stream.
   Stream<Controller> get onController => _onController.stream;
 
-  ServerGenerator _serverGenerator =
-      (address, port) async => await HttpServer.bind(address, port);
-
   /// Default error handler, show HTML error page
-  AngelErrorHandler _errorHandler = (AngelHttpException e, req,
-      ResponseContext res) {
+  AngelErrorHandler _errorHandler =
+      (AngelHttpException e, req, ResponseContext res) {
     res.header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
     res.status(e.statusCode);
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
@@ -69,9 +71,9 @@ class Angel extends AngelBase {
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
-  startServer(InternetAddress address, int port) async {
+  Future<HttpServer> startServer([InternetAddress address, int port]) async {
     var server =
-    await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port);
+        await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0);
     this.httpServer = server;
 
     server.listen(handleRequest);
@@ -79,29 +81,42 @@ class Angel extends AngelBase {
     return server;
   }
 
+  /// Loads some base dependencies into the service container.
+  void bootstrapContainer() {
+    container.singleton(this, as: AngelBase);
+    container.singleton(this);
+
+    if (runtimeType != Angel)
+      container.singleton(this, as: Angel);
+  }
+
   Future handleRequest(HttpRequest request) async {
     _beforeProcessed.add(request);
-    String req_url =
-    request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(
-        new RegExp(r'\/+$'), '');
-    if (req_url.isEmpty) req_url = '/';
+
+    String requestedUrl = request.uri
+        .toString()
+        .replaceAll("?" + request.uri.query, "")
+        .replaceAll(new RegExp(r'\/+$'), '');
+
+    if (requestedUrl.isEmpty) requestedUrl = '/';
+
     RequestContext req = await RequestContext.from(request, {}, this, null);
     ResponseContext res = await ResponseContext.from(request.response, this);
 
     bool canContinue = true;
 
-    var execHandler = (handler, req) async {
+    executeHandler(handler, req) async {
       if (canContinue) {
-        canContinue = await new Future.sync(() async {
-          return _applyHandler(handler, req, res);
-        }).catchError((e, [StackTrace stackTrace]) async {
+        try {
+          canContinue = await _applyHandler(handler, req, res);
+        } catch (e, stackTrace) {
           if (e is AngelHttpException) {
             // Special handling for AngelHttpExceptions :)
             try {
               res.status(e.statusCode);
               String accept = request.headers.value(HttpHeaders.ACCEPT);
               if (accept == "*/*" ||
-                  accept.contains("application/json") ||
+                  accept.contains(ContentType.JSON.mimeType) ||
                   accept.contains("application/javascript")) {
                 res.json(e.toMap());
               } else {
@@ -113,38 +128,41 @@ class Angel extends AngelBase {
           _onError(e, stackTrace);
           canContinue = false;
           return false;
-        });
+        }
       } else
         return false;
-    };
+    }
 
     for (var handler in before) {
-      await execHandler(handler, req);
+      await executeHandler(handler, req);
     }
 
     for (Route route in routes) {
       if (!canContinue) break;
-      if (route.matcher.hasMatch(req_url) &&
+
+      if (route.matcher.hasMatch(requestedUrl) &&
           (request.method == route.method || route.method == '*')) {
-        req.params = route.parseParameters(req_url);
+        req.params = route.parseParameters(requestedUrl);
         req.route = route;
 
         for (var handler in route.handlers) {
-          await execHandler(handler, req);
+          await executeHandler(handler, req);
         }
       }
     }
 
     for (var handler in after) {
-      await execHandler(handler, req);
+      await executeHandler(handler, req);
     }
+
     _finalizeResponse(request, res);
   }
 
-  Future<bool> _applyHandler(handler, RequestContext req,
-      ResponseContext res) async {
+  Future<bool> _applyHandler(
+      handler, RequestContext req, ResponseContext res) async {
     if (handler is RequestMiddleware) {
       var result = await handler(req, res);
+
       if (result is bool)
         return result == true;
       else if (result != null) {
@@ -157,7 +175,9 @@ class Angel extends AngelBase {
     if (handler is RequestHandler) {
       await handler(req, res);
       return res.isOpen;
-    } else if (handler is RawRequestHandler) {
+    }
+
+    if (handler is RawRequestHandler) {
       var result = await handler(req.underlyingRequest);
       if (result is bool)
         return result == true;
@@ -166,8 +186,10 @@ class Angel extends AngelBase {
         return false;
       } else
         return true;
-    } else if (handler is Function || handler is Future) {
-      var result = await handler();
+    }
+
+    if (handler is Future) {
+      var result = await handler;
       if (result is bool)
         return result == true;
       else if (result != null) {
@@ -175,14 +197,27 @@ class Angel extends AngelBase {
         return false;
       } else
         return true;
-    } else if (requestMiddleware.containsKey(handler)) {
-      return await _applyHandler(requestMiddleware[handler], req, res);
-    } else {
-      res.willCloseItself = true;
-      res.underlyingResponse.write(god.serialize(handler));
-      await res.underlyingResponse.close();
-      return false;
     }
+
+    if (handler is Function) {
+      var result = await runContained(handler, req, res);
+      if (result is bool)
+        return result == true;
+      else if (result != null) {
+        res.json(result);
+        return false;
+      } else
+        return true;
+    }
+
+    if (requestMiddleware.containsKey(handler)) {
+      return await _applyHandler(requestMiddleware[handler], req, res);
+    }
+
+    res.willCloseItself = true;
+    res.underlyingResponse.write(god.serialize(handler));
+    await res.underlyingResponse.close();
+    return false;
   }
 
   _finalizeResponse(HttpRequest request, ResponseContext res) async {
@@ -193,7 +228,7 @@ class Angel extends AngelBase {
         _afterProcessed.add(request);
       }
     } catch (e) {
-      // Remember: This fails silently
+      failSilently(request, res);
     }
   }
 
@@ -206,14 +241,47 @@ class Angel extends AngelBase {
     return new String.fromCharCodes(codeUnits);
   }
 
+  // Run a function after injecting from service container
+  Future runContained(Function handler, RequestContext req, ResponseContext res) async {
+    ClosureMirror closureMirror = reflect(handler);
+    List args = [];
+
+    for (ParameterMirror parameter in closureMirror.function.parameters) {
+      if (parameter.type.reflectedType == RequestContext)
+        args.add(req);
+      else if (parameter.type.reflectedType == ResponseContext)
+        args.add(res);
+      else {
+        // First, search to see if we can map this to a type
+        if (parameter.type.reflectedType != dynamic) {
+          args.add(container.make(parameter.type.reflectedType));
+        } else {
+          String name = MirrorSystem.getName(parameter.simpleName);
+
+          if (name == "req")
+            args.add(req);
+          else if (name == "res")
+            args.add(res);
+          else {
+            throw new Exception("Cannot resolve parameter '$name' within handler.");
+          }
+        }
+      }
+    }
+
+    return await closureMirror.apply(args).reflectee;
+  }
+
   /// Applies an [AngelConfigurer] to this instance.
   Future configure(AngelConfigurer configurer) async {
     await configurer(this);
 
-    if (configurer is Controller)
-      _onController.add(configurer);
+    if (configurer is Controller) _onController.add(configurer);
   }
 
+  /// Fallback when an error is thrown while handling a request.
+  void failSilently(HttpRequest request, ResponseContext res) {}
+
   /// Starts the server.
   void listen({InternetAddress address, int port: 3000}) {
     runZoned(() async {
@@ -242,7 +310,9 @@ class Angel extends AngelBase {
     if (stackTrace != null) stderr.write(stackTrace.toString());
   }
 
-  Angel() : super() {}
+  Angel() : super() {
+    bootstrapContainer();
+  }
 
   /// Creates an HTTPS server.
   /// Provide paths to a certificate chain and server key (both .pem).
@@ -251,9 +321,10 @@ class Angel extends AngelBase {
   Angel.secure(String certificateChainPath, String serverKeyPath,
       {String password})
       : super() {
+    bootstrapContainer();
     _serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
-      Platform.script.resolve('server_chain.pem').toFilePath();
+          Platform.script.resolve('server_chain.pem').toFilePath();
       var serverKey = Platform.script.resolve('server_key.pem').toFilePath();
       var serverContext = new SecurityContext();
       serverContext.useCertificateChain(certificateChain);
diff --git a/pubspec.yaml b/pubspec.yaml
index b8f78b59..de100a9e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,14 @@
 name: angel_framework
-version: 1.0.0-dev.15
+version: 1.0.0-dev.16
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 dependencies:
   body_parser: ">=1.0.0-dev <2.0.0"
+  container: ">=0.1.2 <1.0.0"
   json_god: ">=2.0.0-beta <3.0.0"
   merge_map: ">=1.0.0 <2.0.0"
   mime: ">=0.9.3 <1.0.0"
 dev_dependencies:
-  http: ">= 0.11.3 < 0.12.0"
-  test: ">= 0.12.13 < 0.13.0"
\ No newline at end of file
+  http: ">= 0.11.3 <0.12.0"
+  test: ">= 0.12.13 <0.13.0"
\ No newline at end of file
diff --git a/test/all_tests.dart b/test/all_tests.dart
index 1df0368c..3b289eef 100644
--- a/test/all_tests.dart
+++ b/test/all_tests.dart
@@ -1,5 +1,6 @@
 import 'package:test/test.dart';
 import 'controller.dart' as controller;
+import 'di.dart' as di;
 import 'hooked.dart' as hooked;
 import 'routing.dart' as routing;
 import 'services.dart' as services;
@@ -7,6 +8,7 @@ import 'services.dart' as services;
 main() {
   group('controller', controller.main);
   group('hooked', hooked.main);
+  group('di', di.main);
   group('routing', routing.main);
   group('services', services.main);
 }
\ No newline at end of file
diff --git a/test/di.dart b/test/di.dart
new file mode 100644
index 00000000..8e2bdc22
--- /dev/null
+++ b/test/di.dart
@@ -0,0 +1,87 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:http/http.dart' as http;
+import 'package:test/test.dart';
+import 'common.dart';
+
+final String TEXT = "make your bed";
+final String OVER = "never";
+
+main() {
+  Angel app;
+  http.Client client;
+  HttpServer server;
+  String url;
+
+  setUp(() async {
+    app = new Angel();
+    client = new http.Client();
+
+    // Inject some todos
+    app.container.singleton(new Todo(text: TEXT, over: OVER));
+
+    app.get("/errands", (Todo singleton) => singleton);
+    app.get("/errands3", (Errand singleton, Todo foo, RequestContext req) => singleton.text);
+    await app.configure(new SingletonController());
+    await app.configure(new ErrandController());
+
+    server = await app.startServer();
+    url = "http://${server.address.host}:${server.port}";
+  });
+
+  tearDown(() async {
+    app = null;
+    url = null;
+    client.close();
+    client = null;
+    await server.close(force: true);
+  });
+
+  test("singleton in route", () async {
+    validateTodoSingleton(await client.get("$url/errands"));
+  });
+
+  test("singleton in controller", () async {
+    validateTodoSingleton(await client.get("$url/errands2"));
+  });
+
+  test("make in route", () async {
+    var response = await client.get("$url/errands3");
+    String text = await JSON.decode(response.body);
+    expect(text, equals(TEXT));
+  });
+
+  test("make in controller", () async {
+    var response = await client.get("$url/errands4");
+    String text = await JSON.decode(response.body);
+    expect(text, equals(TEXT));
+  });
+}
+
+void validateTodoSingleton(response) {
+  Map todo = JSON.decode(response.body);
+  expect(todo.keys.length, equals(3));
+  expect(todo["id"], equals(null));
+  expect(todo["text"], equals(TEXT));
+  expect(todo["over"], equals(OVER));
+}
+
+@Expose("/errands2")
+class SingletonController extends Controller {
+  @Expose("/")
+  todo(Todo singleton) => singleton;
+}
+
+@Expose("/errands4")
+class ErrandController extends Controller {
+  @Expose("/")
+  errand(Errand errand) => errand.text;
+}
+
+class Errand {
+  Todo todo;
+  String get text => todo.text;
+
+  Errand(this.todo);
+}
\ No newline at end of file

From 7077cf90891a0d34cbf6ca9919441263229fb43d Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 17 Sep 2016 12:13:52 -0400
Subject: [PATCH 043/414] Base

---
 lib/src/http/http.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 80028e27..92eb2c4c 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -3,6 +3,8 @@ library angel_framework.http;
 
 export 'angel_base.dart';
 export 'angel_http_exception.dart';
+export 'base_middleware.dart';
+export 'base_plugin.dart';
 export 'controller.dart';
 export 'hooked_service.dart';
 export 'metadata.dart';

From 35a0fedb2ef0084bfc36d84922e044918973f616 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 17 Sep 2016 16:01:25 -0400
Subject: [PATCH 044/414] Inject from req.params too

---
 lib/src/http/server.dart | 2 ++
 pubspec.yaml             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 6bffaa2a..528392aa 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -262,6 +262,8 @@ class Angel extends AngelBase {
             args.add(req);
           else if (name == "res")
             args.add(res);
+          else if (req.params.containsKey(name))
+            args.add(req.params[name]);
           else {
             throw new Exception("Cannot resolve parameter '$name' within handler.");
           }
diff --git a/pubspec.yaml b/pubspec.yaml
index de100a9e..90a765db 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.16
+version: 1.0.0-dev.17
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From bdcd9e251377c4809554cfa6a627d439c702fbba Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 17 Sep 2016 21:44:00 -0400
Subject: [PATCH 045/414] Improved DI

---
 lib/src/http/server.dart | 4 ++--
 pubspec.yaml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 528392aa..7efa66a5 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -242,7 +242,7 @@ class Angel extends AngelBase {
   }
 
   // Run a function after injecting from service container
-  Future runContained(Function handler, RequestContext req, ResponseContext res) async {
+  Future runContained(Function handler, RequestContext req, ResponseContext res, {Map<String, dynamic> namedParameters, Map<Type, dynamic> injecting}) async {
     ClosureMirror closureMirror = reflect(handler);
     List args = [];
 
@@ -254,7 +254,7 @@ class Angel extends AngelBase {
       else {
         // First, search to see if we can map this to a type
         if (parameter.type.reflectedType != dynamic) {
-          args.add(container.make(parameter.type.reflectedType));
+          args.add(container.make(parameter.type.reflectedType, namedParameters: namedParameters, injecting: injecting));
         } else {
           String name = MirrorSystem.getName(parameter.simpleName);
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 90a765db..66f86f61 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.17
+version: 1.0.0-dev.18
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From aea4ec1cf2629a0f9aa9a1f13fb30191d1962fed Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 17 Sep 2016 22:59:06 -0400
Subject: [PATCH 046/414] Improved DI 2

---
 lib/src/http/server.dart | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 7efa66a5..7400a136 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -39,7 +39,6 @@ class Angel extends AngelBase {
   /// Fired before a request is processed. Always runs.
   Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
 
-
   /// Fired whenever a controller is added to this instance.
   ///
   /// **NOTE**: This is a broadcast stream.
@@ -72,8 +71,8 @@ class Angel extends AngelBase {
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
   Future<HttpServer> startServer([InternetAddress address, int port]) async {
-    var server =
-        await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0);
+    var server = await _serverGenerator(
+        address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0);
     this.httpServer = server;
 
     server.listen(handleRequest);
@@ -86,8 +85,7 @@ class Angel extends AngelBase {
     container.singleton(this, as: AngelBase);
     container.singleton(this);
 
-    if (runtimeType != Angel)
-      container.singleton(this, as: Angel);
+    if (runtimeType != Angel) container.singleton(this, as: Angel);
   }
 
   Future handleRequest(HttpRequest request) async {
@@ -242,7 +240,9 @@ class Angel extends AngelBase {
   }
 
   // Run a function after injecting from service container
-  Future runContained(Function handler, RequestContext req, ResponseContext res, {Map<String, dynamic> namedParameters, Map<Type, dynamic> injecting}) async {
+  Future runContained(Function handler, RequestContext req, ResponseContext res,
+      {Map<String, dynamic> namedParameters,
+      Map<Type, dynamic> injecting}) async {
     ClosureMirror closureMirror = reflect(handler);
     List args = [];
 
@@ -254,18 +254,20 @@ class Angel extends AngelBase {
       else {
         // First, search to see if we can map this to a type
         if (parameter.type.reflectedType != dynamic) {
-          args.add(container.make(parameter.type.reflectedType, namedParameters: namedParameters, injecting: injecting));
+          args.add(container.make(parameter.type.reflectedType,
+              namedParameters: namedParameters, injecting: injecting));
         } else {
           String name = MirrorSystem.getName(parameter.simpleName);
 
-          if (name == "req")
+          if (req.params.containsKey(name))
+            args.add(req.params[name]);
+          else if (name == "req")
             args.add(req);
           else if (name == "res")
             args.add(res);
-          else if (req.params.containsKey(name))
-            args.add(req.params[name]);
           else {
-            throw new Exception("Cannot resolve parameter '$name' within handler.");
+            throw new Exception(
+                "Cannot resolve parameter '$name' within handler.");
           }
         }
       }

From 2cb63347a758dc65d8af8a3de4b190eb3c2e547f Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 19 Sep 2016 02:52:21 -0400
Subject: [PATCH 047/414] Better errors kinda

---
 lib/src/http/server.dart | 8 ++++++++
 pubspec.yaml             | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 7400a136..3525ef09 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -29,6 +29,7 @@ typedef Future AngelConfigurer(AngelBase app);
 class Angel extends AngelBase {
   var _afterProcessed = new StreamController<HttpRequest>.broadcast();
   var _beforeProcessed = new StreamController<HttpRequest>.broadcast();
+  var _fatalErrorStream = new StreamController<Map>.broadcast();
   var _onController = new StreamController<Controller>.broadcast();
   ServerGenerator _serverGenerator =
       (address, port) async => await HttpServer.bind(address, port);
@@ -39,6 +40,9 @@ class Angel extends AngelBase {
   /// Fired before a request is processed. Always runs.
   Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
 
+  /// Fired on fatal errors.
+  Stream<Map> get fatalErrorStream => _fatalErrorStream.stream;
+
   /// Fired whenever a controller is added to this instance.
   ///
   /// **NOTE**: This is a broadcast stream.
@@ -312,6 +316,10 @@ class Angel extends AngelBase {
   _onError(e, [StackTrace stackTrace]) {
     stderr.write(e.toString());
     if (stackTrace != null) stderr.write(stackTrace.toString());
+    _fatalErrorStream.add({
+      "error": e,
+      "stack": stackTrace
+    });
   }
 
   Angel() : super() {
diff --git a/pubspec.yaml b/pubspec.yaml
index 66f86f61..46dc7166 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.18
+version: 1.0.0-dev.19
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 848cf542708acfc2112191b767657f61ef3d905d Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 21 Sep 2016 01:10:21 -0400
Subject: [PATCH 048/414] get errorHandler

---
 lib/src/http/server.dart | 3 +++
 pubspec.yaml             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 3525ef09..cdc75279 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -62,6 +62,9 @@ class Angel extends AngelBase {
     res.end();
   };
 
+  /// The handler currently configured to run on [AngelHttpException]s.
+  AngelErrorHandler get errorHandler => _errorHandler;
+
   /// [RequestMiddleware] to be run before all requests.
   List before = [];
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 46dc7166..dd8a5f7d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.19
+version: 1.0.0-dev.20
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 376e2095bacfcddfe4560218cacd695c3d573d1b Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 21 Sep 2016 02:37:01 -0400
Subject: [PATCH 049/414] No more stderr

---
 lib/src/http/server.dart | 2 --
 pubspec.yaml             | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index cdc75279..a5757675 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -317,8 +317,6 @@ class Angel extends AngelBase {
 
   /// Handles a server error.
   _onError(e, [StackTrace stackTrace]) {
-    stderr.write(e.toString());
-    if (stackTrace != null) stderr.write(stackTrace.toString());
     _fatalErrorStream.add({
       "error": e,
       "stack": stackTrace
diff --git a/pubspec.yaml b/pubspec.yaml
index dd8a5f7d..4e70a091 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.20
+version: 1.0.0-dev.21
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 1bb077a3d9b9c400d04add48f19e0d6b58e19987 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 7 Oct 2016 17:39:41 -0400
Subject: [PATCH 050/414] CORS-able

---
 lib/src/http/server.dart | 2 +-
 pubspec.yaml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index a5757675..197e982c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -227,10 +227,10 @@ class Angel extends AngelBase {
 
   _finalizeResponse(HttpRequest request, ResponseContext res) async {
     try {
+      _afterProcessed.add(request);
       if (!res.willCloseItself) {
         res.responseData.forEach((blob) => request.response.add(blob));
         await request.response.close();
-        _afterProcessed.add(request);
       }
     } catch (e) {
       failSilently(request, res);
diff --git a/pubspec.yaml b/pubspec.yaml
index 4e70a091..abb87f81 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.21
+version: 1.0.0-dev.22
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 551a7f086fb76da53a9fc5175fbe037445af206f Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 22 Oct 2016 16:41:36 -0400
Subject: [PATCH 051/414] Route API change is breaking, haha.

---
 lib/src/extensible.dart            |  27 +---
 lib/src/http/angel_base.dart       |   3 +
 lib/src/http/controller.dart       | 181 +++++++++++++-------------
 lib/src/http/hooked_service.dart   |  72 ++++++-----
 lib/src/http/http.dart             |   2 +-
 lib/src/http/request_context.dart  |  72 ++++++-----
 lib/src/http/response_context.dart |  80 ++++++------
 lib/src/http/routable.dart         | 193 +++++++++++-----------------
 lib/src/http/route.dart            |  91 --------------
 lib/src/http/server.dart           | 196 ++++++++++++++---------------
 lib/src/http/service.dart          |  41 +++---
 pubspec.yaml                       |   2 +
 test/routing.dart                  |  56 +++++----
 test/util.dart                     |   2 -
 14 files changed, 447 insertions(+), 571 deletions(-)
 delete mode 100644 lib/src/http/route.dart

diff --git a/lib/src/extensible.dart b/lib/src/extensible.dart
index b14b8255..45ad12d4 100644
--- a/lib/src/extensible.dart
+++ b/lib/src/extensible.dart
@@ -1,28 +1,3 @@
 library angel_framework.extensible;
 
-import 'dart:mirrors';
-
-/// Supports accessing members of a Map as though they were actual members.
-class Extensible {
-  /// A set of custom properties that can be assigned to the server.
-  ///
-  /// Useful for configuration and extension.
-  Map properties = {};
-
-  noSuchMethod(Invocation invocation) {
-    if (invocation.memberName != null) {
-      String name = MirrorSystem.getName(invocation.memberName);
-      if (properties.containsKey(name)) {
-        if (invocation.isGetter)
-          return properties[name];
-        else if (invocation.isMethod) {
-          return Function.apply(
-              properties[name], invocation.positionalArguments,
-              invocation.namedArguments);
-        }
-      }
-    }
-
-    super.noSuchMethod(invocation);
-  }
-}
\ No newline at end of file
+export 'package:angel_route/src/extensible.dart';
\ No newline at end of file
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 2229c02d..25fc84be 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -8,7 +8,10 @@ import 'routable.dart';
 typedef Future<String> ViewGenerator(String path, [Map data]);
 
 class AngelBase extends Routable {
+  AngelBase({bool debug: false}):super(debug: debug);
+
   Container _container = new Container();
+
   /// A [Container] used to inject dependencies.
   Container get container => _container;
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 08f94aa1..f48516c5 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -2,106 +2,20 @@ library angel_framework.http.controller;
 
 import 'dart:async';
 import 'dart:mirrors';
+import 'package:angel_route/angel_route.dart';
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
-import 'route.dart';
 
 class Controller {
   AngelBase app;
   List middleware = [];
-  List<Route> routes = [];
   Map<String, Route> routeMappings = {};
   Expose exposeDecl;
 
-  Controller() {
-    // Load global expose decl
-    ClassMirror classMirror = reflectClass(this.runtimeType);
-
-    for (InstanceMirror metadatum in classMirror.metadata) {
-      if (metadatum.reflectee is Expose) {
-        exposeDecl = metadatum.reflectee;
-        break;
-      }
-    }
-
-    if (exposeDecl == null)
-      throw new Exception(
-          "All controllers must carry an @Expose() declaration.");
-    else routes.add(
-        new Route(
-            "*", "*", []..addAll(exposeDecl.middleware)..addAll(middleware)));
-
-    InstanceMirror instanceMirror = reflect(this);
-    classMirror.instanceMembers.forEach((Symbol key,
-        MethodMirror methodMirror) {
-      if (methodMirror.isRegularMethod && key != #toString &&
-          key != #noSuchMethod && key != #call && key != #equals &&
-          key != #==) {
-        InstanceMirror exposeMirror = methodMirror.metadata.firstWhere((
-            mirror) => mirror.reflectee is Expose, orElse: () => null);
-
-        if (exposeMirror != null) {
-          RequestHandler handler = (RequestContext req,
-              ResponseContext res) async {
-            List args = [];
-
-            // Load parameters, and execute
-            for (int i = 0; i < methodMirror.parameters.length; i++) {
-              ParameterMirror parameter = methodMirror.parameters[i];
-              if (parameter.type.reflectedType == RequestContext)
-                args.add(req);
-              else if (parameter.type.reflectedType == ResponseContext)
-                args.add(res);
-              else {String name = MirrorSystem.getName(parameter.simpleName);
-                var arg = req.params[name];
-
-                if (arg == null) {
-                  if (parameter.type.reflectedType != dynamic) {
-                    try {
-                      arg = app.container.make(parameter.type.reflectedType);
-                      if (arg != null) {
-                        args.add(arg);
-                        continue;
-                      }
-                    } catch(e) {
-                      //
-                    }
-                  }
-
-                  if (!exposeMirror.reflectee.allowNull.contain(name))
-                    throw new AngelHttpException.BadRequest(message: "Missing parameter '$name'");
-
-                } else args.add(arg);
-              }
-            }
-
-            return await instanceMirror
-                .invoke(key, args)
-                .reflectee;
-          };
-          Route route = new Route(
-              exposeMirror.reflectee.method,
-              exposeMirror.reflectee.path,
-              []
-                ..addAll(exposeMirror.reflectee.middleware)
-                ..add(handler));
-          routes.add(route);
-
-          String name = exposeMirror.reflectee.as;
-
-          if (name == null || name.isEmpty)
-            name = MirrorSystem.getName(key);
-
-          routeMappings[name] = route;
-        }
-      }
-    });
-  }
-
   Future call(AngelBase app) async {
     this.app = app;
     app.use(exposeDecl.path, generateRoutable());
@@ -115,5 +29,94 @@ class Controller {
     app.controllers[name] = this;
   }
 
-  Routable generateRoutable() => new Routable()..routes.addAll(routes);
-}
\ No newline at end of file
+  Routable generateRoutable() {
+    final routable = new Routable();
+
+    // Load global expose decl
+    ClassMirror classMirror = reflectClass(this.runtimeType);
+
+    for (InstanceMirror metadatum in classMirror.metadata) {
+      if (metadatum.reflectee is Expose) {
+        exposeDecl = metadatum.reflectee;
+        break;
+      }
+    }
+
+    if (exposeDecl == null) {
+      throw new Exception(
+          "All controllers must carry an @Expose() declaration.");
+    }
+
+    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
+
+    InstanceMirror instanceMirror = reflect(this);
+    classMirror.instanceMembers
+        .forEach((Symbol key, MethodMirror methodMirror) {
+      if (methodMirror.isRegularMethod &&
+          key != #toString &&
+          key != #noSuchMethod &&
+          key != #call &&
+          key != #equals &&
+          key != #==) {
+        InstanceMirror exposeMirror = methodMirror.metadata.firstWhere(
+            (mirror) => mirror.reflectee is Expose,
+            orElse: () => null);
+
+        if (exposeMirror != null) {
+          RequestHandler handler =
+              (RequestContext req, ResponseContext res) async {
+            List args = [];
+
+            // Load parameters, and execute
+            for (int i = 0; i < methodMirror.parameters.length; i++) {
+              ParameterMirror parameter = methodMirror.parameters[i];
+              if (parameter.type.reflectedType == RequestContext)
+                args.add(req);
+              else if (parameter.type.reflectedType == ResponseContext)
+                args.add(res);
+              else {
+                String name = MirrorSystem.getName(parameter.simpleName);
+                var arg = req.params[name];
+
+                if (arg == null) {
+                  if (parameter.type.reflectedType != dynamic) {
+                    try {
+                      arg = app.container.make(parameter.type.reflectedType);
+                      if (arg != null) {
+                        args.add(arg);
+                        continue;
+                      }
+                    } catch (e) {
+                      //
+                    }
+                  }
+
+                  if (!exposeMirror.reflectee.allowNull.contain(name))
+                    throw new AngelHttpException.BadRequest(
+                        message: "Missing parameter '$name'");
+                } else
+                  args.add(arg);
+              }
+            }
+
+            return await instanceMirror.invoke(key, args).reflectee;
+          };
+
+          final route = routable.addRoute(exposeMirror.reflectee.method,
+              exposeMirror.reflectee.path, handler,
+              middleware: []
+                ..addAll(handlers)
+                ..addAll(exposeMirror.reflectee.middleware));
+
+          String name = exposeMirror.reflectee.as;
+
+          if (name == null || name.isEmpty) name = MirrorSystem.getName(key);
+
+          routeMappings[name] = route;
+        }
+      }
+    });
+
+    return routable;
+  }
+}
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 3fe18df4..546e2e52 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -4,7 +4,6 @@ import 'dart:async';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'metadata.dart';
-import 'route.dart';
 import 'service.dart';
 
 /// Wraps another service in a service that broadcasts events on actions.
@@ -13,84 +12,95 @@ class HookedService extends Service {
   final Service inner;
 
   HookedServiceEventDispatcher beforeIndexed =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeRead = new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeCreated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeModified =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeUpdated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher beforeRemoved =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterIndexed =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterRead = new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterCreated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterModified =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterUpdated =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
   HookedServiceEventDispatcher afterRemoved =
-  new HookedServiceEventDispatcher();
+      new HookedServiceEventDispatcher();
 
   HookedService(Service this.inner) {
     // Clone app instance
-    if (inner.app != null)
-      this.app = inner.app;
+    if (inner.app != null) this.app = inner.app;
 
-    routes.clear();
     // Set up our routes. We still need to copy middleware from inner service
     Map restProvider = {'provider': Providers.REST};
 
     // Add global middleware if declared on the instance itself
     Middleware before = getAnnotation(inner, Middleware);
-    if (before != null) {
-      routes.add(new Route("*", "*", before.handlers));
-    }
+    final handlers = [];
+
+    if (before != null) handlers.add(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
     get('/', (req, res) async {
       return await this.index(mergeMap([req.query, restProvider]));
-    }, middleware: (indexMiddleware == null) ? [] : indexMiddleware.handlers);
+    },
+        middleware: []
+          ..addAll(handlers)
+          ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(inner.create, Middleware);
     post('/', (req, res) async => await this.create(req.body, restProvider),
-        middleware:
-        (createMiddleware == null) ? [] : createMiddleware.handlers);
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (createMiddleware == null) ? [] : createMiddleware.handlers));
 
     Middleware readMiddleware = getAnnotation(inner.read, Middleware);
 
     get(
         '/:id',
         (req, res) async => await this
-        .read(req.params['id'], mergeMap([req.query, restProvider])),
-        middleware: (readMiddleware == null) ? [] : readMiddleware.handlers);
+            .read(req.params['id'], mergeMap([req.query, restProvider])),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
     Middleware modifyMiddleware = getAnnotation(inner.modify, Middleware);
     patch(
         '/:id',
         (req, res) async =>
-    await this.modify(req.params['id'], req.body, restProvider),
-        middleware:
-        (modifyMiddleware == null) ? [] : modifyMiddleware.handlers);
+            await this.modify(req.params['id'], req.body, restProvider),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
     Middleware updateMiddleware = getAnnotation(inner.update, Middleware);
     post(
         '/:id',
         (req, res) async =>
-    await this.update(req.params['id'], req.body, restProvider),
-        middleware:
-        (updateMiddleware == null) ? [] : updateMiddleware.handlers);
+            await this.update(req.params['id'], req.body, restProvider),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
     delete(
         '/:id',
         (req, res) async => await this
-        .remove(req.params['id'], mergeMap([req.query, restProvider])),
-        middleware:
-        (removeMiddleware == null) ? [] : removeMiddleware.handlers);
+            .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
   }
 
   @override
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 92eb2c4c..c2859a48 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -1,6 +1,7 @@
 /// Various libraries useful for creating highly-extensible servers.
 library angel_framework.http;
 
+export 'package:angel_route/angel_route.dart';
 export 'angel_base.dart';
 export 'angel_http_exception.dart';
 export 'base_middleware.dart';
@@ -12,7 +13,6 @@ export 'memory_service.dart';
 export 'request_context.dart';
 export 'response_context.dart';
 export 'routable.dart';
-export 'route.dart';
 export 'server.dart';
 export 'service.dart';
 
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 3ae4d88a..af2544a3 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -1,13 +1,18 @@
 library angel_framework.http.request_context;
+
 import 'dart:async';
 import 'dart:io';
+import 'package:angel_route/src/extensible.dart';
 import 'package:body_parser/body_parser.dart';
-import '../../src/extensible.dart';
 import 'angel_base.dart';
-import 'route.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
 class RequestContext extends Extensible {
+  BodyParseResult _body;
+  ContentType _contentType;
+  String _path;
+  HttpRequest _underlyingRequest;
+
   /// The [Angel] instance that is responding to this request.
   AngelBase app;
 
@@ -27,59 +32,58 @@ class RequestContext extends Extensible {
   String get method => underlyingRequest.method;
 
   /// All post data submitted to the server.
-  Map body = {};
+  Map get body => _body.body;
 
   /// The content type of an incoming request.
-  ContentType contentType;
+  ContentType get contentType => _contentType;
 
   /// Any and all files sent to the server with this request.
-  List<FileUploadInfo> files = [];
+  List<FileUploadInfo> get files => _body.files;
 
   /// The URL parameters extracted from the request URI.
   Map params = {};
 
   /// The requested path.
-  String path;
+  String get path => _path;
 
   /// The parsed request query string.
-  Map query = {};
+  Map get query => _body.query;
 
   /// The remote address requesting this resource.
-  InternetAddress remoteAddress;
-
-  /// The route that matched this request.
-  Route route;
+  InternetAddress get remoteAddress =>
+      underlyingRequest.connectionInfo.remoteAddress;
 
   /// The user's HTTP session.
-  HttpSession session;
+  HttpSession get session => underlyingRequest.session;
+
+  /// The [Uri] instance representing the path this request is responding to.
+  Uri get uri => underlyingRequest.uri;
 
   /// Is this an **XMLHttpRequest**?
-  bool get xhr => underlyingRequest.headers.value("X-Requested-With")
-      ?.trim()
-      ?.toLowerCase() == 'xmlhttprequest';
+  bool get xhr =>
+      underlyingRequest.headers
+          .value("X-Requested-With")
+          ?.trim()
+          ?.toLowerCase() ==
+      'xmlhttprequest';
 
   /// The underlying [HttpRequest] instance underneath this context.
-  HttpRequest underlyingRequest;
+  HttpRequest get underlyingRequest => _underlyingRequest;
 
-  /// Magically transforms an [HttpRequest] into a RequestContext.
-  static Future<RequestContext> from(HttpRequest request,
-      Map parameters, AngelBase app, Route sourceRoute) async {
-    RequestContext context = new RequestContext();
+  /// Magically transforms an [HttpRequest] into a [RequestContext].
+  static Future<RequestContext> from(HttpRequest request, AngelBase app) async {
+    RequestContext ctx = new RequestContext();
 
-    context.app = app;
-    context.contentType = request.headers.contentType;
-    context.remoteAddress = request.connectionInfo.remoteAddress;
-    context.params = parameters;
-    context.path = request.uri.toString().replaceAll("?" + request.uri.query, "").replaceAll(new RegExp(r'\/+$'), '');
-    context.route = sourceRoute;
-    context.session = request.session;
-    context.underlyingRequest = request;
+    ctx.app = app;
+    ctx._contentType = request.headers.contentType;
+    ctx._path = request.uri
+        .toString()
+        .replaceAll("?" + request.uri.query, "")
+        .replaceAll(new RegExp(r'/+$'), '');
+    ctx._underlyingRequest = request;
 
-    BodyParseResult bodyParseResult = await parseBody(request);
-    context.query = bodyParseResult.query;
-    context.body = bodyParseResult.body;
-    context.files = bodyParseResult.files;
+    ctx._body = await parseBody(request);
 
-    return context;
+    return ctx;
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 5067b88c..84ffedb2 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -3,33 +3,35 @@ library angel_framework.http.response_context;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
 import '../extensible.dart';
 import 'angel_base.dart';
 import 'controller.dart';
-import 'route.dart';
 
 /// A convenience wrapper around an outgoing HTTP request.
 class ResponseContext extends Extensible {
+  bool _isOpen = true;
+
   /// The [Angel] instance that is sending a response.
   AngelBase app;
 
   /// Can we still write to this response?
-  bool isOpen = true;
+  bool get isOpen => _isOpen;
 
   /// A set of UTF-8 encoded bytes that will be written to the response.
-  List<List<int>> responseData = [];
+  final BytesBuilder buffer = new BytesBuilder();
 
   /// Sets the status code to be sent with this response.
-  status(int code) {
+  void status(int code) {
     underlyingResponse.statusCode = code;
   }
 
   /// The underlying [HttpResponse] under this instance.
-  HttpResponse underlyingResponse;
+  final HttpResponse underlyingResponse;
 
-  ResponseContext(this.underlyingResponse);
+  ResponseContext(this.underlyingResponse, this.app);
 
   /// Any and all cookies to be sent to the user.
   List<Cookie> get cookies => underlyingResponse.cookies;
@@ -38,31 +40,37 @@ class ResponseContext extends Extensible {
   bool willCloseItself = false;
 
   /// Sends a download as a response.
-  download(File file, {String filename}) {
-    header("Content-Disposition", 'attachment; filename="${filename ?? file.path}"');
+  download(File file, {String filename}) async {
+    header("Content-Disposition",
+        'attachment; filename="${filename ?? file.path}"');
     header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
     header(HttpHeaders.CONTENT_LENGTH, file.lengthSync().toString());
-    responseData.add(file.readAsBytesSync());
+    buffer.add(await file.readAsBytes());
+    end();
   }
 
   /// Prevents more data from being written to the response.
-  end() => isOpen = false;
+  void end() {
+    _isOpen = false;
+  }
 
   /// Sets a response header to the given value, or retrieves its value.
   header(String key, [String value]) {
-    if (value == null) return underlyingResponse.headers[key];
-    else underlyingResponse.headers.set(key, value);
+    if (value == null)
+      return underlyingResponse.headers[key];
+    else
+      underlyingResponse.headers.set(key, value);
   }
 
   /// Serializes JSON to the response.
-  json(value) {
+  void json(value) {
     write(god.serialize(value));
     header(HttpHeaders.CONTENT_TYPE, ContentType.JSON.toString());
     end();
   }
 
   /// Returns a JSONP response.
-  jsonp(value, {String callbackName: "callback"}) {
+  void jsonp(value, {String callbackName: "callback"}) {
     write("$callbackName(${god.serialize(value)})");
     header(HttpHeaders.CONTENT_TYPE, "application/javascript");
     end();
@@ -76,7 +84,7 @@ class ResponseContext extends Extensible {
   }
 
   /// Redirects to user to the given URL.
-  redirect(String url, {int code: 301}) {
+  void redirect(String url, {int code: 301}) {
     header(HttpHeaders.LOCATION, url);
     status(code ?? 301);
     write('''
@@ -100,22 +108,26 @@ class ResponseContext extends Extensible {
   }
 
   /// Redirects to the given named [Route].
-  redirectTo(String name, [Map params, int code]) {
+  void redirectTo(String name, [Map params, int code]) {
+    // Todo: Need to recurse route hierarchy, but also efficiently  :)
     Route matched = app.routes.firstWhere((Route route) => route.name == name);
     if (matched != null) {
-      return redirect(matched.makeUri(params), code: code);
+      redirect(matched.makeUri(params), code: code);
+      return;
     }
 
     throw new ArgumentError.notNull('Route to redirect to ($name)');
   }
 
   /// Redirects to the given [Controller] action.
-  redirectToAction(String action, [Map params, int code]) {
+  void redirectToAction(String action, [Map params, int code]) {
     // UserController@show
     List<String> split = action.split("@");
 
+    // Todo: AngelResponseException
     if (split.length < 2)
-      throw new Exception("Controller redirects must take the form of 'Controller@action'. You gave: $action");
+      throw new Exception(
+          "Controller redirects must take the form of 'Controller@action'. You gave: $action");
 
     Controller controller = app.controller(split[0]);
 
@@ -125,38 +137,30 @@ class ResponseContext extends Extensible {
     Route matched = controller.routeMappings[split[1]];
 
     if (matched == null)
-      throw new Exception("Controller '${split[0]}' does not contain any action named '${split[1]}'");
+      throw new Exception(
+          "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
-    return redirect(matched.makeUri(params), code: code);
+    redirect(matched.makeUri(params), code: code);
   }
 
   /// Streams a file to this response as chunked data.
   ///
   /// Useful for video sites.
-  streamFile(File file,
+  Future streamFile(File file,
       {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
     if (!isOpen) return;
 
     header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
     willCloseItself = true;
     await file.openRead().pipe(underlyingResponse);
-    /*await chunked(file.openRead(), chunkSize: chunkSize,
-        sleepMs: sleepMs,
-        resumable: resumable);*/
   }
 
   /// Writes data to the response.
-  write(value) {
-    if (isOpen)
-      responseData.add(UTF8.encode(value.toString()));
+  void write(value, {Encoding encoding: UTF8}) {
+    if (isOpen) {
+      if (value is List<int>)
+        buffer.add(value);
+      else buffer.add(encoding.encode(value.toString()));
+    }
   }
-
-  /// Magically transforms an [HttpResponse] object into a ResponseContext.
-  static Future<ResponseContext> from
-      (HttpResponse response, AngelBase app) async
-  {
-    ResponseContext context = new ResponseContext(response);
-    context.app = app;
-    return context;
-  }
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 4d65ce72..ae1d844d 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -2,8 +2,7 @@ library angel_framework.http.routable;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:mirrors';
-import '../extensible.dart';
+import 'package:angel_route/angel_route.dart';
 import '../util.dart';
 import 'angel_base.dart';
 import 'controller.dart';
@@ -11,11 +10,8 @@ import 'hooked_service.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
-import 'route.dart';
 import 'service.dart';
 
-typedef Route RouteAssigner(Pattern path, handler, {List middleware});
-
 /// A function that intercepts a request and determines whether handling of it should continue.
 typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 
@@ -26,20 +22,26 @@ typedef Future RequestHandler(RequestContext req, ResponseContext res);
 typedef Future RawRequestHandler(HttpRequest request);
 
 /// A routable server that can handle dynamic requests.
-class Routable extends Extensible {
-  /// Additional filters to be run on designated requests.
-  Map <String, RequestMiddleware> requestMiddleware = {};
+class Routable extends Router {
+  final Map<String, Controller> _controllers = {};
+  final Map<Pattern, Service> _services = {};
 
-  /// Dynamic request paths that this server will respond to.
-  List<Route> routes = [];
+  Routable({bool debug: false}) : super(debug: debug);
+
+  /// Additional filters to be run on designated requests.
+  @override
+  final Map<String, RequestMiddleware> requestMiddleware = {};
 
   /// A set of [Service] objects that have been mapped into routes.
-  Map <Pattern, Service> services = {};
+  Map<Pattern, Service> get services =>
+      new Map<Pattern, Service>.unmodifiable(_services);
 
   /// A set of [Controller] objects that have been loaded into the application.
-  Map<String, Controller> controllers = {};
+  Map<String, Controller> get controllers =>
+      new Map<String, Controller>.unmodifiable(_controllers);
 
-  StreamController<Service> _onService = new StreamController<Service>.broadcast();
+  StreamController<Service> _onService =
+      new StreamController<Service>.broadcast();
 
   /// Fired whenever a service is added to this instance.
   ///
@@ -47,133 +49,80 @@ class Routable extends Extensible {
   Stream<Service> get onService => _onService.stream;
 
   /// Assigns a middleware to a name for convenience.
-  registerMiddleware(String name, RequestMiddleware middleware) {
-    this.requestMiddleware[name] = middleware;
-  }
+  @override
+  registerMiddleware(String name, RequestMiddleware middleware) =>
+      super.registerMiddleware(name, middleware);
 
   /// Retrieves the service assigned to the given path.
-  Service service(Pattern path) => services[path];
+  Service service(Pattern path) => _services[path];
 
   /// Retrieves the controller with the given name.
   Controller controller(String name) => controllers[name];
 
-  /// Incorporates another [Routable]'s routes into this one's.
-  ///
-  /// If `hooked` is set to `true` and a [Service] is provided,
-  /// then that service will be wired to a [HookedService] proxy.
-  /// If a `middlewareNamespace` is provided, then any middleware
-  /// from the provided [Routable] will be prefixed by that namespace,
-  /// with a dot.
-  /// For example, if the [Routable] has a middleware 'y', and the `middlewareNamespace`
-  /// is 'x', then that middleware will be available as 'x.y' in the main application.
-  /// These namespaces can be nested.
-  void use(Pattern path, Routable routable,
-      {bool hooked: true, String middlewareNamespace: null}) {
-    Routable _routable = routable;
-
-    // If we need to hook this service, do it here. It has to be first, or
-    // else all routes will point to the old service.
-    if (_routable is Service) {
-      Hooked hookedDeclaration = getAnnotation(_routable, Hooked);
-      Service service = (hookedDeclaration != null || hooked)
-          ? new HookedService(_routable)
-          : _routable;
-      services[path.toString().trim().replaceAll(
-          new RegExp(r'(^\/+)|(\/+$)'), '')] = service;
-      _routable = service;
-    }
-
-    if (_routable is AngelBase) {
-      all(path, (RequestContext req, ResponseContext res) async {
-        req.app = _routable;
-        res.app = _routable;
-        return true;
-      });
-    }
-
-    for (Route route in _routable.routes) {
-      Route provisional = new Route('', path);
-      if (route.path == '/') {
-        route.path = '';
-        route.matcher = new RegExp(r'^\/?$');
-      }
-      route.matcher = new RegExp(route.matcher.pattern.replaceAll(
-          new RegExp('^\\^'),
-          provisional.matcher.pattern.replaceAll(new RegExp(r'\$$'), '')));
-      route.path = "$path${route.path}";
-
-      routes.add(route);
-    }
-
-    // Let's copy middleware, heeding the optional middleware namespace.
-    String middlewarePrefix = "";
-    if (middlewareNamespace != null)
-      middlewarePrefix = "$middlewareNamespace.";
-
-    for (String middlewareName in _routable.requestMiddleware.keys) {
-      requestMiddleware["$middlewarePrefix$middlewareName"] =
-      _routable.requestMiddleware[middlewareName];
-    }
-
-    // Copy services, too. :)
-    for (Pattern servicePath in _routable.services.keys) {
-      String newServicePath = path.toString().trim().replaceAll(
-          new RegExp(r'(^\/+)|(\/+$)'), '') + '/$servicePath';
-      services[newServicePath] = _routable.services[servicePath];
-    }
-
-    if (routable is Service)
-      _onService.add(routable);
-  }
-
-  /// 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.
+  @override
   Route addRoute(String method, Pattern path, Object handler,
       {List middleware}) {
-    List handlers = [];
-
+    final List handlers = [];
     // Merge @Middleware declaration, if any
-    Middleware middlewareDeclaration = getAnnotation(
-        handler, Middleware);
+    Middleware middlewareDeclaration = getAnnotation(handler, Middleware);
     if (middlewareDeclaration != null) {
       handlers.addAll(middlewareDeclaration.handlers);
     }
 
-    handlers
-      ..addAll(middleware ?? [])
-      ..add(handler);
-    var route = new Route(method.toUpperCase().trim(), path, handlers);
-    routes.add(route);
-    return route;
+    return super.addRoute(method, path, handler,
+        middleware: []..addAll(middleware ?? [])..addAll(handlers));
   }
 
-  /// Adds a route that responds to any request matching the given path.
-  Route all(Pattern path, Object handler, {List middleware}) {
-    return addRoute('*', path, handler, middleware: middleware);
-  }
+  void use(Pattern path, Router router,
+      {bool hooked: true, String namespace: null}) {
+    Router _router = router;
+    Service service;
 
-  /// Adds a route that responds to a GET request.
-  Route get(Pattern path, Object handler, {List middleware}) {
-    return addRoute('GET', path, handler, middleware: middleware);
-  }
+    // If we need to hook this service, do it here. It has to be first, or
+    // else all routes will point to the old service.
+    if (router is Service) {
+      Hooked hookedDeclaration = getAnnotation(router, Hooked);
+      _router = service = (hookedDeclaration != null || hooked)
+          ? new HookedService(router)
+          : router;
+      _services[path
+          .toString()
+          .trim()
+          .replaceAll(new RegExp(r'(^/+)|(/+$)'), '')] = service;
+    }
 
-  /// Adds a route that responds to a POST request.
-  Route post(Pattern path, Object handler, {List middleware}) {
-    return addRoute('POST', path, handler, middleware: middleware);
-  }
+    final handlers = [];
+    if (_router is AngelBase) {
+      handlers.add((RequestContext req, ResponseContext res) async {
+        req.app = _router;
+        res.app = _router;
+        return true;
+      });
+    }
 
-  /// Adds a route that responds to a PATCH request.
-  Route patch(Pattern path, Object handler, {List middleware}) {
-    return addRoute('PATCH', path, handler, middleware: middleware);
-  }
+    // Let's copy middleware, heeding the optional middleware namespace.
+    String middlewarePrefix = namespace != null ? "$namespace." : "";
 
-  /// Adds a route that responds to a DELETE request.
-  Route delete(Pattern path, Object handler, {List middleware}) {
-    return addRoute('DELETE', path, handler, middleware: middleware);
-  }
+    Map copiedMiddleware = new Map.from(router.requestMiddleware);
+    for (String middlewareName in copiedMiddleware.keys) {
+      requestMiddleware["$middlewarePrefix$middlewareName"] =
+          copiedMiddleware[middlewareName];
+    }
 
-  Routable() {
-  }
+    root.child(path, debug: debug, handlers: handlers).addChild(router.root);
 
-}
\ No newline at end of file
+    _router.dumpTree(header: 'Mounting on "$path":');
+
+    if (router is Routable) {
+      // Copy services, too. :)
+      for (Pattern servicePath in _router._services.keys) {
+        String newServicePath =
+            path.toString().trim().replaceAll(new RegExp(r'(^/+)|(/+$)'), '') +
+                '/$servicePath';
+        _services[newServicePath] = _router._services[servicePath];
+      }
+    }
+
+    if (service != null) _onService.add(service);
+  }
+}
diff --git a/lib/src/http/route.dart b/lib/src/http/route.dart
deleted file mode 100644
index ab3588de..00000000
--- a/lib/src/http/route.dart
+++ /dev/null
@@ -1,91 +0,0 @@
-library angel_framework.http.route;
-
-/// Represents an endpoint open for connection via the Internet.
-class Route {
-  /// A regular expression used to match URI's to this route.
-  RegExp matcher;
-  /// The HTTP method this route responds to.
-  String method;
-  /// An array of functions, Futures and objects that can respond to this route.
-  List handlers = [];
-  /// The path this route is mounted on.
-  String path;
-  /// (Optional) - A name for this route.
-  String name;
-
-  Route(String method, Pattern path, [List handlers]) {
-    this.method = method;
-    if (path is RegExp) {
-      this.matcher = path;
-      this.path = path.pattern;
-    }
-    else {
-      this.matcher = new RegExp('^' +
-          path.toString()
-              .replaceAll(new RegExp(r'\/\*$'), "*")
-              .replaceAll(new RegExp('\/'), r'\/')
-              .replaceAll(new RegExp(':[a-zA-Z_]+'), '([^\/]+)')
-              .replaceAll(new RegExp('\\*'), '.*')
-          + r'$');
-      this.path = path;
-    }
-
-    if (handlers != null) {
-      this.handlers.addAll(handlers);
-    }
-  }
-
-  /// Assigns a name to this Route.
-  as(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /// Generates a URI to this route with the given parameters.
-  String makeUri([Map<String, dynamic> params]) {
-    String result = path;
-    if (params != null) {
-      for (String key in (params.keys)) {
-        result = result.replaceAll(new RegExp(":$key" + r"\??"), params[key].toString());
-      }
-    }
-
-    return result.replaceAll("*", "");
-  }
-
-  /// Enables one or more handlers to be called whenever this route is visited.
-  Route middleware(handler) {
-    if (handler is Iterable)
-      handlers.addAll(handler);
-    else handlers.add(handler);
-    return this;
-  }
-
-  /// Extracts route parameters from a given path.
-  Map parseParameters(String requestPath) {
-    Map result = {};
-
-    Iterable<String> values = _parseParameters(requestPath);
-    RegExp rgx = new RegExp(':([a-zA-Z_]+)');
-    Iterable<Match> matches = rgx.allMatches(
-        path.replaceAll(new RegExp('\/'), r'\/'));
-    for (int i = 0; i < matches.length; i++) {
-      Match match = matches.elementAt(i);
-      String paramName = match.group(1);
-      String value = values.elementAt(i);
-      num numValue = num.parse(value, (_) => double.NAN);
-      if (!numValue.isNaN)
-        result[paramName] = numValue;
-      else
-        result[paramName] = value;
-    }
-
-    return result;
-  }
-
-  _parseParameters(String requestPath) sync* {
-    Match routeMatch = matcher.firstMatch(requestPath);
-    for (int i = 1; i <= routeMatch.groupCount; i++)
-      yield routeMatch.group(i);
-  }
-}
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 197e982c..5a47d8a9 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -11,10 +11,11 @@ import 'controller.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
-import 'route.dart';
 import 'service.dart';
 export 'package:container/container.dart';
 
+final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+
 /// A function that binds an [Angel] server to an Internet address and port.
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
@@ -31,6 +32,7 @@ class Angel extends AngelBase {
   var _beforeProcessed = new StreamController<HttpRequest>.broadcast();
   var _fatalErrorStream = new StreamController<Map>.broadcast();
   var _onController = new StreamController<Controller>.broadcast();
+  final Random _rand = new Random.secure();
   ServerGenerator _serverGenerator =
       (address, port) async => await HttpServer.bind(address, port);
 
@@ -74,6 +76,23 @@ class Angel extends AngelBase {
   /// The native HttpServer running this instancce.
   HttpServer httpServer;
 
+  /// Handles a server error.
+  _onError(e, [StackTrace stackTrace]) {
+    _fatalErrorStream.add({"error": e, "stack": stackTrace});
+  }
+
+  void _printDebug(x) {
+    if (debug) print(x);
+  }
+
+  String _randomString(int length) {
+    var codeUnits = new List.generate(length, (index) {
+      return _rand.nextInt(33) + 89;
+    });
+
+    return new String.fromCharCodes(codeUnits);
+  }
+
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
@@ -81,10 +100,7 @@ class Angel extends AngelBase {
     var server = await _serverGenerator(
         address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0);
     this.httpServer = server;
-
-    server.listen(handleRequest);
-
-    return server;
+    return server..listen(handleRequest);
   }
 
   /// Loads some base dependencies into the service container.
@@ -95,75 +111,7 @@ class Angel extends AngelBase {
     if (runtimeType != Angel) container.singleton(this, as: Angel);
   }
 
-  Future handleRequest(HttpRequest request) async {
-    _beforeProcessed.add(request);
-
-    String requestedUrl = request.uri
-        .toString()
-        .replaceAll("?" + request.uri.query, "")
-        .replaceAll(new RegExp(r'\/+$'), '');
-
-    if (requestedUrl.isEmpty) requestedUrl = '/';
-
-    RequestContext req = await RequestContext.from(request, {}, this, null);
-    ResponseContext res = await ResponseContext.from(request.response, this);
-
-    bool canContinue = true;
-
-    executeHandler(handler, req) async {
-      if (canContinue) {
-        try {
-          canContinue = await _applyHandler(handler, req, res);
-        } catch (e, stackTrace) {
-          if (e is AngelHttpException) {
-            // Special handling for AngelHttpExceptions :)
-            try {
-              res.status(e.statusCode);
-              String accept = request.headers.value(HttpHeaders.ACCEPT);
-              if (accept == "*/*" ||
-                  accept.contains(ContentType.JSON.mimeType) ||
-                  accept.contains("application/javascript")) {
-                res.json(e.toMap());
-              } else {
-                await _errorHandler(e, req, res);
-              }
-              _finalizeResponse(request, res);
-            } catch (_) {}
-          }
-          _onError(e, stackTrace);
-          canContinue = false;
-          return false;
-        }
-      } else
-        return false;
-    }
-
-    for (var handler in before) {
-      await executeHandler(handler, req);
-    }
-
-    for (Route route in routes) {
-      if (!canContinue) break;
-
-      if (route.matcher.hasMatch(requestedUrl) &&
-          (request.method == route.method || route.method == '*')) {
-        req.params = route.parseParameters(requestedUrl);
-        req.route = route;
-
-        for (var handler in route.handlers) {
-          await executeHandler(handler, req);
-        }
-      }
-    }
-
-    for (var handler in after) {
-      await executeHandler(handler, req);
-    }
-
-    _finalizeResponse(request, res);
-  }
-
-  Future<bool> _applyHandler(
+  Future<bool> executeHandler(
       handler, RequestContext req, ResponseContext res) async {
     if (handler is RequestMiddleware) {
       var result = await handler(req, res);
@@ -216,7 +164,7 @@ class Angel extends AngelBase {
     }
 
     if (requestMiddleware.containsKey(handler)) {
-      return await _applyHandler(requestMiddleware[handler], req, res);
+      return await executeHandler(requestMiddleware[handler], req, res);
     }
 
     res.willCloseItself = true;
@@ -225,11 +173,76 @@ class Angel extends AngelBase {
     return false;
   }
 
-  _finalizeResponse(HttpRequest request, ResponseContext res) async {
+  Future handleRequest(HttpRequest request) async {
+    _beforeProcessed.add(request);
+
+    final req = await RequestContext.from(request, this);
+    final res = new ResponseContext(request.response, this);
+    String requestedUrl = request.uri
+        .toString()
+        .replaceAll("?" + request.uri.query, "")
+        .replaceAll(_straySlashes, '');
+
+    if (requestedUrl.isEmpty) requestedUrl = '/';
+
+    final route = resolve(requestedUrl,
+        (route) => route.method == request.method || route.method == '*');
+    print('Resolve ${requestedUrl} -> $route');
+    req.params.addAll(route?.parseParameters(requestedUrl) ?? {});
+
+    final handlerSequence = []..addAll(before);
+    if (route != null) handlerSequence.addAll(route.handlerSequence);
+    handlerSequence.addAll(after);
+
+    _printDebug('Handler sequence on $requestedUrl: $handlerSequence');
+
+    for (final handler in handlerSequence) {
+      try {
+        _printDebug('Executing handler: $handler');
+        final result = await executeHandler(handler, req, res);
+        _printDebug('Result: $result');
+
+        if (!result) {
+          _printDebug('Last executed handler: $handler');
+          break;
+        } else {
+          _printDebug(
+              'Handler completed successfully, did not terminate response: $handler');
+        }
+      } catch (e, st) {
+        _printDebug('Caught error in handler $handler: $e');
+        _printDebug(st);
+
+        if (e is AngelHttpException) {
+          // Special handling for AngelHttpExceptions :)
+          try {
+            res.status(e.statusCode);
+            String accept = request.headers.value(HttpHeaders.ACCEPT);
+            if (accept == "*/*" ||
+                accept.contains(ContentType.JSON.mimeType) ||
+                accept.contains("application/javascript")) {
+              res.json(e.toMap());
+            } else {
+              await _errorHandler(e, req, res);
+            }
+            _finalizeResponse(request, res);
+          } catch (_) {
+            // Todo: This exception needs to be caught as well.
+          }
+        } else {
+          // Todo: Uncaught exceptions need to be... Caught.
+        }
+
+        _onError(e, st);
+        break;
+      }
+    }
+
     try {
       _afterProcessed.add(request);
+
       if (!res.willCloseItself) {
-        res.responseData.forEach((blob) => request.response.add(blob));
+        request.response.add(res.buffer.takeBytes());
         await request.response.close();
       }
     } catch (e) {
@@ -237,15 +250,6 @@ class Angel extends AngelBase {
     }
   }
 
-  String _randomString(int length) {
-    var rand = new Random();
-    var codeUnits = new List.generate(length, (index) {
-      return rand.nextInt(33) + 89;
-    });
-
-    return new String.fromCharCodes(codeUnits);
-  }
-
   // Run a function after injecting from service container
   Future runContained(Function handler, RequestContext req, ResponseContext res,
       {Map<String, dynamic> namedParameters,
@@ -302,12 +306,12 @@ class Angel extends AngelBase {
 
   @override
   use(Pattern path, Routable routable,
-      {bool hooked: true, String middlewareNamespace: null}) {
+      {bool hooked: true, String namespace: null}) {
     if (routable is Service) {
       routable.app = this;
     }
-    return super.use(path, routable,
-        hooked: hooked, middlewareNamespace: middlewareNamespace);
+
+    return super.use(path, routable, hooked: hooked, namespace: namespace);
   }
 
   /// Registers a callback to run upon errors.
@@ -315,15 +319,7 @@ class Angel extends AngelBase {
     _errorHandler = handler;
   }
 
-  /// Handles a server error.
-  _onError(e, [StackTrace stackTrace]) {
-    _fatalErrorStream.add({
-      "error": e,
-      "stack": stackTrace
-    });
-  }
-
-  Angel() : super() {
+  Angel({bool debug: false}) : super(debug: debug) {
     bootstrapContainer();
   }
 
@@ -332,8 +328,8 @@ class Angel extends AngelBase {
   /// If no password is provided, a random one will be generated upon running
   /// the server.
   Angel.secure(String certificateChainPath, String serverKeyPath,
-      {String password})
-      : super() {
+      {bool debug: false, String password})
+      : super(debug: debug) {
     bootstrapContainer();
     _serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index c12e8a35..b04ddd4a 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -2,13 +2,11 @@ library angel_framework.http.service;
 
 import 'dart:async';
 import 'package:merge_map/merge_map.dart';
-import '../defs.dart';
 import '../util.dart';
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'metadata.dart';
 import 'routable.dart';
-import 'route.dart';
 
 /// Indicates how the service was accessed.
 ///
@@ -72,19 +70,24 @@ class Service extends Routable {
 
     // Add global middleware if declared on the instance itself
     Middleware before = getAnnotation(this, Middleware);
-    if (before != null) {
-      routes.add(new Route("*", "*", before.handlers));
-    }
+    final handlers = [];
+
+    if (before != null) handlers.add(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(this.index, Middleware);
     get('/', (req, res) async {
       return await this.index(mergeMap([req.query, restProvider]));
-    }, middleware: (indexMiddleware == null) ? [] : indexMiddleware.handlers);
+    },
+        middleware: []
+          ..addAll(handlers)
+          ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(this.create, Middleware);
     post('/', (req, res) async => await this.create(req.body, restProvider),
-        middleware:
-            (createMiddleware == null) ? [] : createMiddleware.handlers);
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (createMiddleware == null) ? [] : createMiddleware.handlers));
 
     Middleware readMiddleware = getAnnotation(this.read, Middleware);
 
@@ -92,30 +95,38 @@ class Service extends Routable {
         '/:id',
         (req, res) async => await this
             .read(req.params['id'], mergeMap([req.query, restProvider])),
-        middleware: (readMiddleware == null) ? [] : readMiddleware.handlers);
+        middleware: []
+          ..addAll(handlers)
+          ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
     Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
     patch(
         '/:id',
         (req, res) async =>
             await this.modify(req.params['id'], req.body, restProvider),
-        middleware:
-            (modifyMiddleware == null) ? [] : modifyMiddleware.handlers);
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
     Middleware updateMiddleware = getAnnotation(this.update, Middleware);
     post(
         '/:id',
         (req, res) async =>
             await this.update(req.params['id'], req.body, restProvider),
-        middleware:
-            (updateMiddleware == null) ? [] : updateMiddleware.handlers);
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
     delete(
         '/:id',
         (req, res) async => await this
             .remove(req.params['id'], mergeMap([req.query, restProvider])),
-        middleware:
-            (removeMiddleware == null) ? [] : removeMiddleware.handlers);
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index abb87f81..b2431cab 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,6 +4,8 @@ description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 dependencies:
+  angel_route:
+    path: ../angel_route
   body_parser: ">=1.0.0-dev <2.0.0"
   container: ">=0.1.2 <1.0.0"
   json_god: ">=2.0.0-beta <3.0.0"
diff --git a/test/routing.dart b/test/routing.dart
index d72b1a90..6acb9a8f 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -26,32 +26,43 @@ main() {
   http.Client client;
 
   setUp(() async {
-    angel = new Angel();
-    nested = new Angel();
-    todos = new Angel();
+    final debug = false;
+    angel = new Angel(debug: debug);
+    nested = new Angel(debug: debug);
+    todos = new Angel(debug: debug);
 
-    angel..registerMiddleware('interceptor', (req, res) async {
-      res.write('Middleware');
-      return false;
-    })..registerMiddleware('intercept_service',
-        (RequestContext req, res) async {
-      print("Intercepting a service!");
-      return true;
-    });
+    angel
+      ..registerMiddleware('interceptor', (req, res) async {
+        res.write('Middleware');
+        return false;
+      })
+      ..registerMiddleware('intercept_service',
+          (RequestContext req, res) async {
+        print("Intercepting a service!");
+        return true;
+      });
 
     todos.get('/action/:action', (req, res) => res.json(req.params));
-    nested.post('/ted/:route', (req, res) => res.json(req.params));
+
+    Route ted;
+
+    ted = nested.post('/ted/:route', (RequestContext req, res) {
+      print('Params: ${req.params}');
+      print('Path: ${ted.path}, matcher: ${ted.matcher.pattern}, uri: ${req.path}');
+      return req.params;
+    });
+
+    angel.use('/nes', nested);
     angel.get('/meta', testMiddlewareMetadata);
     angel.get('/intercepted', 'This should not be shown',
         middleware: ['interceptor']);
     angel.get('/hello', 'world');
     angel.get('/name/:first/last/:last', (req, res) => req.params);
     angel.post('/lambda', (req, res) => req.body);
-    angel.use('/nes', nested);
     angel.use('/todos/:id', todos);
     angel
         .get('/greet/:name',
-        (RequestContext req, res) async => "Hello ${req.params['name']}")
+            (RequestContext req, res) async => "Hello ${req.params['name']}")
         .as('Named routes');
     angel.get('/named', (req, ResponseContext res) async {
       res.redirectTo('Named routes', {'name': 'tests'});
@@ -60,13 +71,11 @@ main() {
       print("Query: ${req.query}");
       return "Logged";
     });
+
     angel.use('/query', new QueryService());
     angel.get('*', 'MJ');
 
-    print("DUMPING ROUTES: ");
-    for (Route route in angel.routes) {
-      print("${route.method} ${route.path} - ${route.handlers}");
-    }
+    angel.dumpTree(header: "DUMPING ROUTES:");
 
     client = new http.Client();
     await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
@@ -90,6 +99,7 @@ main() {
 
   test('Can match url with multiple parameters', () async {
     var response = await client.get('$url/name/HELLO/last/WORLD');
+    print(response.body);
     var json = god.deserialize(response.body);
     expect(json['first'], equals('HELLO'));
     expect(json['last'], equals('WORLD'));
@@ -104,6 +114,7 @@ main() {
   test('Can parse parameters from a nested Angel instance', () async {
     var response = await client.get('$url/todos/1337/action/test');
     var json = god.deserialize(response.body);
+    print('JSON: $json');
     expect(json['id'], equals(1337));
     expect(json['action'], equals('test'));
   });
@@ -123,7 +134,7 @@ main() {
     Map headers = {'Content-Type': 'application/json'};
     String postData = god.serialize({'it': 'works'});
     var response =
-    await client.post("$url/lambda", headers: headers, body: postData);
+        await client.post("$url/lambda", headers: headers, body: postData);
     expect(god.deserialize(response.body)['it'], equals('works'));
   });
 
@@ -133,10 +144,11 @@ main() {
   });
 
   test('Can name routes', () {
-    Route foo = angel.get('/framework/:id', 'Angel').as('frm');
+    Route foo = new Route('/framework/:id', name: 'frm');
+    print('Foo: $foo');
     String uri = foo.makeUri({'id': 'angel'});
     print(uri);
-    expect(uri, equals('/framework/angel'));
+    expect(uri, equals('framework/angel'));
   });
 
   test('Redirect to named routes', () async {
@@ -147,7 +159,7 @@ main() {
 
   test('Match routes, even with query params', () async {
     var response =
-    await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
+        await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
     print(response.body);
     expect(god.deserialize(response.body), equals('Logged'));
 
diff --git a/test/util.dart b/test/util.dart
index 5255d8db..2d22fedd 100644
--- a/test/util.dart
+++ b/test/util.dart
@@ -24,11 +24,9 @@ main() {
       angel.properties['foo'] = () => 'bar';
       angel.properties['Foo'] = new Foo('bar');
 
-      /**
       expect(angel.hello, equals('world'));
       expect(angel.foo(), equals('bar'));
       expect(angel.Foo.name, equals('bar'));
-      */
     });
   });
 }

From eb24b0c43e76e04d69afdd590b5d394b8be45d4a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 21 Nov 2016 23:58:53 -0500
Subject: [PATCH 052/414] Will finish routing changes tmw, then resolve issues

---
 lib/src/http/server.dart | 10 ++++------
 pubspec.yaml             | 16 +++++++++-------
 test/controller.dart     |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 5a47d8a9..420fa01a 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -97,10 +97,9 @@ class Angel extends AngelBase {
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
   Future<HttpServer> startServer([InternetAddress address, int port]) async {
-    var server = await _serverGenerator(
-        address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0);
-    this.httpServer = server;
-    return server..listen(handleRequest);
+    final host = address ?? InternetAddress.LOOPBACK_IP_V4;
+    final server = await _serverGenerator(host, port ?? 0);
+    return this.httpServer = server..listen(handleRequest);
   }
 
   /// Loads some base dependencies into the service container.
@@ -185,8 +184,7 @@ class Angel extends AngelBase {
 
     if (requestedUrl.isEmpty) requestedUrl = '/';
 
-    final route = resolve(requestedUrl,
-        (route) => route.method == request.method || route.method == '*');
+    final route = resolve(requestedUrl, method: request.method);
     print('Resolve ${requestedUrl} -> $route');
     req.params.addAll(route?.parseParameters(requestedUrl) ?? {});
 
diff --git a/pubspec.yaml b/pubspec.yaml
index b2431cab..0d1e5031 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,14 +3,16 @@ version: 1.0.0-dev.22
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
+environment:
+  sdk: ">=1.18.0"
 dependencies:
   angel_route:
     path: ../angel_route
-  body_parser: ">=1.0.0-dev <2.0.0"
-  container: ">=0.1.2 <1.0.0"
-  json_god: ">=2.0.0-beta <3.0.0"
-  merge_map: ">=1.0.0 <2.0.0"
-  mime: ">=0.9.3 <1.0.0"
+  body_parser: ^1.0.0-dev
+  container: ^0.1.2
+  json_god: ^2.0.0-beta
+  merge_map: ^1.0.0
+  mime: ^0.9.3
 dev_dependencies:
-  http: ">= 0.11.3 <0.12.0"
-  test: ">= 0.12.13 <0.13.0"
\ No newline at end of file
+  http: ^0.11.3
+  test: ^0.12.13
diff --git a/test/controller.dart b/test/controller.dart
index c85a9037..8af37c83 100644
--- a/test/controller.dart
+++ b/test/controller.dart
@@ -52,7 +52,7 @@ main() {
   });
 
   tearDown(() async {
-    await server.close(force: true);
+    await (server ?? app.httpServer).close(force: true);
     client.close();
     client = null;
   });

From 3355b0ab39f6981d44157f0dbdb4d77670893fe2 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 23 Nov 2016 04:10:47 -0500
Subject: [PATCH 053/414] Finally switched to new router

---
 .travis.yml                        |   1 +
 README.md                          |   3 +-
 lib/src/http/controller.dart       |  47 ++++++-----
 lib/src/http/hooked_service.dart   |  13 +--
 lib/src/http/response_context.dart |  18 ++++-
 lib/src/http/routable.dart         |  23 +++---
 lib/src/http/server.dart           |  13 ++-
 lib/src/http/service.dart          |  14 ++--
 pubspec.yaml                       |   5 +-
 test/controller.dart               |  30 +++----
 test/di.dart                       |   3 +-
 test/hooked.dart                   | 123 ++++++++++++++++-------------
 test/routing.dart                  |  14 ++--
 13 files changed, 175 insertions(+), 132 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..de2210c9
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1 @@
+language: dart
\ No newline at end of file
diff --git a/README.md b/README.md
index 0e96b466..bb83bbe0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # angel_framework
 
-![version 1.0.0-dev](https://img.shields.io/badge/version-1.0.0--dev-red.svg)
+![version 1.0.0-dev](https://img.shields.io/badge/version-1.0.0--dev.23-red.svg)
+![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index f48516c5..7eb716ba 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -18,19 +18,6 @@ class Controller {
 
   Future call(AngelBase app) async {
     this.app = app;
-    app.use(exposeDecl.path, generateRoutable());
-
-    TypeMirror typeMirror = reflectType(this.runtimeType);
-    String name = exposeDecl.as;
-
-    if (name == null || name.isEmpty)
-      name = MirrorSystem.getName(typeMirror.simpleName);
-
-    app.controllers[name] = this;
-  }
-
-  Routable generateRoutable() {
-    final routable = new Routable();
 
     // Load global expose decl
     ClassMirror classMirror = reflectClass(this.runtimeType);
@@ -47,11 +34,18 @@ class Controller {
           "All controllers must carry an @Expose() declaration.");
     }
 
-    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
+    app.use(exposeDecl.path, generateRoutable(classMirror));
+    TypeMirror typeMirror = reflectType(this.runtimeType);
+    String name = exposeDecl.as;
 
-    InstanceMirror instanceMirror = reflect(this);
-    classMirror.instanceMembers
-        .forEach((Symbol key, MethodMirror methodMirror) {
+    if (name == null || name.isEmpty)
+      name = MirrorSystem.getName(typeMirror.simpleName);
+
+    app.controllers[name] = this;
+  }
+
+  _callback(InstanceMirror instanceMirror, Routable routable, List handlers) {
+    return (Symbol key, MethodMirror methodMirror) {
       if (methodMirror.isRegularMethod &&
           key != #toString &&
           key != #noSuchMethod &&
@@ -102,11 +96,13 @@ class Controller {
             return await instanceMirror.invoke(key, args).reflectee;
           };
 
+          final middleware = []
+            ..addAll(handlers)
+            ..addAll(exposeMirror.reflectee.middleware);
+
           final route = routable.addRoute(exposeMirror.reflectee.method,
               exposeMirror.reflectee.path, handler,
-              middleware: []
-                ..addAll(handlers)
-                ..addAll(exposeMirror.reflectee.middleware));
+              middleware: middleware);
 
           String name = exposeMirror.reflectee.as;
 
@@ -115,7 +111,16 @@ class Controller {
           routeMappings[name] = route;
         }
       }
-    });
+    };
+  }
+
+  Routable generateRoutable(ClassMirror classMirror) {
+    final routable = new Routable(debug: true);
+    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
+
+    InstanceMirror instanceMirror = reflect(this);
+    final callback = _callback(instanceMirror, routable, handlers);
+    classMirror.instanceMembers.forEach(callback);
 
     return routable;
   }
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 546e2e52..3f7552f8 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -37,7 +37,10 @@ class HookedService extends Service {
   HookedService(Service this.inner) {
     // Clone app instance
     if (inner.app != null) this.app = inner.app;
+  }
 
+  @override
+  void addRoutes() {
     // Set up our routes. We still need to copy middleware from inner service
     Map restProvider = {'provider': Providers.REST};
 
@@ -45,7 +48,7 @@ class HookedService extends Service {
     Middleware before = getAnnotation(inner, Middleware);
     final handlers = [];
 
-    if (before != null) handlers.add(before.handlers);
+    if (before != null) handlers.addAll(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
     get('/', (req, res) async {
@@ -67,7 +70,7 @@ class HookedService extends Service {
     get(
         '/:id',
         (req, res) async => await this
-            .read(req.params['id'], mergeMap([req.query, restProvider])),
+        .read(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -76,7 +79,7 @@ class HookedService extends Service {
     patch(
         '/:id',
         (req, res) async =>
-            await this.modify(req.params['id'], req.body, restProvider),
+    await this.modify(req.params['id'], req.body, restProvider),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -86,7 +89,7 @@ class HookedService extends Service {
     post(
         '/:id',
         (req, res) async =>
-            await this.update(req.params['id'], req.body, restProvider),
+    await this.update(req.params['id'], req.body, restProvider),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -96,7 +99,7 @@ class HookedService extends Service {
     delete(
         '/:id',
         (req, res) async => await this
-            .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        .remove(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 84ffedb2..4e9c281b 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -109,8 +109,19 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given named [Route].
   void redirectTo(String name, [Map params, int code]) {
-    // Todo: Need to recurse route hierarchy, but also efficiently  :)
-    Route matched = app.routes.firstWhere((Route route) => route.name == name);
+    _findRoute(Route route) {
+      for (Route child in route.children) {
+        final resolved = _findRoute(child);
+
+        if (resolved != null) return resolved;
+      }
+
+      return route.children
+          .firstWhere((r) => r.name == name, orElse: () => null);
+    }
+
+    Route matched = _findRoute(app.root);
+
     if (matched != null) {
       redirect(matched.makeUri(params), code: code);
       return;
@@ -160,7 +171,8 @@ class ResponseContext extends Extensible {
     if (isOpen) {
       if (value is List<int>)
         buffer.add(value);
-      else buffer.add(encoding.encode(value.toString()));
+      else
+        buffer.add(encoding.encode(value.toString()));
     }
   }
 }
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index ae1d844d..7a25fc7f 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -33,12 +33,10 @@ class Routable extends Router {
   final Map<String, RequestMiddleware> requestMiddleware = {};
 
   /// A set of [Service] objects that have been mapped into routes.
-  Map<Pattern, Service> get services =>
-      new Map<Pattern, Service>.unmodifiable(_services);
+  Map<Pattern, Service> get services => _services;
 
   /// A set of [Controller] objects that have been loaded into the application.
-  Map<String, Controller> get controllers =>
-      new Map<String, Controller>.unmodifiable(_controllers);
+  Map<String, Controller> get controllers => _controllers;
 
   StreamController<Service> _onService =
       new StreamController<Service>.broadcast();
@@ -61,7 +59,7 @@ class Routable extends Router {
 
   @override
   Route addRoute(String method, Pattern path, Object handler,
-      {List middleware}) {
+      {List middleware: const []}) {
     final List handlers = [];
     // Merge @Middleware declaration, if any
     Middleware middlewareDeclaration = getAnnotation(handler, Middleware);
@@ -69,8 +67,11 @@ class Routable extends Router {
       handlers.addAll(middlewareDeclaration.handlers);
     }
 
-    return super.addRoute(method, path, handler,
-        middleware: []..addAll(middleware ?? [])..addAll(handlers));
+    final List handlerSequence = [];
+    handlerSequence.addAll(middleware ?? []);
+    handlerSequence.addAll(handlers);
+
+    return super.addRoute(method, path, handler, middleware: handlerSequence);
   }
 
   void use(Pattern path, Router router,
@@ -89,9 +90,11 @@ class Routable extends Router {
           .toString()
           .trim()
           .replaceAll(new RegExp(r'(^/+)|(/+$)'), '')] = service;
+      service.addRoutes();
     }
 
     final handlers = [];
+
     if (_router is AngelBase) {
       handlers.add((RequestContext req, ResponseContext res) async {
         req.app = _router;
@@ -109,9 +112,9 @@ class Routable extends Router {
           copiedMiddleware[middlewareName];
     }
 
-    root.child(path, debug: debug, handlers: handlers).addChild(router.root);
-
-    _router.dumpTree(header: 'Mounting on "$path":');
+    // _router.dumpTree(header: 'Mounting on "$path":');
+    // root.child(path, debug: debug, handlers: handlers).addChild(router.root);
+    mount(path, _router);
 
     if (router is Routable) {
       // Copy services, too. :)
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 420fa01a..72c77ed4 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -98,8 +98,8 @@ class Angel extends AngelBase {
   /// Returns false on failure; otherwise, returns the HttpServer.
   Future<HttpServer> startServer([InternetAddress address, int port]) async {
     final host = address ?? InternetAddress.LOOPBACK_IP_V4;
-    final server = await _serverGenerator(host, port ?? 0);
-    return this.httpServer = server..listen(handleRequest);
+    this.httpServer = await _serverGenerator(host, port ?? 0);
+    return httpServer..listen(handleRequest);
   }
 
   /// Loads some base dependencies into the service container.
@@ -178,14 +178,13 @@ class Angel extends AngelBase {
     final req = await RequestContext.from(request, this);
     final res = new ResponseContext(request.response, this);
     String requestedUrl = request.uri
-        .toString()
-        .replaceAll("?" + request.uri.query, "")
+        .path
         .replaceAll(_straySlashes, '');
 
     if (requestedUrl.isEmpty) requestedUrl = '/';
 
     final route = resolve(requestedUrl, method: request.method);
-    print('Resolve ${requestedUrl} -> $route');
+    _printDebug('Resolved ${requestedUrl} -> $route');
     req.params.addAll(route?.parseParameters(requestedUrl) ?? {});
 
     final handlerSequence = []..addAll(before);
@@ -331,8 +330,8 @@ class Angel extends AngelBase {
     bootstrapContainer();
     _serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
-          Platform.script.resolve('server_chain.pem').toFilePath();
-      var serverKey = Platform.script.resolve('server_key.pem').toFilePath();
+          Platform.script.resolve(certificateChainPath).toFilePath();
+      var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
       var serverContext = new SecurityContext();
       serverContext.useCertificateChain(certificateChain);
       serverContext.usePrivateKey(serverKey,
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index b04ddd4a..723f7ae6 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -65,14 +65,14 @@ class Service extends Routable {
     throw new AngelHttpException.MethodNotAllowed();
   }
 
-  Service() : super() {
+  void addRoutes() {
     Map restProvider = {'provider': Providers.REST};
 
     // Add global middleware if declared on the instance itself
     Middleware before = getAnnotation(this, Middleware);
     final handlers = [];
 
-    if (before != null) handlers.add(before.handlers);
+    if (before != null) handlers.addAll(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(this.index, Middleware);
     get('/', (req, res) async {
@@ -94,7 +94,7 @@ class Service extends Routable {
     get(
         '/:id',
         (req, res) async => await this
-            .read(req.params['id'], mergeMap([req.query, restProvider])),
+        .read(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -103,7 +103,7 @@ class Service extends Routable {
     patch(
         '/:id',
         (req, res) async =>
-            await this.modify(req.params['id'], req.body, restProvider),
+    await this.modify(req.params['id'], req.body, restProvider),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -113,7 +113,7 @@ class Service extends Routable {
     post(
         '/:id',
         (req, res) async =>
-            await this.update(req.params['id'], req.body, restProvider),
+    await this.update(req.params['id'], req.body, restProvider),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -123,10 +123,12 @@ class Service extends Routable {
     delete(
         '/:id',
         (req, res) async => await this
-            .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        .remove(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
+
+    normalize();
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 0d1e5031..d5703a9d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,13 +1,12 @@
 name: angel_framework
-version: 1.0.0-dev.22
+version: 1.0.0-dev.23
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
   sdk: ">=1.18.0"
 dependencies:
-  angel_route:
-    path: ../angel_route
+  angel_route: ^1.0.0-dev
   body_parser: ^1.0.0-dev
   container: ^0.1.2
   json_god: ^2.0.0-beta
diff --git a/test/controller.dart b/test/controller.dart
index 8af37c83..2fb6e7bc 100644
--- a/test/controller.dart
+++ b/test/controller.dart
@@ -10,23 +10,23 @@ import 'common.dart';
 class TodoController extends Controller {
   List<Todo> todos = [new Todo(text: "Hello", over: "world")];
 
-  @Expose("/:id", middleware: const["bar"])
-  Future<Todo> fetchTodo(int id, RequestContext req,
-      ResponseContext res) async {
+  @Expose("/:id", middleware: const ["bar"])
+  Future<Todo> fetchTodo(
+      int id, RequestContext req, ResponseContext res) async {
     expect(req, isNotNull);
     expect(res, isNotNull);
     return todos[id];
   }
 
   @Expose("/namedRoute/:foo", as: "foo")
-  Future<String> someRandomRoute(RequestContext req,
-      ResponseContext res) async {
+  Future<String> someRandomRoute(
+      RequestContext req, ResponseContext res) async {
     return "${req.params['foo']}!";
   }
 }
 
 main() {
-  Angel app = new Angel();
+  Angel app;
   HttpServer server;
   InternetAddress host = InternetAddress.LOOPBACK_IP_V4;
   int port = 3000;
@@ -34,25 +34,25 @@ main() {
   String url = "http://${host.address}:$port";
 
   setUp(() async {
+    app = new Angel();
     app.registerMiddleware("foo", (req, res) async => res.write("Hello, "));
     app.registerMiddleware("bar", (req, res) async => res.write("world!"));
-    app.get("/redirect", (req, ResponseContext res) async =>
-        res.redirectToAction("TodoController@foo", {"foo": "world"}));
+    app.get(
+        "/redirect",
+        (req, ResponseContext res) async =>
+            res.redirectToAction("TodoController@foo", {"foo": "world"}));
     await app.configure(new TodoController());
 
     print(app.controllers);
-    print("\nDUMPING ROUTES:");
-    app.routes.forEach((Route route) {
-      print("\t${route.method} ${route.path} -> ${route.handlers}");
-    });
-    print("\n");
+    app.dumpTree();
 
     server = await app.startServer(host, port);
     client = new http.Client();
   });
 
   tearDown(() async {
-    await (server ?? app.httpServer).close(force: true);
+    await server.close(force: true);
+    app = null;
     client.close();
     client = null;
   });
@@ -62,7 +62,7 @@ main() {
     var response = await client.get("$url/todos/0");
     print(response.body);
 
-    expect(response.body.indexOf("Hello, "), equals(0));
+    expect(rgx.firstMatch(response.body).start, equals(0));
 
     Map todo = JSON.decode(response.body.replaceAll(rgx, ""));
     print("Todo: $todo");
diff --git a/test/di.dart b/test/di.dart
index 8e2bdc22..bfc9d9af 100644
--- a/test/di.dart
+++ b/test/di.dart
@@ -15,7 +15,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel();
+    app = new Angel(debug: true);
     client = new http.Client();
 
     // Inject some todos
@@ -27,6 +27,7 @@ main() {
     await app.configure(new ErrandController());
 
     server = await app.startServer();
+    print('server: $server, httpServer: ${app.httpServer}');
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/hooked.dart b/test/hooked.dart
index b72d7930..f9026d36 100644
--- a/test/hooked.dart
+++ b/test/hooked.dart
@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
@@ -6,74 +7,86 @@ import 'common.dart';
 
 main() {
   Map headers = {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json'
-    };
-    Angel app;
-    String url;
-    http.Client client;
-    HookedService Todos;
+    'Accept': 'application/json',
+    'Content-Type': 'application/json'
+  };
 
-    setUp(() async {
-      app = new Angel();
-      client = new http.Client();
-      app.use('/todos', new MemoryService<Todo>());
-      Todos = app.service("todos");
+  Angel app;
+  HttpServer server;
+  String url;
+  http.Client client;
+  HookedService Todos;
 
-      await app.startServer(null, 0);
-      url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
-    });
+  setUp(() async {
+    app = new Angel(debug: true);
+    client = new http.Client();
+    app.use('/todos', new MemoryService<Todo>());
+    Todos = app.service("todos");
 
-    tearDown(() async {
-      app = null;
-      url = null;
-      client.close();
-      client = null;
-      Todos = null;
-    });
+    app
+      ..normalize()
+      ..dumpTree(showMatchers: true);
 
-    test("listen before and after", () async {
-      int count = 0;
+    server = await app.startServer();
+    url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
+  });
 
-      Todos
-        ..beforeIndexed.listen((_) {
-          count++;
-        })
-        ..afterIndexed.listen((_) {
-          count++;
-        });
+  tearDown(() async {
+    await server.close(force: true);
+    app = null;
+    url = null;
+    client.close();
+    client = null;
+    Todos = null;
+  });
 
-      var response = await client.get("$url/todos");
-      print(response.body);
-      expect(count, equals(2));
-    });
+  test("listen before and after", () async {
+    int count = 0;
 
-    test("cancel before", () async {
-      Todos.beforeCreated..listen((HookedServiceEvent event) {
+    Todos
+      ..beforeIndexed.listen((_) {
+        count++;
+      })
+      ..afterIndexed.listen((_) {
+        count++;
+      });
+
+    var response = await client.get("$url/todos");
+    print(response.body);
+    expect(count, equals(2));
+  });
+
+  test("cancel before", () async {
+    Todos.beforeCreated
+      ..listen((HookedServiceEvent event) {
         event.cancel({"hello": "hooked world"});
-      })..listen((HookedServiceEvent event) {
+      })
+      ..listen((HookedServiceEvent event) {
         event.cancel({"this_hook": "should never run"});
       });
 
-      var response = await client.post(
-          "$url/todos", body: god.serialize({"arbitrary": "data"}),
-          headers: headers);
-      print(response.body);
-      Map result = god.deserialize(response.body);
-      expect(result["hello"], equals("hooked world"));
-    });
+    var response = await client.post("$url/todos",
+        body: god.serialize({"arbitrary": "data"}), headers: headers);
+    print(response.body);
+    Map result = god.deserialize(response.body);
+    expect(result["hello"], equals("hooked world"));
+  });
 
-    test("cancel after", () async {
-      Todos.afterIndexed..listen((HookedServiceEvent event) async {
+  test("cancel after", () async {
+    Todos.afterIndexed
+      ..listen((HookedServiceEvent event) async {
         // Hooks can be Futures ;)
-        event.cancel([{"angel": "framework"}]);
-      })..listen((HookedServiceEvent event) {
+        event.cancel([
+          {"angel": "framework"}
+        ]);
+      })
+      ..listen((HookedServiceEvent event) {
         event.cancel({"this_hook": "should never run either"});
       });
 
-      var response = await client.get("$url/todos");
-      print(response.body);
-      List result = god.deserialize(response.body);
-      expect(result[0]["angel"], equals("framework"));
-    });
-}
\ No newline at end of file
+    var response = await client.get("$url/todos");
+    print(response.body);
+    List result = god.deserialize(response.body);
+    expect(result[0]["angel"], equals("framework"));
+  });
+}
diff --git a/test/routing.dart b/test/routing.dart
index 6acb9a8f..d4249567 100644
--- a/test/routing.dart
+++ b/test/routing.dart
@@ -26,7 +26,7 @@ main() {
   http.Client client;
 
   setUp(() async {
-    final debug = false;
+    final debug = true;
     angel = new Angel(debug: debug);
     nested = new Angel(debug: debug);
     todos = new Angel(debug: debug);
@@ -38,7 +38,7 @@ main() {
       })
       ..registerMiddleware('intercept_service',
           (RequestContext req, res) async {
-        print("Intercepting a service!");
+        res.write("Service with ");
         return true;
       });
 
@@ -48,7 +48,8 @@ main() {
 
     ted = nested.post('/ted/:route', (RequestContext req, res) {
       print('Params: ${req.params}');
-      print('Path: ${ted.path}, matcher: ${ted.matcher.pattern}, uri: ${req.path}');
+      print(
+          'Path: ${ted.path}, matcher: ${ted.matcher.pattern}, uri: ${req.path}');
       return req.params;
     });
 
@@ -75,7 +76,9 @@ main() {
     angel.use('/query', new QueryService());
     angel.get('*', 'MJ');
 
-    angel.dumpTree(header: "DUMPING ROUTES:");
+    angel
+      ..normalize()
+      ..dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
     client = new http.Client();
     await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
@@ -101,6 +104,7 @@ main() {
     var response = await client.get('$url/name/HELLO/last/WORLD');
     print(response.body);
     var json = god.deserialize(response.body);
+    expect(json, new isInstanceOf<Map<String, String>>());
     expect(json['first'], equals('HELLO'));
     expect(json['last'], equals('WORLD'));
   });
@@ -165,6 +169,6 @@ main() {
 
     response = await client.get("$url/query/foo?bar=baz");
     print(response.body);
-    expect(response.body, equals("Middleware"));
+    expect(response.body, equals("Service with Middleware"));
   });
 }

From fc13db72ffd24660a2a1af93076dff9cb82c9873 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 23 Nov 2016 04:16:21 -0500
Subject: [PATCH 054/414] Renamed tests

---
 test/all_tests.dart                            | 14 --------------
 test/{controller.dart => controller_test.dart} |  0
 test/{hooked.dart => hooked_test.dart}         |  0
 test/{routing.dart => routing_test.dart}       |  0
 test/{services.dart => services_test.dart}     |  0
 test/{util.dart => util_test.dart}             |  0
 6 files changed, 14 deletions(-)
 delete mode 100644 test/all_tests.dart
 rename test/{controller.dart => controller_test.dart} (100%)
 rename test/{hooked.dart => hooked_test.dart} (100%)
 rename test/{routing.dart => routing_test.dart} (100%)
 rename test/{services.dart => services_test.dart} (100%)
 rename test/{util.dart => util_test.dart} (100%)

diff --git a/test/all_tests.dart b/test/all_tests.dart
deleted file mode 100644
index 3b289eef..00000000
--- a/test/all_tests.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'package:test/test.dart';
-import 'controller.dart' as controller;
-import 'di.dart' as di;
-import 'hooked.dart' as hooked;
-import 'routing.dart' as routing;
-import 'services.dart' as services;
-
-main() {
-  group('controller', controller.main);
-  group('hooked', hooked.main);
-  group('di', di.main);
-  group('routing', routing.main);
-  group('services', services.main);
-}
\ No newline at end of file
diff --git a/test/controller.dart b/test/controller_test.dart
similarity index 100%
rename from test/controller.dart
rename to test/controller_test.dart
diff --git a/test/hooked.dart b/test/hooked_test.dart
similarity index 100%
rename from test/hooked.dart
rename to test/hooked_test.dart
diff --git a/test/routing.dart b/test/routing_test.dart
similarity index 100%
rename from test/routing.dart
rename to test/routing_test.dart
diff --git a/test/services.dart b/test/services_test.dart
similarity index 100%
rename from test/services.dart
rename to test/services_test.dart
diff --git a/test/util.dart b/test/util_test.dart
similarity index 100%
rename from test/util.dart
rename to test/util_test.dart

From 0e5f315773b97e78b15915705d84ad71295344b6 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 23 Nov 2016 14:50:17 -0500
Subject: [PATCH 055/414] Fixed a bunch of issues

---
 README.md                          |  2 +-
 lib/src/http/controller.dart       | 25 ++++++++---
 lib/src/http/request_context.dart  | 37 +++++++++++-----
 lib/src/http/response_context.dart | 20 ++++++---
 lib/src/http/server.dart           | 71 +++++++++++++++++++-----------
 pubspec.yaml                       |  2 +-
 test/di.dart                       | 12 +++--
 7 files changed, 111 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index bb83bbe0..e041d96e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-![version 1.0.0-dev](https://img.shields.io/badge/version-1.0.0--dev.23-red.svg)
+![version 1.0.0-dev.24](https://img.shields.io/badge/version-1.0.0--dev.24-red.svg)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 7eb716ba..fbc37927 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -73,19 +73,30 @@ class Controller {
                 var arg = req.params[name];
 
                 if (arg == null) {
-                  if (parameter.type.reflectedType != dynamic) {
+                  if (req.injections.containsKey(name)) {
+                    args.add(req.injections[name]);
+                    continue;
+                  }
+
+                  final type = parameter.type.reflectedType;
+
+                  if (req.injections.containsKey(type)) {
+                    args.add(req.injections[type]);
+                    continue;
+                  }
+
+                  if (type != dynamic) {
                     try {
-                      arg = app.container.make(parameter.type.reflectedType);
-                      if (arg != null) {
-                        args.add(arg);
-                        continue;
-                      }
+                      args.add(app.container.make(type));
+                      continue;
                     } catch (e) {
                       //
+                      print(e);
+                      print(req.injections);
                     }
                   }
 
-                  if (!exposeMirror.reflectee.allowNull.contain(name))
+                  if (!exposeMirror.reflectee.allowNull.contains(name))
                     throw new AngelHttpException.BadRequest(
                         message: "Missing parameter '$name'");
                 } else
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index af2544a3..a759d101 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -10,26 +10,32 @@ import 'angel_base.dart';
 class RequestContext extends Extensible {
   BodyParseResult _body;
   ContentType _contentType;
+  HttpRequest _io;
   String _path;
-  HttpRequest _underlyingRequest;
 
   /// The [Angel] instance that is responding to this request.
   AngelBase app;
 
   /// Any cookies sent with this request.
-  List<Cookie> get cookies => underlyingRequest.cookies;
+  List<Cookie> get cookies => io.cookies;
 
   /// All HTTP headers sent with this request.
-  HttpHeaders get headers => underlyingRequest.headers;
+  HttpHeaders get headers => io.headers;
 
   /// The requested hostname.
-  String get hostname => underlyingRequest.headers.value(HttpHeaders.HOST);
+  String get hostname => io.headers.value(HttpHeaders.HOST);
+
+  /// A [Map] of values that should be DI'd.
+  final Map injections = {};
+
+  /// The underlying [HttpRequest] instance underneath this context.
+  HttpRequest get io => _io;
 
   /// The user's IP.
   String get ip => remoteAddress.address;
 
   /// This request's HTTP method.
-  String get method => underlyingRequest.method;
+  String get method => io.method;
 
   /// All post data submitted to the server.
   Map get body => _body.body;
@@ -51,24 +57,27 @@ class RequestContext extends Extensible {
 
   /// The remote address requesting this resource.
   InternetAddress get remoteAddress =>
-      underlyingRequest.connectionInfo.remoteAddress;
+      io.connectionInfo.remoteAddress;
 
   /// The user's HTTP session.
-  HttpSession get session => underlyingRequest.session;
+  HttpSession get session => io.session;
 
   /// The [Uri] instance representing the path this request is responding to.
-  Uri get uri => underlyingRequest.uri;
+  Uri get uri => io.uri;
 
   /// Is this an **XMLHttpRequest**?
   bool get xhr =>
-      underlyingRequest.headers
+      io.headers
           .value("X-Requested-With")
           ?.trim()
           ?.toLowerCase() ==
       'xmlhttprequest';
 
-  /// The underlying [HttpRequest] instance underneath this context.
-  HttpRequest get underlyingRequest => _underlyingRequest;
+  @deprecated
+  HttpRequest get underlyingRequest {
+    throw new Exception(
+        '`RequestContext#underlyingRequest` is deprecated. Please update your application to use the newer `RequestContext#io`.');
+  }
 
   /// Magically transforms an [HttpRequest] into a [RequestContext].
   static Future<RequestContext> from(HttpRequest request, AngelBase app) async {
@@ -80,10 +89,14 @@ class RequestContext extends Extensible {
         .toString()
         .replaceAll("?" + request.uri.query, "")
         .replaceAll(new RegExp(r'/+$'), '');
-    ctx._underlyingRequest = request;
+    ctx._io = request;
 
     ctx._body = await parseBody(request);
 
     return ctx;
   }
+
+  void inject(Type type, value) {
+    injections[type] = value;
+  }
 }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 4e9c281b..fe175451 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -25,16 +25,22 @@ class ResponseContext extends Extensible {
 
   /// Sets the status code to be sent with this response.
   void status(int code) {
-    underlyingResponse.statusCode = code;
+    io.statusCode = code;
   }
 
   /// The underlying [HttpResponse] under this instance.
-  final HttpResponse underlyingResponse;
+  final HttpResponse io;
 
-  ResponseContext(this.underlyingResponse, this.app);
+  @deprecated
+  HttpResponse get underlyingRequest {
+    throw new Exception(
+        '`ResponseContext#underlyingResponse` is deprecated. Please update your application to use the newer `ResponseContext#io`.');
+  }
+
+  ResponseContext(this.io, this.app);
 
   /// Any and all cookies to be sent to the user.
-  List<Cookie> get cookies => underlyingResponse.cookies;
+  List<Cookie> get cookies => io.cookies;
 
   /// Set this to true if you will manually close the response.
   bool willCloseItself = false;
@@ -57,9 +63,9 @@ class ResponseContext extends Extensible {
   /// Sets a response header to the given value, or retrieves its value.
   header(String key, [String value]) {
     if (value == null)
-      return underlyingResponse.headers[key];
+      return io.headers[key];
     else
-      underlyingResponse.headers.set(key, value);
+      io.headers.set(key, value);
   }
 
   /// Serializes JSON to the response.
@@ -163,7 +169,7 @@ class ResponseContext extends Extensible {
 
     header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
     willCloseItself = true;
-    await file.openRead().pipe(underlyingResponse);
+    await file.openRead().pipe(io);
   }
 
   /// Writes data to the response.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 72c77ed4..38a258f0 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -105,6 +105,8 @@ class Angel extends AngelBase {
   /// Loads some base dependencies into the service container.
   void bootstrapContainer() {
     container.singleton(this, as: AngelBase);
+    container.singleton(this, as: Routable);
+    container.singleton(this, as: Router);
     container.singleton(this);
 
     if (runtimeType != Angel) container.singleton(this, as: Angel);
@@ -130,7 +132,7 @@ class Angel extends AngelBase {
     }
 
     if (handler is RawRequestHandler) {
-      var result = await handler(req.underlyingRequest);
+      var result = await handler(req.io);
       if (result is bool)
         return result == true;
       else if (result != null) {
@@ -167,8 +169,8 @@ class Angel extends AngelBase {
     }
 
     res.willCloseItself = true;
-    res.underlyingResponse.write(god.serialize(handler));
-    await res.underlyingResponse.close();
+    res.io.write(god.serialize(handler));
+    await res.io.close();
     return false;
   }
 
@@ -177,23 +179,34 @@ class Angel extends AngelBase {
 
     final req = await RequestContext.from(request, this);
     final res = new ResponseContext(request.response, this);
-    String requestedUrl = request.uri
-        .path
-        .replaceAll(_straySlashes, '');
+    String requestedUrl = request.uri.path.replaceAll(_straySlashes, '');
 
     if (requestedUrl.isEmpty) requestedUrl = '/';
 
-    final route = resolve(requestedUrl, method: request.method);
-    _printDebug('Resolved ${requestedUrl} -> $route');
-    req.params.addAll(route?.parseParameters(requestedUrl) ?? {});
+    final resolved = [];
 
-    final handlerSequence = []..addAll(before);
-    if (route != null) handlerSequence.addAll(route.handlerSequence);
-    handlerSequence.addAll(after);
+    if (requestedUrl == '/') {
+      resolved.add(root.indexRoute);
+    } else {
+      resolved.addAll(resolveAll(requestedUrl, method: request.method));
+      final route = resolved.first;
+      req.params.addAll(route?.parseParameters(requestedUrl) ?? {});
+      req.inject(Match, route.match(requestedUrl));
+    }
 
-    _printDebug('Handler sequence on $requestedUrl: $handlerSequence');
+    final pipeline = []..addAll(before);
 
-    for (final handler in handlerSequence) {
+    if (resolved.isNotEmpty) {
+      for (final route in resolved) {
+        pipeline.addAll(route.handlerSequence);
+      }
+    }
+
+    pipeline.addAll(after);
+
+    _printDebug('Handler sequence on $requestedUrl: $pipeline');
+
+    for (final handler in pipeline) {
       try {
         _printDebug('Executing handler: $handler');
         final result = await executeHandler(handler, req, res);
@@ -249,8 +262,7 @@ class Angel extends AngelBase {
 
   // Run a function after injecting from service container
   Future runContained(Function handler, RequestContext req, ResponseContext res,
-      {Map<String, dynamic> namedParameters,
-      Map<Type, dynamic> injecting}) async {
+      {Map<String, dynamic> namedParameters}) async {
     ClosureMirror closureMirror = reflect(handler);
     List args = [];
 
@@ -261,9 +273,9 @@ class Angel extends AngelBase {
         args.add(res);
       else {
         // First, search to see if we can map this to a type
-        if (parameter.type.reflectedType != dynamic) {
-          args.add(container.make(parameter.type.reflectedType,
-              namedParameters: namedParameters, injecting: injecting));
+        if (req.injections.containsKey(parameter.type.reflectedType)) {
+          args.add(req.injections[parameter.type.reflectedType]);
+          continue;
         } else {
           String name = MirrorSystem.getName(parameter.simpleName);
 
@@ -273,7 +285,12 @@ class Angel extends AngelBase {
             args.add(req);
           else if (name == "res")
             args.add(res);
-          else {
+          else if (req.injections.containsKey(name))
+            args.add(req.injections[name]);
+          else if (parameter.type.reflectedType != dynamic) {
+            args.add(container.make(parameter.type.reflectedType,
+                injecting: req.injections));
+          } else {
             throw new Exception(
                 "Cannot resolve parameter '$name' within handler.");
           }
@@ -324,20 +341,22 @@ class Angel extends AngelBase {
   /// Provide paths to a certificate chain and server key (both .pem).
   /// If no password is provided, a random one will be generated upon running
   /// the server.
-  Angel.secure(String certificateChainPath, String serverKeyPath,
-      {bool debug: false, String password})
-      : super(debug: debug) {
-    bootstrapContainer();
-    _serverGenerator = (InternetAddress address, int port) async {
+  factory Angel.secure(String certificateChainPath, String serverKeyPath,
+      {bool debug: false, String password}) {
+    final app = new Angel(debug: debug);
+
+    app._serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
           Platform.script.resolve(certificateChainPath).toFilePath();
       var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
       var serverContext = new SecurityContext();
       serverContext.useCertificateChain(certificateChain);
       serverContext.usePrivateKey(serverKey,
-          password: password ?? _randomString(8));
+          password: password ?? app._randomString(8));
 
       return await HttpServer.bindSecure(address, port, serverContext);
     };
+
+    return app;
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index d5703a9d..e22d5e84 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.23
+version: 1.0.0-dev.24
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/di.dart b/test/di.dart
index bfc9d9af..7b8599e9 100644
--- a/test/di.dart
+++ b/test/di.dart
@@ -22,12 +22,12 @@ main() {
     app.container.singleton(new Todo(text: TEXT, over: OVER));
 
     app.get("/errands", (Todo singleton) => singleton);
-    app.get("/errands3", (Errand singleton, Todo foo, RequestContext req) => singleton.text);
+    app.get("/errands3",
+        (Errand singleton, Todo foo, RequestContext req) => singleton.text);
     await app.configure(new SingletonController());
     await app.configure(new ErrandController());
 
     server = await app.startServer();
-    print('server: $server, httpServer: ${app.httpServer}');
     url = "http://${server.address.host}:${server.port}";
   });
 
@@ -77,7 +77,11 @@ class SingletonController extends Controller {
 @Expose("/errands4")
 class ErrandController extends Controller {
   @Expose("/")
-  errand(Errand errand) => errand.text;
+  errand(Errand errand, Match match) {
+    expect(match, isNotNull);
+    print('Match: ${match.group(0)}');
+    return errand.text;
+  }
 }
 
 class Errand {
@@ -85,4 +89,4 @@ class Errand {
   String get text => todo.text;
 
   Errand(this.todo);
-}
\ No newline at end of file
+}

From 39d70e74a6650178bf344e6762bb3673974fa178 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 24 Nov 2016 02:12:53 -0500
Subject: [PATCH 056/414] All fall through

---
 README.md                        |  2 +-
 lib/src/http/server.dart         | 13 ++++++-------
 lib/src/http/server_shelved.dart | 19 +++++++++++++++++++
 lib/src/util.dart                |  2 --
 pubspec.yaml                     |  3 ++-
 test/controller_test.dart        | 13 +++++--------
 6 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 lib/src/http/server_shelved.dart

diff --git a/README.md b/README.md
index e041d96e..54d218a8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-![version 1.0.0-dev.24](https://img.shields.io/badge/version-1.0.0--dev.24-red.svg)
+![version 1.0.0-dev.25](https://img.shields.io/badge/version-1.0.0--dev.25-red.svg)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 38a258f0..6d1bc003 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -5,6 +5,7 @@ import 'dart:io';
 import 'dart:math' show Random;
 import 'dart:mirrors';
 import 'package:json_god/json_god.dart' as god;
+import 'package:shelf/shelf.dart' as shelf;
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
@@ -13,6 +14,7 @@ import 'response_context.dart';
 import 'routable.dart';
 import 'service.dart';
 export 'package:container/container.dart';
+part 'server_shelved.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
@@ -33,8 +35,8 @@ class Angel extends AngelBase {
   var _fatalErrorStream = new StreamController<Map>.broadcast();
   var _onController = new StreamController<Controller>.broadcast();
   final Random _rand = new Random.secure();
-  ServerGenerator _serverGenerator =
-      (address, port) async => await HttpServer.bind(address, port);
+
+  ServerGenerator _serverGenerator = HttpServer.bind;
 
   /// Fired after a request is processed. Always runs.
   Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
@@ -183,12 +185,9 @@ class Angel extends AngelBase {
 
     if (requestedUrl.isEmpty) requestedUrl = '/';
 
-    final resolved = [];
+    final resolved = resolveAll(requestedUrl, method: request.method);
 
-    if (requestedUrl == '/') {
-      resolved.add(root.indexRoute);
-    } else {
-      resolved.addAll(resolveAll(requestedUrl, method: request.method));
+    if (resolved.isNotEmpty) {
       final route = resolved.first;
       req.params.addAll(route?.parseParameters(requestedUrl) ?? {});
       req.inject(Match, route.match(requestedUrl));
diff --git a/lib/src/http/server_shelved.dart b/lib/src/http/server_shelved.dart
new file mode 100644
index 00000000..0f7c77a3
--- /dev/null
+++ b/lib/src/http/server_shelved.dart
@@ -0,0 +1,19 @@
+part of angel_framework.http.server;
+
+
+// Todo: Shelf interop
+class ShelvedAngel extends Angel {
+  shelf.Pipeline pipeline = new shelf.Pipeline();
+
+  ShelvedAngel({bool debug: false}) : super(debug: debug) {}
+
+  @override
+  Future<HttpServer> startServer([InternetAddress address, int port]) async {
+    /* final handler = pipeline.addHandler((shelf.Request req) {
+      // io.handleRequest()
+    });*/
+
+    return await super.startServer(address, port);
+  }
+
+}
diff --git a/lib/src/util.dart b/lib/src/util.dart
index ad614889..710391b8 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -21,6 +21,4 @@ getAnnotation(obj, Type T) {
     ClassMirror classMirror = reflectClass(obj.runtimeType);
     return matchingAnnotation(classMirror.metadata, T);
   }
-
-  return null;
 }
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index e22d5e84..38676067 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.24
+version: 1.0.0-dev.25
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -12,6 +12,7 @@ dependencies:
   json_god: ^2.0.0-beta
   merge_map: ^1.0.0
   mime: ^0.9.3
+  shelf: ^0.6.7
 dev_dependencies:
   http: ^0.11.3
   test: ^0.12.13
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 2fb6e7bc..4490b3ea 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -28,10 +28,8 @@ class TodoController extends Controller {
 main() {
   Angel app;
   HttpServer server;
-  InternetAddress host = InternetAddress.LOOPBACK_IP_V4;
-  int port = 3000;
-  http.Client client;
-  String url = "http://${host.address}:$port";
+  http.Client client = new http.Client();
+  String url;
 
   setUp(() async {
     app = new Angel();
@@ -46,15 +44,14 @@ main() {
     print(app.controllers);
     app.dumpTree();
 
-    server = await app.startServer(host, port);
-    client = new http.Client();
+    server = await app.startServer();
+    url = 'http://${server.address.address}:${server.port}';
   });
 
   tearDown(() async {
     await server.close(force: true);
     app = null;
-    client.close();
-    client = null;
+    url = null;
   });
 
   test("middleware", () async {

From 774edb4be80fb8de6a7240f98fb6aeba49997594 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 27 Nov 2016 19:49:27 -0500
Subject: [PATCH 057/414] New router... Again

---
 README.md                          |  2 +-
 lib/src/http/response_context.dart | 37 +++++++++++++++++-------
 lib/src/http/routable.dart         |  5 ++--
 lib/src/http/server.dart           | 32 ++++++++++++---------
 lib/src/http/service.dart          |  2 --
 pubspec.yaml                       |  2 +-
 test/controller_test.dart          | 11 ++++---
 test/hooked_test.dart              |  4 +--
 test/routing_test.dart             | 46 ++++++++++++++----------------
 9 files changed, 78 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index 54d218a8..ca6e9370 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-![version 1.0.0-dev.25](https://img.shields.io/badge/version-1.0.0--dev.25-red.svg)
+![version 1.0.0-dev.26](https://img.shields.io/badge/version-1.0.0--dev.26-red.svg)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index fe175451..c3e870da 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -10,6 +10,8 @@ import '../extensible.dart';
 import 'angel_base.dart';
 import 'controller.dart';
 
+final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+
 /// A convenience wrapper around an outgoing HTTP request.
 class ResponseContext extends Extensible {
   bool _isOpen = true;
@@ -90,8 +92,15 @@ class ResponseContext extends Extensible {
   }
 
   /// Redirects to user to the given URL.
-  void redirect(String url, {int code: 301}) {
-    header(HttpHeaders.LOCATION, url);
+  ///
+  /// [url] can be a `String`, or a `List`.
+  /// If it is a `List`, a URI will be constructed
+  /// based on the provided params.
+  ///
+  /// See [Router]#navigate for more. :)
+  void redirect(url, {bool absolute: true, int code: 301}) {
+    header(HttpHeaders.LOCATION,
+        url is String ? url : app.navigate(url, absolute: absolute));
     status(code ?? 301);
     write('''
     <!DOCTYPE html>
@@ -115,18 +124,19 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given named [Route].
   void redirectTo(String name, [Map params, int code]) {
-    _findRoute(Route route) {
-      for (Route child in route.children) {
-        final resolved = _findRoute(child);
+    Route _findRoute(Router r) {
+      for (Route route in r.routes) {
+        if (route is SymlinkRoute) {
+          final m = _findRoute(route.router);
 
-        if (resolved != null) return resolved;
+          if (m != null) return m;
+        } else if (route.name == name) return route;
       }
 
-      return route.children
-          .firstWhere((r) => r.name == name, orElse: () => null);
+      return null;
     }
 
-    Route matched = _findRoute(app.root);
+    Route matched = _findRoute(app);
 
     if (matched != null) {
       redirect(matched.makeUri(params), code: code);
@@ -146,7 +156,8 @@ class ResponseContext extends Extensible {
       throw new Exception(
           "Controller redirects must take the form of 'Controller@action'. You gave: $action");
 
-    Controller controller = app.controller(split[0]);
+    Controller controller =
+        app.controller(split[0].replaceAll(_straySlashes, ''));
 
     if (controller == null)
       throw new Exception("Could not find a controller named '${split[0]}'");
@@ -157,7 +168,11 @@ class ResponseContext extends Extensible {
       throw new Exception(
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
-    redirect(matched.makeUri(params), code: code);
+    final head =
+        controller.exposeDecl.path.toString().replaceAll(_straySlashes, '');
+    final tail = matched.makeUri(params).replaceAll(_straySlashes, '');
+
+    redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
   }
 
   /// Streams a file to this response as chunked data.
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 7a25fc7f..2bc7f104 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -11,6 +11,7 @@ import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'service.dart';
+final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A function that intercepts a request and determines whether handling of it should continue.
 typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
@@ -23,7 +24,7 @@ typedef Future RawRequestHandler(HttpRequest request);
 
 /// A routable server that can handle dynamic requests.
 class Routable extends Router {
-  final Map<String, Controller> _controllers = {};
+  final Map<Pattern, Controller> _controllers = {};
   final Map<Pattern, Service> _services = {};
 
   Routable({bool debug: false}) : super(debug: debug);
@@ -36,7 +37,7 @@ class Routable extends Router {
   Map<Pattern, Service> get services => _services;
 
   /// A set of [Controller] objects that have been loaded into the application.
-  Map<String, Controller> get controllers => _controllers;
+  Map<Pattern, Controller> get controllers => _controllers;
 
   StreamController<Service> _onService =
       new StreamController<Service>.broadcast();
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 6d1bc003..5efb940b 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math' show Random;
 import 'dart:mirrors';
+import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:shelf/shelf.dart' as shelf;
 import 'angel_base.dart';
@@ -185,23 +186,18 @@ class Angel extends AngelBase {
 
     if (requestedUrl.isEmpty) requestedUrl = '/';
 
-    final resolved = resolveAll(requestedUrl, method: request.method);
+    final resolved =
+        resolveAll(requestedUrl, requestedUrl, method: request.method);
+
+    for (final result in resolved) req.params.addAll(result.allParams);
 
     if (resolved.isNotEmpty) {
-      final route = resolved.first;
-      req.params.addAll(route?.parseParameters(requestedUrl) ?? {});
+      final route = resolved.first.route;
       req.inject(Match, route.match(requestedUrl));
     }
 
-    final pipeline = []..addAll(before);
-
-    if (resolved.isNotEmpty) {
-      for (final route in resolved) {
-        pipeline.addAll(route.handlerSequence);
-      }
-    }
-
-    pipeline.addAll(after);
+    final m = new MiddlewarePipeline(resolved);
+    final pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
 
     _printDebug('Handler sequence on $requestedUrl: $pipeline');
 
@@ -304,7 +300,8 @@ class Angel extends AngelBase {
   Future configure(AngelConfigurer configurer) async {
     await configurer(this);
 
-    if (configurer is Controller) _onController.add(configurer);
+    if (configurer is Controller)
+      _onController.add(controllers[configurer.exposeDecl.path] = configurer);
   }
 
   /// Fallback when an error is thrown while handling a request.
@@ -320,6 +317,15 @@ class Angel extends AngelBase {
   @override
   use(Pattern path, Routable routable,
       {bool hooked: true, String namespace: null}) {
+    if (routable is Angel) {
+      final head = path.toString().replaceAll(_straySlashes, '');
+
+      routable.controllers.forEach((k, v) {
+        final tail = k.toString().replaceAll(_straySlashes, '');
+        controllers['$head/$tail'.replaceAll(_straySlashes, '')] = v;
+      });
+    }
+
     if (routable is Service) {
       routable.app = this;
     }
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 723f7ae6..c286c09e 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -128,7 +128,5 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
-
-    normalize();
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 38676067..883ce189 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.25
+version: 1.0.0-dev.26
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 4490b3ea..dc63472f 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -12,10 +12,10 @@ class TodoController extends Controller {
 
   @Expose("/:id", middleware: const ["bar"])
   Future<Todo> fetchTodo(
-      int id, RequestContext req, ResponseContext res) async {
+      String id, RequestContext req, ResponseContext res) async {
     expect(req, isNotNull);
     expect(res, isNotNull);
-    return todos[id];
+    return todos[int.parse(id)];
   }
 
   @Expose("/namedRoute/:foo", as: "foo")
@@ -32,7 +32,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel();
+    app = new Angel(debug: true);
     app.registerMiddleware("foo", (req, res) async => res.write("Hello, "));
     app.registerMiddleware("bar", (req, res) async => res.write("world!"));
     app.get(
@@ -57,7 +57,7 @@ main() {
   test("middleware", () async {
     var rgx = new RegExp("^Hello, world!");
     var response = await client.get("$url/todos/0");
-    print(response.body);
+    print('Response: ${response.body}');
 
     expect(rgx.firstMatch(response.body).start, equals(0));
 
@@ -70,8 +70,7 @@ main() {
 
   test("named actions", () async {
     var response = await client.get("$url/redirect");
-    print(response.body);
-
+    print('Response: ${response.body}');
     expect(response.body, equals("Hello, \"world!\""));
   });
 }
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index f9026d36..42ea966b 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -23,9 +23,7 @@ main() {
     app.use('/todos', new MemoryService<Todo>());
     Todos = app.service("todos");
 
-    app
-      ..normalize()
-      ..dumpTree(showMatchers: true);
+    app.dumpTree(showMatchers: true);
 
     server = await app.startServer();
     url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
diff --git a/test/routing_test.dart b/test/routing_test.dart
index d4249567..9a302949 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -19,7 +19,7 @@ class QueryService extends Service {
 }
 
 main() {
-  Angel angel;
+  Angel app;
   Angel nested;
   Angel todos;
   String url;
@@ -27,11 +27,11 @@ main() {
 
   setUp(() async {
     final debug = true;
-    angel = new Angel(debug: debug);
+    app = new Angel(debug: debug);
     nested = new Angel(debug: debug);
     todos = new Angel(debug: debug);
 
-    angel
+    app
       ..registerMiddleware('interceptor', (req, res) async {
         res.write('Middleware');
         return false;
@@ -53,41 +53,39 @@ main() {
       return req.params;
     });
 
-    angel.use('/nes', nested);
-    angel.get('/meta', testMiddlewareMetadata);
-    angel.get('/intercepted', 'This should not be shown',
+    app.use('/nes', nested);
+    app.get('/meta', testMiddlewareMetadata);
+    app.get('/intercepted', 'This should not be shown',
         middleware: ['interceptor']);
-    angel.get('/hello', 'world');
-    angel.get('/name/:first/last/:last', (req, res) => req.params);
-    angel.post('/lambda', (req, res) => req.body);
-    angel.use('/todos/:id', todos);
-    angel
+    app.get('/hello', 'world');
+    app.get('/name/:first/last/:last', (req, res) => req.params);
+    app.post('/lambda', (req, res) => req.body);
+    app.use('/todos/:id', todos);
+    app
         .get('/greet/:name',
             (RequestContext req, res) async => "Hello ${req.params['name']}")
         .as('Named routes');
-    angel.get('/named', (req, ResponseContext res) async {
+    app.get('/named', (req, ResponseContext res) async {
       res.redirectTo('Named routes', {'name': 'tests'});
     });
-    angel.get('/log', (RequestContext req, res) async {
+    app.get('/log', (RequestContext req, res) async {
       print("Query: ${req.query}");
       return "Logged";
     });
 
-    angel.use('/query', new QueryService());
-    angel.get('*', 'MJ');
+    app.use('/query', new QueryService());
+    app.get('*', 'MJ');
 
-    angel
-      ..normalize()
-      ..dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
+    app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
     client = new http.Client();
-    await angel.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
-    url = "http://${angel.httpServer.address.host}:${angel.httpServer.port}";
+    await app.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+    url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
   });
 
   tearDown(() async {
-    await angel.httpServer.close(force: true);
-    angel = null;
+    await app.httpServer.close(force: true);
+    app = null;
     nested = null;
     todos = null;
     client.close();
@@ -102,7 +100,7 @@ main() {
 
   test('Can match url with multiple parameters', () async {
     var response = await client.get('$url/name/HELLO/last/WORLD');
-    print(response.body);
+    print('Response: ${response.body}');
     var json = god.deserialize(response.body);
     expect(json, new isInstanceOf<Map<String, String>>());
     expect(json['first'], equals('HELLO'));
@@ -119,7 +117,7 @@ main() {
     var response = await client.get('$url/todos/1337/action/test');
     var json = god.deserialize(response.body);
     print('JSON: $json');
-    expect(json['id'], equals(1337));
+    expect(json['id'], equals('1337'));
     expect(json['action'], equals('test'));
   });
 

From 93ea5bf6f1264a0d6c5becadfddd3c3b85fda557 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 28 Nov 2016 16:48:00 -0500
Subject: [PATCH 058/414] +27

---
 README.md                    |  2 +-
 lib/src/http/controller.dart | 15 ++++++++-------
 pubspec.yaml                 |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ca6e9370..402c8706 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-![version 1.0.0-dev.26](https://img.shields.io/badge/version-1.0.0--dev.26-red.svg)
+![version 1.0.0-dev.27](https://img.shields.io/badge/version-1.0.0--dev.27-red.svg)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index fbc37927..c575215b 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -34,7 +34,11 @@ class Controller {
           "All controllers must carry an @Expose() declaration.");
     }
 
-    app.use(exposeDecl.path, generateRoutable(classMirror));
+
+    final routable = new Routable(debug: true);
+    configureRoutes(routable);
+
+    app.use(exposeDecl.path, routable);
     TypeMirror typeMirror = reflectType(this.runtimeType);
     String name = exposeDecl.as;
 
@@ -125,14 +129,11 @@ class Controller {
     };
   }
 
-  Routable generateRoutable(ClassMirror classMirror) {
-    final routable = new Routable(debug: true);
-    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
-
+  void configureRoutes(Routable routable) {
+    ClassMirror classMirror = reflectClass(this.runtimeType);
     InstanceMirror instanceMirror = reflect(this);
+    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
     final callback = _callback(instanceMirror, routable, handlers);
     classMirror.instanceMembers.forEach(callback);
-
-    return routable;
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 883ce189..eb2f5260 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.26
+version: 1.0.0-dev.27
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From b41ee89ebf0e2f6bc240916eec615169b04be44c Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 3 Dec 2016 11:32:20 -0500
Subject: [PATCH 059/414] 28

---
 README.md                        | 2 +-
 lib/src/http/hooked_service.dart | 6 +++---
 lib/src/http/service.dart        | 6 +++---
 pubspec.yaml                     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 402c8706..e1a1298a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-![version 1.0.0-dev.27](https://img.shields.io/badge/version-1.0.0--dev.27-red.svg)
+![version 1.0.0-dev.28](https://img.shields.io/badge/version-1.0.0--dev.28-red.svg)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 3f7552f8..22d7c8e1 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -59,7 +59,7 @@ class HookedService extends Service {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(inner.create, Middleware);
-    post('/', (req, res) async => await this.create(req.body, restProvider),
+    post('/', (req, res) async => await this.create(req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -79,7 +79,7 @@ class HookedService extends Service {
     patch(
         '/:id',
         (req, res) async =>
-    await this.modify(req.params['id'], req.body, restProvider),
+    await this.modify(req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -89,7 +89,7 @@ class HookedService extends Service {
     post(
         '/:id',
         (req, res) async =>
-    await this.update(req.params['id'], req.body, restProvider),
+    await this.update(req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index c286c09e..d7f6e1a0 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -83,7 +83,7 @@ class Service extends Routable {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(this.create, Middleware);
-    post('/', (req, res) async => await this.create(req.body, restProvider),
+    post('/', (req, res) async => await this.create(req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -103,7 +103,7 @@ class Service extends Routable {
     patch(
         '/:id',
         (req, res) async =>
-    await this.modify(req.params['id'], req.body, restProvider),
+    await this.modify(req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -113,7 +113,7 @@ class Service extends Routable {
     post(
         '/:id',
         (req, res) async =>
-    await this.update(req.params['id'], req.body, restProvider),
+    await this.update(req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/pubspec.yaml b/pubspec.yaml
index eb2f5260..a4f53d34 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.27
+version: 1.0.0-dev.28
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From e00fc57aff6310563b47f538750d72f9b3725016 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 8 Dec 2016 17:46:23 -0500
Subject: [PATCH 060/414] Re-designed exception

---
 .gitignore                             |   1 -
 .idea/encodings.xml                    |   6 +
 .idea/libraries/Dart_Packages.xml      | 403 +++++++++++++++++++++++++
 .idea/misc.xml                         |   4 +
 .idea/modules.xml                      |   8 +
 .idea/vcs.xml                          |   6 +
 .idea/workspace.xml                    | 366 ++++++++++++++++++++++
 README.md                              |   2 +-
 lib/src/http/angel_http_exception.dart | 121 ++++----
 pubspec.yaml                           |   2 +-
 10 files changed, 861 insertions(+), 58 deletions(-)
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/libraries/Dart_Packages.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index 951d3784..fa1e2750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 *.iml
 
 ## Directory-based project format:
-.idea/
 # if you remove the above rule, at least ignore the following:
 
 # User-specific stuff:
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..97626ba4
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
new file mode 100644
index 00000000..299eecf0
--- /dev/null
+++ b/.idea/libraries/Dart_Packages.xml
@@ -0,0 +1,403 @@
+<component name="libraryTable">
+  <library name="Dart Packages" type="DartPackagesLibraryType">
+    <properties>
+      <option name="packageNameToDirsMap">
+        <entry key="analyzer">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.29.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="angel_route">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+17/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="args">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="async">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="barback">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="body_parser">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="boolean_selector">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="charcode">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="collection">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="container">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="convert">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="crypto">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="csslib">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="glob">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="html">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="http">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="http_multi_server">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="http_parser">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="http_server">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="isolate">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="json_god">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="json_schema">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="logging">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="matcher">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="merge_map">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="meta">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="mime">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="package_config">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="package_resolver">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="path">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="plugin">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="pool">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="pub_semver">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="shelf">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="shelf_packages_handler">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="shelf_static">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="shelf_web_socket">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="source_map_stack_trace">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="source_maps">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.1+3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="source_span">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="stack_trace">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="stream_channel">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="string_scanner">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="test">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.17+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="typed_data">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="utf">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="watcher">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="web_socket_channel">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="yaml">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+            </list>
+          </value>
+        </entry>
+      </option>
+    </properties>
+    <CLASSES>
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.29.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+17/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.1+3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.17+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+    </CLASSES>
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..1719e444
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..fd63bed5
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/framework.iml" filepath="$PROJECT_DIR$/.idea/framework.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..17424235
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+    </list>
+    <ignored path="$PROJECT_DIR$/.tmp/" />
+    <ignored path="$PROJECT_DIR$/temp/" />
+    <ignored path="$PROJECT_DIR$/tmp/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FavoritesManager">
+    <favorites_list name="framework" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="799">
+              <caret line="47" column="39" lean-forward="true" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="base_plugin.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="249">
+              <caret line="26" column="41" lean-forward="true" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/README.md" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="http" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scratches" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="options.lastSelected" value="preferences.externalResources" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../Electron" />
+    <property name="nodejs_interpreter_path" value="C:/Program Files (x86)/nodejs/node" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="dart.analysis.tool.window.force.activate" value="false" />
+    <property name="HbShouldOpenHtmlAsHb" value="" />
+    <property name="js.eslint.eslintPackage" value="" />
+    <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="INTERPRETER_PATH" value="c:\cygwin\bin\bash.exe" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
+      <method />
+    </configuration>
+    <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
+      <method />
+    </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
+      <config-file value="" />
+      <node-interpreter value="project" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
+      <config-file value="" />
+      <node-interpreter value="project" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
+      <method />
+    </configuration>
+    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
+      <method />
+    </configuration>
+    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
+      <option name="cucumberJsArguments" value="" />
+      <option name="executablePath" />
+      <option name="filePath" />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
+      <command value="run-script" />
+      <scripts />
+      <node-interpreter value="project" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <working-directory />
+      <pass-parent-env>true</pass-parent-env>
+      <envs />
+      <ui />
+      <extra-mocha-options />
+      <test-kind>DIRECTORY</test-kind>
+      <test-directory />
+      <recursive>false</recursive>
+      <method />
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="" />
+      <created>1481236071442</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1481236071442</updated>
+      <workItem from="1481236073268" duration="1095000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="1095000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="processedProjectFiles" value="true" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="799">
+          <caret line="47" column="39" lean-forward="true" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="17" lean-forward="true" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="26" column="41" lean-forward="true" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index e1a1298a..8251d0a5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-![version 1.0.0-dev.28](https://img.shields.io/badge/version-1.0.0--dev.28-red.svg)
+[![pub 1.0.0-dev.29](https://img.shields.io/badge/pub-1.0.0--dev.29-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/angel_http_exception.dart b/lib/src/http/angel_http_exception.dart
index 3e91b312..d8136d42 100644
--- a/lib/src/http/angel_http_exception.dart
+++ b/lib/src/http/angel_http_exception.dart
@@ -1,21 +1,30 @@
 library angel_framework.http.angel_http_exception;
 
-class _AngelHttpExceptionBase implements Exception {
-  /// An HTTP status code this exception will throw.
-  int statusCode;
+/// Basically the same as
+/// [feathers-errors](https://github.com/feathersjs/feathers-errors).
+class AngelHttpException {
+  var error;
+
+  /// A list of errors that occurred when this exception was thrown.
+  final List<String> errors = [];
+
   /// The cause of this exception.
   String message;
-  /// A list of errors that occurred when this exception was thrown.
-  List<String> errors;
 
-  _AngelHttpExceptionBase.base() {}
+  /// The [StackTrace] associated with this error.
+  StackTrace stackTrace;
 
-  _AngelHttpExceptionBase(this.statusCode, this.message,
-      {List<String> this.errors: const []});
+  /// An HTTP status code this exception will throw.
+  int statusCode;
 
-  @override
-  String toString() {
-    return "$statusCode: $message";
+  AngelHttpException(this.error,
+      {this.message: '500 Internal Server Error',
+      this.stackTrace,
+      this.statusCode: 500,
+      List<String> errors: const []}) {
+    if (errors != null) {
+      this.errors.addAll(errors);
+    }
   }
 
   Map toJson() {
@@ -28,74 +37,76 @@ class _AngelHttpExceptionBase implements Exception {
   }
 
   Map toMap() => toJson();
-}
 
-/// Basically the same as
-/// [feathers-errors](https://github.com/feathersjs/feathers-errors).
-class AngelHttpException extends _AngelHttpExceptionBase {
-  /// Throws a 500 Internal Server Error.
-  /// Set includeRealException to true to print include the actual exception along with
-  /// this error. Useful flag for development vs. production.
-  AngelHttpException(error,
-      {bool includeRealError: false, StackTrace stackTrace}) :super.base() {
-    statusCode = 500;
-    message = "500 Internal Server Error";
-    if (includeRealError) {
-      errors.add(error.toString());
-      if (stackTrace != null) {
-        errors.add(stackTrace.toString());
-      }
-    }
+  @override
+  String toString() {
+    return "$statusCode: $message";
   }
 
+  factory AngelHttpException.fromMap(Map data) {
+    return new AngelHttpException(null,
+        statusCode: data['statusCode'],
+        message: data['message'],
+        errors: data['errors']);
+  }
+
+  factory AngelHttpException.fromJson(String json) =>
+      new AngelHttpException.fromMap(JSON.decode(json));
+
   /// Throws a 400 Bad Request error, including an optional arrray of (validation?)
   /// errors you specify.
-  AngelHttpException.BadRequest(
-      {String message: '400 Bad Request', List<String> errors: const[]})
-      : super(400, message, errors: errors);
+  factory AngelHttpException.BadRequest(
+          {String message: '400 Bad Request', List<String> errors: const []}) =>
+      new AngelHttpException(null,
+          message: message, errors: errors, statusCode: 400);
 
   /// Throws a 401 Not Authenticated error.
-  AngelHttpException.NotAuthenticated({String message: '401 Not Authenticated'})
-      : super(401, message);
+  factory AngelHttpException.NotAuthenticated(
+          {String message: '401 Not Authenticated'}) =>
+      new AngelHttpException(null, message: message, statusCode: 401);
 
   /// Throws a 402 Payment Required error.
-  AngelHttpException.PaymentRequired({String message: '402 Payment Required'})
-      : super(402, message);
+  factory AngelHttpException.PaymentRequired(
+          {String message: '402 Payment Required'}) =>
+      new AngelHttpException(null, message: message, statusCode: 402);
 
   /// Throws a 403 Forbidden error.
-  AngelHttpException.Forbidden({String message: '403 Forbidden'})
-      : super(403, message);
+  factory AngelHttpException.Forbidden({String message: '403 Forbidden'}) =>
+      new AngelHttpException(null, message: message, statusCode: 403);
 
   /// Throws a 404 Not Found error.
-  AngelHttpException.NotFound({String message: '404 Not Found'})
-      : super(404, message);
+  factory AngelHttpException.NotFound({String message: '404 Not Found'}) =>
+      new AngelHttpException(null, message: message, statusCode: 404);
 
   /// Throws a 405 Method Not Allowed error.
-  AngelHttpException.MethodNotAllowed(
-      {String message: '405 Method Not Allowed'})
-      : super(405, message);
+  factory AngelHttpException.MethodNotAllowed(
+          {String message: '405 Method Not Allowed'}) =>
+      new AngelHttpException(null, message: message, statusCode: 405);
 
   /// Throws a 406 Not Acceptable error.
-  AngelHttpException.NotAcceptable({String message: '406 Not Acceptable'})
-      : super(406, message);
+  factory AngelHttpException.NotAcceptable(
+          {String message: '406 Not Acceptable'}) =>
+      new AngelHttpException(null, message: message, statusCode: 406);
 
   /// Throws a 408 Timeout error.
-  AngelHttpException.MethodTimeout({String message: '408 Timeout'})
-      : super(408, message);
+  factory AngelHttpException.MethodTimeout({String message: '408 Timeout'}) =>
+      new AngelHttpException(null, message: message, statusCode: 408);
 
   /// Throws a 409 Conflict error.
-  AngelHttpException.Conflict({String message: '409 Conflict'})
-      : super(409, message);
+  factory AngelHttpException.Conflict({String message: '409 Conflict'}) =>
+      new AngelHttpException(null, message: message, statusCode: 409);
 
   /// Throws a 422 Not Processable error.
-  AngelHttpException.NotProcessable({String message: '422 Not Processable'})
-      : super(422, message);
+  factory AngelHttpException.NotProcessable(
+          {String message: '422 Not Processable'}) =>
+      new AngelHttpException(null, message: message, statusCode: 422);
 
   /// Throws a 501 Not Implemented error.
-  AngelHttpException.NotImplemented({String message: '501 Not Implemented'})
-      : super(501, message);
+  factory AngelHttpException.NotImplemented(
+          {String message: '501 Not Implemented'}) =>
+      new AngelHttpException(null, message: message, statusCode: 501);
 
   /// Throws a 503 Unavailable error.
-  AngelHttpException.Unavailable({String message: '503 Unavailable'})
-      : super(503, message);
-}
\ No newline at end of file
+  factory AngelHttpException.Unavailable({String message: '503 Unavailable'}) =>
+      new AngelHttpException(null, message: message, statusCode: 503);
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index a4f53d34..2d25e4cd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.28
+version: 1.0.0-dev.29
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From bf3b77c7ab08ff7da7843157e705e49ec3b633ea Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 8 Dec 2016 18:04:33 -0500
Subject: [PATCH 061/414] Re-designed exception

---
 .idea/workspace.xml                    | 160 +++++++++++++++++--------
 README.md                              |   2 +-
 lib/src/http/angel_http_exception.dart |   4 +-
 pubspec.yaml                           |   2 +-
 4 files changed, 115 insertions(+), 53 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17424235..6568d145 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
@@ -31,17 +25,40 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="799">
-              <caret line="47" column="39" lean-forward="true" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
+            <state relative-caret-position="17">
+              <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="51">
+              <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="85">
+                <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="base_plugin.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -52,11 +69,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="249">
-              <caret line="26" column="41" lean-forward="true" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
+            <state relative-caret-position="45">
+              <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
               <folding />
             </state>
           </provider>
@@ -107,7 +124,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -177,6 +193,7 @@
         </subPane>
       </pane>
       <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -234,6 +251,12 @@
       <method />
     </configuration>
     <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
       <method />
     </configuration>
     <configuration default="true" type="js.build_tools.npm" factoryName="npm">
@@ -267,37 +290,46 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1481236071442</updated>
-      <workItem from="1481236073268" duration="1095000" />
+      <workItem from="1481236073268" duration="1150000" />
+      <workItem from="1481238230885" duration="38000" />
     </task>
+    <task id="LOCAL-00001" summary="Re-designed exception">
+      <created>1481237183504</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1481237183504</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1095000" />
+    <option name="totallyTimeSpent" value="1188000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -306,23 +338,19 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Re-designed exception" />
+    <option name="LAST_COMMIT_MESSAGE" value="Re-designed exception" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="799">
-          <caret line="47" column="39" lean-forward="true" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
+          <caret line="47" column="39" lean-forward="false" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
           <folding />
         </state>
       </provider>
@@ -335,10 +363,50 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="17">
-          <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
+          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
           <folding />
         </state>
       </provider>
@@ -346,21 +414,13 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="0">
-            <caret line="0" column="17" lean-forward="true" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
+          <first_editor relative-caret-position="85">
+            <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="26" column="41" lean-forward="true" selection-start-line="26" selection-start-column="41" selection-end-line="26" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 8251d0a5..1fd13365 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.29](https://img.shields.io/badge/pub-1.0.0--dev.29-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.30](https://img.shields.io/badge/pub-1.0.0--dev.30-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/angel_http_exception.dart b/lib/src/http/angel_http_exception.dart
index d8136d42..072b716e 100644
--- a/lib/src/http/angel_http_exception.dart
+++ b/lib/src/http/angel_http_exception.dart
@@ -1,8 +1,10 @@
 library angel_framework.http.angel_http_exception;
 
+import 'dart:convert';
+
 /// Basically the same as
 /// [feathers-errors](https://github.com/feathersjs/feathers-errors).
-class AngelHttpException {
+class AngelHttpException implements Exception {
   var error;
 
   /// A list of errors that occurred when this exception was thrown.
diff --git a/pubspec.yaml b/pubspec.yaml
index 2d25e4cd..6081107b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.29
+version: 1.0.0-dev.30
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 9047890f527a15b25de98d0203ffb74adc62191a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 10 Dec 2016 09:05:40 -0500
Subject: [PATCH 062/414] Core done?

---
 .idea/libraries/Dart_Packages.xml | 196 +++++++++++------------
 .idea/modules.xml                 |   2 +-
 .idea/workspace.xml               | 248 +++++++++++++++++++++---------
 README.md                         |   2 +-
 lib/src/http/hooked_service.dart  |  54 ++++++-
 lib/src/http/metadata.dart        |  25 ++-
 lib/src/http/routable.dart        |   1 +
 pubspec.yaml                      |   4 +-
 test/common.dart                  |  15 +-
 test/hooked_test.dart             |  12 +-
 10 files changed, 371 insertions(+), 188 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 299eecf0..36d08e55 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,398 +5,398 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.29.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+17/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+16/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="async">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="barback">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
             </list>
           </value>
         </entry>
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="boolean_selector">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="charcode">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="container">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="convert">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_multi_server">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_server">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="isolate">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="json_god">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
             </list>
           </value>
         </entry>
         <entry key="json_schema">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="logging">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="merge_map">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_config">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_resolver">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="plugin">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="pub_semver">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_packages_handler">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_map_stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.1+3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.1+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_span">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="string_scanner">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.17+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.16/lib" />
             </list>
           </value>
         </entry>
         <entry key="typed_data">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="utf">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
             </list>
           </value>
         </entry>
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.29.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+17/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.1+3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.17+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+16/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.1+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.16/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
     </CLASSES>
     <SOURCES />
   </library>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fd63bed5..406d4377 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/framework.iml" filepath="$PROJECT_DIR$/.idea/framework.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/angel_framework.iml" filepath="$PROJECT_DIR$/.idea/angel_framework.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6568d145..9bf5a491 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Core done?">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/common.dart" afterPath="$PROJECT_DIR$/test/common.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,35 +32,52 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="17">
-              <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
+            <state relative-caret-position="90">
+              <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="85">
-                <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
-                <folding />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="170">
+              <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="257">
+              <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/common.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="315">
+              <caret line="21" column="30" lean-forward="false" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -72,8 +95,8 @@
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+            <state relative-caret-position="90">
+              <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
               <folding />
             </state>
           </provider>
@@ -81,6 +104,11 @@
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>BEFORE</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -89,6 +117,10 @@
       <list>
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
+        <option value="$PROJECT_DIR$/test/common.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/README.md" />
       </list>
@@ -101,10 +133,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1382" />
-    <option name="height" value="744" />
+    <option name="x" value="241" />
+    <option name="y" value="49" />
+    <option name="width" value="1621" />
+    <option name="height" value="830" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -124,25 +156,27 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -152,11 +186,11 @@
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -170,11 +204,11 @@
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="angel_framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -192,8 +226,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -208,18 +240,7 @@
     <property name="js.eslint.eslintPackage" value="" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
   </component>
-  <component name="RunManager">
-    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="INTERPRETER_PATH" value="c:\cygwin\bin\bash.exe" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
+  <component name="RunManager" selected="Dart Test.Hooked Tests">
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
@@ -279,6 +300,13 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <list size="5">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+    </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
@@ -292,6 +320,7 @@
       <updated>1481236071442</updated>
       <workItem from="1481236073268" duration="1150000" />
       <workItem from="1481238230885" duration="38000" />
+      <workItem from="1481377809918" duration="884000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -303,33 +332,65 @@
     <option name="localTasksCounter" value="2" />
     <servers />
   </component>
+  <component name="TestHistory">
+    <history-entry file="All_Tests - 2016.12.10 at 08h 57m 27s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 08h 57m 36s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 08h 58m 05s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 00m 40s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 14s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 45s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 02m 37s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 03m 36s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 04m 06s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 04m 28s.xml">
+      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+  </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1188000" />
+    <option name="totallyTimeSpent" value="2072000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="true" />
+    <frame x="241" y="49" width="1621" height="830" extended-state="0" />
+    <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2125" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -340,13 +401,30 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Re-designed exception" />
-    <option name="LAST_COMMIT_MESSAGE" value="Re-designed exception" />
+    <MESSAGE value="Core done?" />
+    <option name="LAST_COMMIT_MESSAGE" value="Core done?" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="799">
@@ -389,24 +467,48 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="14" column="23" lean-forward="true" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+        <state relative-caret-position="90">
+          <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state relative-caret-position="15">
+          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="21" column="30" lean-forward="false" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
+        <state relative-caret-position="90">
+          <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
           <folding />
         </state>
       </provider>
@@ -414,13 +516,21 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="85">
-            <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="67" lean-forward="false" selection-start-line="2" selection-start-column="67" selection-end-line="2" selection-end-column="67" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 1fd13365..90753e44 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.30](https://img.shields.io/badge/pub-1.0.0--dev.30-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.31](https://img.shields.io/badge/pub-1.0.0--dev.31-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 22d7c8e1..2e5eccdb 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -39,6 +39,41 @@ class HookedService extends Service {
     if (inner.app != null) this.app = inner.app;
   }
 
+  void addHooks() {
+    Hooks hooks = getAnnotation(inner, Hooks);
+    final before = [];
+    final after = [];
+
+    if (hooks != null) {
+      before.addAll(hooks.before);
+      after.addAll(hooks.after);
+    }
+
+    void applyListeners(Function fn, HookedServiceEventDispatcher dispatcher,
+        [bool isAfter]) {
+      Hooks hooks = getAnnotation(fn, Hooks);
+      final listeners = []..addAll(isAfter == true ? after : before);
+
+      if (hooks != null)
+        listeners.addAll(isAfter == true ? hooks.after : hooks.before);
+
+      listeners.forEach(dispatcher.listen);
+    }
+
+    applyListeners(inner.index, beforeIndexed);
+    applyListeners(inner.read, beforeRead);
+    applyListeners(inner.created, beforeCreated);
+    applyListeners(inner.modify, beforeModified);
+    applyListeners(inner.updated, beforeUpdated);
+    applyListeners(inner.removed, beforeRemoved);
+    applyListeners(inner.index, afterIndexed, true);
+    applyListeners(inner.read, afterRead, true);
+    applyListeners(inner.created, afterCreated, true);
+    applyListeners(inner.modify, afterModified, true);
+    applyListeners(inner.updated, afterUpdated, true);
+    applyListeners(inner.removed, afterRemoved, true);
+  }
+
   @override
   void addRoutes() {
     // Set up our routes. We still need to copy middleware from inner service
@@ -59,7 +94,10 @@ class HookedService extends Service {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(inner.create, Middleware);
-    post('/', (req, res) async => await this.create(req.body, mergeMap([req.query, restProvider])),
+    post(
+        '/',
+        (req, res) async =>
+            await this.create(req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -70,7 +108,7 @@ class HookedService extends Service {
     get(
         '/:id',
         (req, res) async => await this
-        .read(req.params['id'], mergeMap([req.query, restProvider])),
+            .read(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -78,8 +116,8 @@ class HookedService extends Service {
     Middleware modifyMiddleware = getAnnotation(inner.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async =>
-    await this.modify(req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.modify(
+            req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -88,8 +126,8 @@ class HookedService extends Service {
     Middleware updateMiddleware = getAnnotation(inner.update, Middleware);
     post(
         '/:id',
-        (req, res) async =>
-    await this.update(req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.update(
+            req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -99,11 +137,13 @@ class HookedService extends Service {
     delete(
         '/:id',
         (req, res) async => await this
-        .remove(req.params['id'], mergeMap([req.query, restProvider])),
+            .remove(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
+
+    addHooks();
   }
 
   @override
diff --git a/lib/src/http/metadata.dart b/lib/src/http/metadata.dart
index 1e96c449..194b0306 100644
--- a/lib/src/http/metadata.dart
+++ b/lib/src/http/metadata.dart
@@ -1,10 +1,12 @@
 library angel_framework.http.metadata;
 
+import 'hooked_service.dart' show HookedServiceEventListener;
+
 /// Annotation to map middleware onto a handler.
 class Middleware {
   final List handlers;
 
-  const Middleware(List this.handlers);
+  const Middleware(this.handlers);
 }
 
 /// Annotation to set a service up to release hooks on every action.
@@ -12,6 +14,15 @@ class Hooked {
   const Hooked();
 }
 
+/// Attaches hooks to a [HookedService].
+class Hooks {
+  final List<HookedServiceEventListener> before;
+  final List<HookedServiceEventListener> after;
+
+  const Hooks({this.before: const [], this.after: const []});
+}
+
+/// Exposes a [Controller] to the Internet.
 class Expose {
   final String method;
   final Pattern path;
@@ -19,9 +30,9 @@ class Expose {
   final String as;
   final List<String> allowNull;
 
-  const Expose(Pattern this.path,
-      {String this.method: "GET",
-      List this.middleware: const [],
-      String this.as: null,
-      List<String> this.allowNull: const[]});
-}
\ No newline at end of file
+  const Expose(this.path,
+      {this.method: "GET",
+      this.middleware: const [],
+      this.as: null,
+      this.allowNull: const []});
+}
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 2bc7f104..16c3ef87 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -11,6 +11,7 @@ import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'service.dart';
+
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A function that intercepts a request and determines whether handling of it should continue.
diff --git a/pubspec.yaml b/pubspec.yaml
index 6081107b..dacc6765 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,10 +1,10 @@
 name: angel_framework
-version: 1.0.0-dev.30
+version: 1.0.0-dev.31
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
-  sdk: ">=1.18.0"
+  sdk: ">=1.19.0"
 dependencies:
   angel_route: ^1.0.0-dev
   body_parser: ^1.0.0-dev
diff --git a/test/common.dart b/test/common.dart
index cb9ffe1e..97f7c0b1 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -1,6 +1,6 @@
 library angel_framework.test.common;
 
-import 'package:angel_framework/src/defs.dart';
+import 'package:angel_framework/angel_framework.dart';
 
 class Todo extends MemoryModel {
   String text;
@@ -8,3 +8,16 @@ class Todo extends MemoryModel {
 
   Todo({String this.text, String this.over});
 }
+
+incrementTodoTimes(e) {
+  IncrementService.TIMES++;
+}
+
+@Hooks(before: const [incrementTodoTimes])
+class IncrementService extends Service {
+  static int TIMES = 0;
+
+  @override
+  @Hooks(after: const [incrementTodoTimes])
+  index([params]) async => [];
+}
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 42ea966b..471ff17d 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -18,12 +18,12 @@ main() {
   HookedService Todos;
 
   setUp(() async {
-    app = new Angel(debug: true);
+    app = new Angel();
     client = new http.Client();
     app.use('/todos', new MemoryService<Todo>());
     Todos = app.service("todos");
 
-    app.dumpTree(showMatchers: true);
+    // app.dumpTree(showMatchers: true);
 
     server = await app.startServer();
     url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
@@ -87,4 +87,12 @@ main() {
     List result = god.deserialize(response.body);
     expect(result[0]["angel"], equals("framework"));
   });
+
+  test('metadata', () async {
+    final service = new HookedService(new IncrementService())..addHooks();
+    expect(service.inner, isNot(new isInstanceOf<MemoryService>()));
+    IncrementService.TIMES = 0;
+    await service.index();
+    expect(IncrementService.TIMES, equals(2));
+  });
 }

From 5312d353f2fe13fc186d9fc60a28b9541975fe28 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 10 Dec 2016 09:12:07 -0500
Subject: [PATCH 063/414] Fixed todo

---
 .idea/jsLibraryMappings.xml                  |   7 +
 .idea/runConfigurations/All_Tests.xml        |   7 +
 .idea/runConfigurations/Controller_Tests.xml |   6 +
 .idea/runConfigurations/DI_Tests.xml         |   6 +
 .idea/runConfigurations/Hooked_Tests.xml     |   6 +
 .idea/runConfigurations/Routing_Tests.xml    |   6 +
 .idea/workspace.xml                          | 129 ++++++++++++++-----
 lib/src/http/fatal_error.dart                |   8 ++
 lib/src/http/response_context.dart           |   1 -
 lib/src/http/server.dart                     |  27 ++--
 lib/src/http/server_shelved.dart             |  19 ---
 pubspec.yaml                                 |   1 -
 12 files changed, 155 insertions(+), 68 deletions(-)
 create mode 100644 .idea/jsLibraryMappings.xml
 create mode 100644 .idea/runConfigurations/All_Tests.xml
 create mode 100644 .idea/runConfigurations/Controller_Tests.xml
 create mode 100644 .idea/runConfigurations/DI_Tests.xml
 create mode 100644 .idea/runConfigurations/Hooked_Tests.xml
 create mode 100644 .idea/runConfigurations/Routing_Tests.xml
 create mode 100644 lib/src/http/fatal_error.dart
 delete mode 100644 lib/src/http/server_shelved.dart

diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
new file mode 100644
index 00000000..f3e502d1
--- /dev/null
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="ECMAScript 6" />
+    <includedPredefinedLibrary name="Node.js Core" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
new file mode 100644
index 00000000..ac11209e
--- /dev/null
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test" />
+    <option name="scope" value="FOLDER" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Controller_Tests.xml b/.idea/runConfigurations/Controller_Tests.xml
new file mode 100644
index 00000000..16c24846
--- /dev/null
+++ b/.idea/runConfigurations/Controller_Tests.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Controller Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/controller_test.dart" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/DI_Tests.xml b/.idea/runConfigurations/DI_Tests.xml
new file mode 100644
index 00000000..5c5345d7
--- /dev/null
+++ b/.idea/runConfigurations/DI_Tests.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DI Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/di.dart" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Hooked_Tests.xml b/.idea/runConfigurations/Hooked_Tests.xml
new file mode 100644
index 00000000..592565a1
--- /dev/null
+++ b/.idea/runConfigurations/Hooked_Tests.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Hooked Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Routing_Tests.xml b/.idea/runConfigurations/Routing_Tests.xml
new file mode 100644
index 00000000..3790ba95
--- /dev/null
+++ b/.idea/runConfigurations/Routing_Tests.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Routing Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9bf5a491..b6251cab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Core done?">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/server_shelved.dart" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/common.dart" afterPath="$PROJECT_DIR$/test/common.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,26 +28,38 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
+            <state relative-caret-position="675">
+              <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+            <state relative-caret-position="230">
+              <caret line="153" column="25" lean-forward="true" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="335">
+              <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -121,8 +129,11 @@
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       </list>
     </option>
   </component>
@@ -320,7 +331,7 @@
       <updated>1481236071442</updated>
       <workItem from="1481236073268" duration="1150000" />
       <workItem from="1481238230885" duration="38000" />
-      <workItem from="1481377809918" duration="884000" />
+      <workItem from="1481377809918" duration="1265000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -329,7 +340,14 @@
       <option name="project" value="LOCAL" />
       <updated>1481237183504</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Core done?">
+      <created>1481378740441</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1481378740441</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -365,21 +383,31 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2072000" />
+    <option name="totallyTimeSpent" value="2453000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
   </component>
   <component name="ToolWindowManager">
     <frame x="241" y="49" width="1621" height="830" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2125" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -389,7 +417,6 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -505,14 +532,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="14" lean-forward="false" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -524,13 +543,55 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server_shelved.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="3" lean-forward="false" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="14" lean-forward="false" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
+        <state relative-caret-position="675">
           <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="67" lean-forward="false" selection-start-line="0" selection-start-column="67" selection-end-line="0" selection-end-column="67" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="335">
+          <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="230">
+          <caret line="153" column="25" lean-forward="true" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/lib/src/http/fatal_error.dart b/lib/src/http/fatal_error.dart
new file mode 100644
index 00000000..665751d2
--- /dev/null
+++ b/lib/src/http/fatal_error.dart
@@ -0,0 +1,8 @@
+/// Thrown whenever Angel completely fails to respond to a request.
+class AngelFatalError {
+  var error;
+  StackTrace stack;
+
+  AngelFatalError({this.error, this.stack});
+}
+
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index c3e870da..ec7b7d5a 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -151,7 +151,6 @@ class ResponseContext extends Extensible {
     // UserController@show
     List<String> split = action.split("@");
 
-    // Todo: AngelResponseException
     if (split.length < 2)
       throw new Exception(
           "Controller redirects must take the form of 'Controller@action'. You gave: $action");
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 5efb940b..b810b825 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -6,16 +6,15 @@ import 'dart:math' show Random;
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
-import 'package:shelf/shelf.dart' as shelf;
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
+import 'fatal_error.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'service.dart';
 export 'package:container/container.dart';
-part 'server_shelved.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
@@ -31,10 +30,14 @@ typedef Future AngelConfigurer(AngelBase app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
-  var _afterProcessed = new StreamController<HttpRequest>.broadcast();
-  var _beforeProcessed = new StreamController<HttpRequest>.broadcast();
-  var _fatalErrorStream = new StreamController<Map>.broadcast();
-  var _onController = new StreamController<Controller>.broadcast();
+  StreamController<HttpRequest> _afterProcessed =
+      new StreamController<HttpRequest>.broadcast();
+  StreamController<HttpRequest> _beforeProcessed =
+      new StreamController<HttpRequest>.broadcast();
+  StreamController<AngelFatalError> _fatalErrorStream =
+      new StreamController<AngelFatalError>.broadcast();
+  StreamController<Controller> _onController =
+      new StreamController<Controller>.broadcast();
   final Random _rand = new Random.secure();
 
   ServerGenerator _serverGenerator = HttpServer.bind;
@@ -46,7 +49,7 @@ class Angel extends AngelBase {
   Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
 
   /// Fired on fatal errors.
-  Stream<Map> get fatalErrorStream => _fatalErrorStream.stream;
+  Stream<AngelFatalError> get fatalErrorStream => _fatalErrorStream.stream;
 
   /// Fired whenever a controller is added to this instance.
   ///
@@ -80,8 +83,8 @@ class Angel extends AngelBase {
   HttpServer httpServer;
 
   /// Handles a server error.
-  _onError(e, [StackTrace stackTrace]) {
-    _fatalErrorStream.add({"error": e, "stack": stackTrace});
+  _onError(e, [StackTrace st]) {
+    _fatalErrorStream.add(new AngelFatalError(error: e, stack: st));
   }
 
   void _printDebug(x) {
@@ -231,11 +234,9 @@ class Angel extends AngelBase {
               await _errorHandler(e, req, res);
             }
             _finalizeResponse(request, res);
-          } catch (_) {
-            // Todo: This exception needs to be caught as well.
+          } catch (e, st) {
+            _fatalErrorStream.add(new AngelFatalError(error: e, stack: st));
           }
-        } else {
-          // Todo: Uncaught exceptions need to be... Caught.
         }
 
         _onError(e, st);
diff --git a/lib/src/http/server_shelved.dart b/lib/src/http/server_shelved.dart
deleted file mode 100644
index 0f7c77a3..00000000
--- a/lib/src/http/server_shelved.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-part of angel_framework.http.server;
-
-
-// Todo: Shelf interop
-class ShelvedAngel extends Angel {
-  shelf.Pipeline pipeline = new shelf.Pipeline();
-
-  ShelvedAngel({bool debug: false}) : super(debug: debug) {}
-
-  @override
-  Future<HttpServer> startServer([InternetAddress address, int port]) async {
-    /* final handler = pipeline.addHandler((shelf.Request req) {
-      // io.handleRequest()
-    });*/
-
-    return await super.startServer(address, port);
-  }
-
-}
diff --git a/pubspec.yaml b/pubspec.yaml
index dacc6765..7f06ce29 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,7 +12,6 @@ dependencies:
   json_god: ^2.0.0-beta
   merge_map: ^1.0.0
   mime: ^0.9.3
-  shelf: ^0.6.7
 dev_dependencies:
   http: ^0.11.3
   test: ^0.12.13

From 2b7ad938830355477747c8c1141658aee2da1385 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 10 Dec 2016 12:10:21 -0500
Subject: [PATCH 064/414] Done???

---
 .idea/workspace.xml           | 286 +++++++++++++++++++++++++---------
 README.md                     |   2 +-
 lib/src/http/fatal_error.dart |   5 +-
 lib/src/http/server.dart      |   5 +-
 pubspec.yaml                  |   2 +-
 5 files changed, 220 insertions(+), 80 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6251cab..ef4dd47b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/server_shelved.dart" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" afterPath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
@@ -38,11 +37,34 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="75">
+                <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="153" column="25" lean-forward="true" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
+            <state relative-caret-position="2175">
+              <caret line="153" column="25" lean-forward="false" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
               <folding />
             </state>
           </provider>
@@ -51,8 +73,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="335">
-              <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
+            <state relative-caret-position="174">
+              <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -63,7 +85,7 @@
       <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
+            <state relative-caret-position="1260">
               <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
               <folding />
             </state>
@@ -73,7 +95,7 @@
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="257">
+            <state relative-caret-position="1275">
               <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
               <folding />
             </state>
@@ -83,19 +105,21 @@
       <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/common.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="21" column="30" lean-forward="false" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
+            <state relative-caret-position="195">
+              <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="base_plugin.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="0">
               <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -115,6 +139,8 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>BEFORE</find>
+      <find>_onError</find>
+      <find>_fatalErrorStream.add</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -129,11 +155,11 @@
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       </list>
     </option>
   </component>
@@ -167,8 +193,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -181,6 +207,20 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="angel_framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="angel_framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="angel_framework" />
@@ -251,7 +291,7 @@
     <property name="js.eslint.eslintPackage" value="" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
   </component>
-  <component name="RunManager" selected="Dart Test.Hooked Tests">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
@@ -331,7 +371,8 @@
       <updated>1481236071442</updated>
       <workItem from="1481236073268" duration="1150000" />
       <workItem from="1481238230885" duration="38000" />
-      <workItem from="1481377809918" duration="1265000" />
+      <workItem from="1481377809918" duration="1319000" />
+      <workItem from="1481389675241" duration="139000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -347,11 +388,18 @@
       <option name="project" value="LOCAL" />
       <updated>1481378740441</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="Fixed todo">
+      <created>1481379127310</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1481379127310</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2016.12.10 at 08h 57m 27s.xml">
+    <history-entry file="All_Tests - 2016.12.10 at 09h 12m 20s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="Hooked_Tests - 2016.12.10 at 08h 57m 36s.xml">
@@ -383,7 +431,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2453000" />
+    <option name="totallyTimeSpent" value="2646000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -398,26 +446,26 @@
     <frame x="241" y="49" width="1621" height="830" extended-state="0" />
     <editor active="true" />
     <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2125" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2125" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -429,13 +477,98 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Re-designed exception" />
     <MESSAGE value="Core done?" />
-    <option name="LAST_COMMIT_MESSAGE" value="Core done?" />
+    <MESSAGE value="Fixed todo" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed todo" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2175">
+          <caret line="153" column="25" lean-forward="true" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3540">
+          <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1260">
+          <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1275">
+          <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -510,55 +643,21 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
+        <state relative-caret-position="1275">
           <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="30" lean-forward="false" selection-start-line="21" selection-start-column="30" selection-end-line="21" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
+        <state relative-caret-position="1260">
           <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="67" lean-forward="false" selection-start-line="2" selection-start-column="67" selection-end-line="2" selection-end-column="67" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server_shelved.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="3" lean-forward="false" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="14" lean-forward="false" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server_shelved.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
@@ -567,28 +666,65 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2175">
+          <caret line="153" column="25" lean-forward="false" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="0" column="67" lean-forward="false" selection-start-line="0" selection-start-column="67" selection-end-line="0" selection-end-column="67" />
+          <caret line="0" column="17" lean-forward="false" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="335">
-          <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
+        <state relative-caret-position="174">
+          <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="75">
+            <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="153" column="25" lean-forward="true" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
+        <state relative-caret-position="15">
+          <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
           <folding />
         </state>
       </provider>
diff --git a/README.md b/README.md
index 90753e44..47bf246e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.31](https://img.shields.io/badge/pub-1.0.0--dev.31-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.32](https://img.shields.io/badge/pub-1.0.0--dev.32-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/fatal_error.dart b/lib/src/http/fatal_error.dart
index 665751d2..ab87ef2f 100644
--- a/lib/src/http/fatal_error.dart
+++ b/lib/src/http/fatal_error.dart
@@ -1,8 +1,11 @@
+import 'dart:io';
+
 /// Thrown whenever Angel completely fails to respond to a request.
 class AngelFatalError {
   var error;
+  HttpRequest request;
   StackTrace stack;
 
-  AngelFatalError({this.error, this.stack});
+  AngelFatalError({this.request, this.error, this.stack});
 }
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index b810b825..e1b5fe68 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -235,11 +235,12 @@ class Angel extends AngelBase {
             }
             _finalizeResponse(request, res);
           } catch (e, st) {
-            _fatalErrorStream.add(new AngelFatalError(error: e, stack: st));
+            _fatalErrorStream.add(new AngelFatalError(request: request, error: e, stack: st));
           }
+        } else {
+          _fatalErrorStream.add(new AngelFatalError(request: request, error: e, stack: st));
         }
 
-        _onError(e, st);
         break;
       }
     }
diff --git a/pubspec.yaml b/pubspec.yaml
index 7f06ce29..15d722ad 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.31
+version: 1.0.0-dev.32
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 1c9c5c7eca52829ac34aa928c638d9484c0551a7 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 18 Dec 2016 20:38:23 -0500
Subject: [PATCH 065/414] Beta ready :)

---
 .idea/workspace.xml                | 157 ++++++++++++++++++++++-------
 README.md                          |   2 +-
 lib/src/http/http.dart             |   1 +
 lib/src/http/response_context.dart |  48 +++++----
 lib/src/http/routable.dart         |   4 -
 lib/src/http/server.dart           |  45 +++++----
 pubspec.yaml                       |   2 +-
 7 files changed, 178 insertions(+), 81 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ef4dd47b..2bba0364 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" afterPath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -52,7 +48,7 @@
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="75">
-                <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+                <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -73,8 +69,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="174">
-              <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
+            <state relative-caret-position="3555">
+              <caret line="237" column="49" lean-forward="false" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -96,7 +92,7 @@
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="1275">
-              <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+              <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
               <folding />
             </state>
           </provider>
@@ -106,7 +102,7 @@
         <entry file="file://$PROJECT_DIR$/test/common.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="195">
-              <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
+              <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
               <folding />
             </state>
           </provider>
@@ -124,16 +120,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -193,8 +179,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -372,7 +358,8 @@
       <workItem from="1481236073268" duration="1150000" />
       <workItem from="1481238230885" duration="38000" />
       <workItem from="1481377809918" duration="1319000" />
-      <workItem from="1481389675241" duration="139000" />
+      <workItem from="1481389675241" duration="158000" />
+      <workItem from="1481390924053" duration="19000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -395,7 +382,14 @@
       <option name="project" value="LOCAL" />
       <updated>1481379127310</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="Done???">
+      <created>1481389821679</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1481389821679</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -431,7 +425,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2646000" />
+    <option name="totallyTimeSpent" value="2684000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -478,13 +472,101 @@
     <MESSAGE value="Re-designed exception" />
     <MESSAGE value="Core done?" />
     <MESSAGE value="Fixed todo" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed todo" />
+    <MESSAGE value="Done???" />
+    <option name="LAST_COMMIT_MESSAGE" value="Done???" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="75">
+            <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2175">
+          <caret line="153" column="25" lean-forward="false" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3555">
+          <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1260">
+          <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1275">
+          <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
@@ -557,7 +639,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -573,7 +654,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -589,7 +669,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="799">
           <caret line="47" column="39" lean-forward="false" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -597,7 +676,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -621,7 +699,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -637,14 +714,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1275">
-          <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+          <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
           <folding />
         </state>
       </provider>
@@ -677,7 +753,7 @@
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
-          <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
+          <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
           <folding />
         </state>
       </provider>
@@ -696,14 +772,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="17" lean-forward="false" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="174">
-          <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
+        <state relative-caret-position="3555">
+          <caret line="237" column="49" lean-forward="false" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
@@ -714,13 +789,23 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="75">
-            <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+            <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1374">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#47#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
diff --git a/README.md b/README.md
index 47bf246e..b81d2026 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.32](https://img.shields.io/badge/pub-1.0.0--dev.32-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.33](https://img.shields.io/badge/pub-1.0.0--dev.33-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index c2859a48..5ca7da13 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -7,6 +7,7 @@ export 'angel_http_exception.dart';
 export 'base_middleware.dart';
 export 'base_plugin.dart';
 export 'controller.dart';
+export 'fatal_error.dart';
 export 'hooked_service.dart';
 export 'metadata.dart';
 export 'memory_service.dart';
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index ec7b7d5a..37d94292 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -19,6 +19,15 @@ class ResponseContext extends Extensible {
   /// The [Angel] instance that is sending a response.
   AngelBase app;
 
+  /// Any and all cookies to be sent to the user.
+  final List<Cookie> cookies = [];
+
+  /// Headers that will be sent to the user.
+  final Map<String, String> headers = {};
+
+  /// This response's status code.
+  int statusCode = 200;
+
   /// Can we still write to this response?
   bool get isOpen => _isOpen;
 
@@ -26,8 +35,9 @@ class ResponseContext extends Extensible {
   final BytesBuilder buffer = new BytesBuilder();
 
   /// Sets the status code to be sent with this response.
+  @Deprecated('Please use `statusCode=` instead.')
   void status(int code) {
-    io.statusCode = code;
+    statusCode = code;
   }
 
   /// The underlying [HttpResponse] under this instance.
@@ -41,18 +51,15 @@ class ResponseContext extends Extensible {
 
   ResponseContext(this.io, this.app);
 
-  /// Any and all cookies to be sent to the user.
-  List<Cookie> get cookies => io.cookies;
-
   /// Set this to true if you will manually close the response.
   bool willCloseItself = false;
 
   /// Sends a download as a response.
   download(File file, {String filename}) async {
-    header("Content-Disposition",
-        'attachment; filename="${filename ?? file.path}"');
-    header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
-    header(HttpHeaders.CONTENT_LENGTH, file.lengthSync().toString());
+    headers["Content-Disposition"] =
+        'attachment; filename="${filename ?? file.path}"';
+    headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
+    headers[HttpHeaders.CONTENT_LENGTH] = file.lengthSync().toString();
     buffer.add(await file.readAsBytes());
     end();
   }
@@ -63,31 +70,32 @@ class ResponseContext extends Extensible {
   }
 
   /// Sets a response header to the given value, or retrieves its value.
+  @Deprecated('Please use `headers` instead.')
   header(String key, [String value]) {
     if (value == null)
-      return io.headers[key];
+      return headers[key];
     else
-      io.headers.set(key, value);
+      headers[key] = value;
   }
 
   /// Serializes JSON to the response.
   void json(value) {
     write(god.serialize(value));
-    header(HttpHeaders.CONTENT_TYPE, ContentType.JSON.toString());
+    headers[HttpHeaders.CONTENT_TYPE] = ContentType.JSON.toString();
     end();
   }
 
   /// Returns a JSONP response.
   void jsonp(value, {String callbackName: "callback"}) {
     write("$callbackName(${god.serialize(value)})");
-    header(HttpHeaders.CONTENT_TYPE, "application/javascript");
+    headers[HttpHeaders.CONTENT_TYPE] = "application/javascript";
     end();
   }
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) async {
     write(await app.viewGenerator(view, data));
-    header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
+    headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     end();
   }
 
@@ -99,9 +107,9 @@ class ResponseContext extends Extensible {
   ///
   /// See [Router]#navigate for more. :)
   void redirect(url, {bool absolute: true, int code: 301}) {
-    header(HttpHeaders.LOCATION,
-        url is String ? url : app.navigate(url, absolute: absolute));
-    status(code ?? 301);
+    headers[HttpHeaders.LOCATION] =
+        url is String ? url : app.navigate(url, absolute: absolute);
+    statusCode = code ?? 301;
     write('''
     <!DOCTYPE html>
     <html>
@@ -175,15 +183,13 @@ class ResponseContext extends Extensible {
   }
 
   /// Streams a file to this response as chunked data.
-  ///
-  /// Useful for video sites.
   Future streamFile(File file,
       {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
     if (!isOpen) return;
 
-    header(HttpHeaders.CONTENT_TYPE, lookupMimeType(file.path));
-    willCloseItself = true;
-    await file.openRead().pipe(io);
+    headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
+    end();
+    buffer.add(await file.readAsBytes());
   }
 
   /// Writes data to the response.
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 16c3ef87..7206d878 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -1,7 +1,6 @@
 library angel_framework.http.routable;
 
 import 'dart:async';
-import 'dart:io';
 import 'package:angel_route/angel_route.dart';
 import '../util.dart';
 import 'angel_base.dart';
@@ -20,9 +19,6 @@ typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 /// A function that receives an incoming [RequestContext] and responds to it.
 typedef Future RequestHandler(RequestContext req, ResponseContext res);
 
-/// A function that handles an [HttpRequest].
-typedef Future RawRequestHandler(HttpRequest request);
-
 /// A routable server that can handle dynamic requests.
 class Routable extends Router {
   final Map<Pattern, Controller> _controllers = {};
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index e1b5fe68..69ab054e 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -56,11 +56,16 @@ class Angel extends AngelBase {
   /// **NOTE**: This is a broadcast stream.
   Stream<Controller> get onController => _onController.stream;
 
+  /// Always run before responses are sent.
+  ///
+  /// These will only not run if an [AngelFatalError] occurs.
+  final List<RequestHandler> responseFinalizers = [];
+
   /// Default error handler, show HTML error page
   AngelErrorHandler _errorHandler =
       (AngelHttpException e, req, ResponseContext res) {
-    res.header(HttpHeaders.CONTENT_TYPE, ContentType.HTML.toString());
-    res.status(e.statusCode);
+    res.heades[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
+    res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
     for (String error in e.errors) {
@@ -137,17 +142,6 @@ class Angel extends AngelBase {
       return res.isOpen;
     }
 
-    if (handler is RawRequestHandler) {
-      var result = await handler(req.io);
-      if (result is bool)
-        return result == true;
-      else if (result != null) {
-        res.json(result);
-        return false;
-      } else
-        return true;
-    }
-
     if (handler is Future) {
       var result = await handler;
       if (result is bool)
@@ -200,6 +194,8 @@ class Angel extends AngelBase {
     }
 
     final m = new MiddlewarePipeline(resolved);
+    req.inject(MiddlewarePipeline, m);
+
     final pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
 
     _printDebug('Handler sequence on $requestedUrl: $pipeline');
@@ -224,7 +220,7 @@ class Angel extends AngelBase {
         if (e is AngelHttpException) {
           // Special handling for AngelHttpExceptions :)
           try {
-            res.status(e.statusCode);
+            res.statusCode = e.statusCode;
             String accept = request.headers.value(HttpHeaders.ACCEPT);
             if (accept == "*/*" ||
                 accept.contains(ContentType.JSON.mimeType) ||
@@ -233,12 +229,14 @@ class Angel extends AngelBase {
             } else {
               await _errorHandler(e, req, res);
             }
-            _finalizeResponse(request, res);
+            // _finalizeResponse(request, res);
           } catch (e, st) {
-            _fatalErrorStream.add(new AngelFatalError(request: request, error: e, stack: st));
+            _fatalErrorStream.add(
+                new AngelFatalError(request: request, error: e, stack: st));
           }
         } else {
-          _fatalErrorStream.add(new AngelFatalError(request: request, error: e, stack: st));
+          _fatalErrorStream
+              .add(new AngelFatalError(request: request, error: e, stack: st));
         }
 
         break;
@@ -249,7 +247,18 @@ class Angel extends AngelBase {
       _afterProcessed.add(request);
 
       if (!res.willCloseItself) {
-        request.response.add(res.buffer.takeBytes());
+        for (var finalizer in responseFinalizers) {
+          await finalizer(req, res);
+        }
+
+        for (var key in res.headers.keys) {
+          request.response.headers.set(key, res.headers[key]);
+        }
+
+        request.response
+          ..statusCode = res.statusCode
+          ..cookies.addAll(res.cookies)
+          ..add(res.buffer.takeBytes());
         await request.response.close();
       }
     } catch (e) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 15d722ad..6c90ba8b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.32
+version: 1.0.0-dev.33
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From e3d14d407f8f30e7bfe56028f6ee577459470ff5 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 18 Dec 2016 20:40:50 -0500
Subject: [PATCH 066/414] ALPHA* ready :)

---
 README.md                | 2 +-
 lib/src/http/server.dart | 6 +++---
 pubspec.yaml             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b81d2026..7f232b93 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.33](https://img.shields.io/badge/pub-1.0.0--dev.33-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.34](https://img.shields.io/badge/pub-1.0.0--dev.34-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 ![build status](https://travis-ci.org/angel-dart/framework.svg)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 69ab054e..dd4adaa3 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -168,9 +168,9 @@ class Angel extends AngelBase {
       return await executeHandler(requestMiddleware[handler], req, res);
     }
 
-    res.willCloseItself = true;
-    res.io.write(god.serialize(handler));
-    await res.io.close();
+    // res.willCloseItself = true;
+    res.write(god.serialize(handler));
+    // await res.io.close();
     return false;
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 6c90ba8b..b89bd4ac 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.33
+version: 1.0.0-dev.34
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 01d391f2a6ac5474dc5761dce6d2cf21aa0d9fff Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 18 Dec 2016 20:42:56 -0500
Subject: [PATCH 067/414] Not ready anymore :(

---
 test/{di.dart => di_test.dart} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/{di.dart => di_test.dart} (100%)

diff --git a/test/di.dart b/test/di_test.dart
similarity index 100%
rename from test/di.dart
rename to test/di_test.dart

From 2bbb7e549d61cbdca6c59e9dbbb59118189b1be6 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 18 Dec 2016 20:43:35 -0500
Subject: [PATCH 068/414] README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f232b93..0d0e917a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
 [![pub 1.0.0-dev.34](https://img.shields.io/badge/pub-1.0.0--dev.34-red.svg)](https://pub.dartlang.org/packages/angel_framework)
-![build status](https://travis-ci.org/angel-dart/framework.svg)
+[![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
\ No newline at end of file

From 5c5ab40876b79f4e7f0160af35f38dc2ebd9b144 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 18 Dec 2016 23:32:36 -0500
Subject: [PATCH 069/414] NOW Alpha ready :)

---
 lib/src/http/response_context.dart | 3 +++
 lib/src/http/server.dart           | 2 ++
 test/di_test.dart                  | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 37d94292..50488ace 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -19,6 +19,9 @@ class ResponseContext extends Extensible {
   /// The [Angel] instance that is sending a response.
   AngelBase app;
 
+  /// Is `Transfer-Encoding` chunked?
+  bool chunked;
+
   /// Any and all cookies to be sent to the user.
   final List<Cookie> cookies = [];
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index dd4adaa3..a0d08df0 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -254,6 +254,8 @@ class Angel extends AngelBase {
         for (var key in res.headers.keys) {
           request.response.headers.set(key, res.headers[key]);
         }
+        
+        request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
 
         request.response
           ..statusCode = res.statusCode
diff --git a/test/di_test.dart b/test/di_test.dart
index 7b8599e9..82ddecb3 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_route/angel_route.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 import 'common.dart';
@@ -77,9 +78,8 @@ class SingletonController extends Controller {
 @Expose("/errands4")
 class ErrandController extends Controller {
   @Expose("/")
-  errand(Errand errand, Match match) {
-    expect(match, isNotNull);
-    print('Match: ${match.group(0)}');
+  errand(Errand errand, MiddlewarePipeline pipeline) {
+    expect(pipeline, isNotNull);
     return errand.text;
   }
 }

From 0057f1166167fc89dae80863e26636e62dbba13c Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 20 Dec 2016 22:10:03 -0500
Subject: [PATCH 070/414] 35

---
 README.md                          |  2 +-
 lib/src/http/request_context.dart  | 10 +++-------
 lib/src/http/response_context.dart | 24 ++++++++++++++++++++++++
 pubspec.yaml                       |  2 +-
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 0d0e917a..7023539d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.34](https://img.shields.io/badge/pub-1.0.0--dev.34-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.35](https://img.shields.io/badge/pub-1.0.0--dev.35-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index a759d101..52cad7dd 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -56,8 +56,7 @@ class RequestContext extends Extensible {
   Map get query => _body.query;
 
   /// The remote address requesting this resource.
-  InternetAddress get remoteAddress =>
-      io.connectionInfo.remoteAddress;
+  InternetAddress get remoteAddress => io.connectionInfo.remoteAddress;
 
   /// The user's HTTP session.
   HttpSession get session => io.session;
@@ -67,10 +66,7 @@ class RequestContext extends Extensible {
 
   /// Is this an **XMLHttpRequest**?
   bool get xhr =>
-      io.headers
-          .value("X-Requested-With")
-          ?.trim()
-          ?.toLowerCase() ==
+      io.headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
       'xmlhttprequest';
 
   @deprecated
@@ -91,7 +87,7 @@ class RequestContext extends Extensible {
         .replaceAll(new RegExp(r'/+$'), '');
     ctx._io = request;
 
-    ctx._body = await parseBody(request);
+    ctx._body = (await parseBody(request)) ?? {};
 
     return ctx;
   }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 50488ace..41db6b77 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -10,6 +10,9 @@ import '../extensible.dart';
 import 'angel_base.dart';
 import 'controller.dart';
 
+final RegExp _contentType =
+    new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
+
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A convenience wrapper around an outgoing HTTP request.
@@ -52,6 +55,27 @@ class ResponseContext extends Extensible {
         '`ResponseContext#underlyingResponse` is deprecated. Please update your application to use the newer `ResponseContext#io`.');
   }
 
+  /// Gets the Content-Type header.
+  ContentType get contentType {
+    if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) return null;
+
+    var header = headers[HttpHeaders.CONTENT_TYPE];
+    var match = _contentType.firstMatch(header);
+
+    if (match == null)
+      throw new Exception('Malformed Content-Type response header: "$header".');
+
+    if (match[4]?.isNotEmpty != true)
+      return new ContentType(match[1], match[2]);
+    else
+      return new ContentType(match[1], match[2], charset: match[4]);
+  }
+
+  /// Sets the Content-Type header.
+  void set contentType(ContentType contentType) {
+    headers[HttpHeaders.CONTENT_TYPE] = contentType.toString();
+  }
+
   ResponseContext(this.io, this.app);
 
   /// Set this to true if you will manually close the response.
diff --git a/pubspec.yaml b/pubspec.yaml
index b89bd4ac..f71fcdd6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.34
+version: 1.0.0-dev.35
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 530eb11bf8fca4db8d28fda65d7657c62fe3fde3 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 21 Dec 2016 13:18:26 -0500
Subject: [PATCH 071/414] :)

---
 README.md                          |  2 +-
 lib/src/http/base_middleware.dart  |  5 +++
 lib/src/http/response_context.dart | 28 ++++++++++++--
 lib/src/http/server.dart           | 61 ++++++++++++++++++++++++++++--
 pubspec.yaml                       |  2 +-
 5 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 7023539d..d86522b1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.35](https://img.shields.io/badge/pub-1.0.0--dev.35-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.36](https://img.shields.io/badge/pub-1.0.0--dev.36-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/base_middleware.dart b/lib/src/http/base_middleware.dart
index ca3c5282..662749f6 100644
--- a/lib/src/http/base_middleware.dart
+++ b/lib/src/http/base_middleware.dart
@@ -4,6 +4,11 @@ import 'dart:async';
 import 'request_context.dart';
 import 'response_context.dart';
 
+abstract class AngelMiddleware {
+  Future<bool> call(RequestContext req, ResponseContext res);
+}
+
+@Deprecated('Use AngelMiddleware instead')
 abstract class BaseMiddleware {
   Future<bool> call(RequestContext req, ResponseContext res);
 }
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 41db6b77..3ba795fc 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -79,6 +79,8 @@ class ResponseContext extends Extensible {
   ResponseContext(this.io, this.app);
 
   /// Set this to true if you will manually close the response.
+  /// 
+  /// If `true`, all response finalizers will be skipped.
   bool willCloseItself = false;
 
   /// Sends a download as a response.
@@ -209,14 +211,34 @@ class ResponseContext extends Extensible {
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
   }
 
-  /// Streams a file to this response as chunked data.
-  Future streamFile(File file,
+  /// Copies a file's contents into the response buffer.
+  Future sendFile(File file,
       {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
     if (!isOpen) return;
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
-    end();
     buffer.add(await file.readAsBytes());
+    end();
+  }
+
+  /// Streams a file to this response.
+  ///
+  /// You can optionally transform the file stream with a [codec].
+  Future streamFile(File file,
+      {int chunkSize,
+      int sleepMs: 0,
+      bool resumable: true,
+      Codec<List<int>, List<int>> codec}) async {
+    if (!isOpen) return;
+
+    headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
+    end();
+    willCloseItself = true;
+
+    var stream = codec != null
+        ? file.openRead().transform(codec.encoder)
+        : file.openRead();
+    await stream.pipe(io);
   }
 
   /// Writes data to the response.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index a0d08df0..c56a461b 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -38,6 +38,8 @@ class Angel extends AngelBase {
       new StreamController<AngelFatalError>.broadcast();
   StreamController<Controller> _onController =
       new StreamController<Controller>.broadcast();
+  final List<Angel> _children = [];
+  Angel _parent;
   final Random _rand = new Random.secure();
 
   ServerGenerator _serverGenerator = HttpServer.bind;
@@ -48,14 +50,26 @@ class Angel extends AngelBase {
   /// Fired before a request is processed. Always runs.
   Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
 
+  /// All child application mounted on this instance.
+  List<Angel> get children => new List<Angel>.unmodifiable(_children);
+
   /// Fired on fatal errors.
   Stream<AngelFatalError> get fatalErrorStream => _fatalErrorStream.stream;
 
+  /// Indicates whether the application is running in a production environment.
+  ///
+  /// The criteria for this is the `ANGEL_ENV` environment variable being set to
+  /// `'production'`.
+  bool get isProduction => Platform.environment['ANGEL_ENV'] == 'production';
+
   /// Fired whenever a controller is added to this instance.
   ///
   /// **NOTE**: This is a broadcast stream.
   Stream<Controller> get onController => _onController.stream;
 
+  /// Returns the parent instance of this application, if any.
+  Angel get parent => _parent;
+
   /// Always run before responses are sent.
   ///
   /// These will only not run if an [AngelFatalError] occurs.
@@ -79,10 +93,10 @@ class Angel extends AngelBase {
   AngelErrorHandler get errorHandler => _errorHandler;
 
   /// [RequestMiddleware] to be run before all requests.
-  List before = [];
+  final List before = [];
 
   /// [RequestMiddleware] to be run after all requests.
-  List after = [];
+  final List after = [];
 
   /// The native HttpServer running this instancce.
   HttpServer httpServer;
@@ -254,7 +268,7 @@ class Angel extends AngelBase {
         for (var key in res.headers.keys) {
           request.response.headers.set(key, res.headers[key]);
         }
-        
+
         request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
 
         request.response
@@ -327,16 +341,55 @@ class Angel extends AngelBase {
     }, onError: _onError);
   }
 
+  /// Mounts the child on this router.
+  ///
+  /// If the router is an [Angel] instance, all controllers
+  /// will be copied, as well as services and response finalizers.
+  ///
+  /// [before] and [after] will be preserved.
+  /// 
+  /// NOTE: The above will not be properly copied if [path] is
+  /// a [RegExp].
   @override
   use(Pattern path, Routable routable,
       {bool hooked: true, String namespace: null}) {
+    final head = path.toString().replaceAll(_straySlashes, '');
+
     if (routable is Angel) {
-      final head = path.toString().replaceAll(_straySlashes, '');
+      _children.add(routable.._parent = this);
+
+      if (routable.before.isNotEmpty) {
+        all(path, (req, res) {
+          return true;
+        }, middleware: routable.before);
+      }
+
+      if (routable.after.isNotEmpty) {
+        all(path, (req, res) {
+          return true;
+        }, middleware: routable.after);
+      }
+
+      if (routable.responseFinalizers.isNotEmpty) {
+        responseFinalizers.add((req, res) async {
+          if (req.path.replaceAll(_straySlashes, '').startsWith(head)) {
+            for (var finalizer in routable.responseFinalizers)
+              await finalizer(req, res);
+          }
+
+          return true;
+        });
+      }
 
       routable.controllers.forEach((k, v) {
         final tail = k.toString().replaceAll(_straySlashes, '');
         controllers['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
+
+      routable.services.forEach((k, v) {
+        final tail = k.toString().replaceAll(_straySlashes, '');
+        services['$head/$tail'.replaceAll(_straySlashes, '')] = v;
+      });
     }
 
     if (routable is Service) {
diff --git a/pubspec.yaml b/pubspec.yaml
index f71fcdd6..3587899b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.35
+version: 1.0.0-dev.36
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From e1684330a95e465614d0030c3cf315560adadc08 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 21 Dec 2016 15:27:07 -0500
Subject: [PATCH 072/414] Fixed `heades`

---
 README.md                | 2 +-
 lib/src/http/server.dart | 2 +-
 pubspec.yaml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d86522b1..0a2dea28 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.36](https://img.shields.io/badge/pub-1.0.0--dev.36-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.37](https://img.shields.io/badge/pub-1.0.0--dev.37-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index c56a461b..3bcdbe16 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -78,7 +78,7 @@ class Angel extends AngelBase {
   /// Default error handler, show HTML error page
   AngelErrorHandler _errorHandler =
       (AngelHttpException e, req, ResponseContext res) {
-    res.heades[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
+    res.headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
diff --git a/pubspec.yaml b/pubspec.yaml
index 3587899b..7a9b56d0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.36
+version: 1.0.0-dev.37
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From cdfc734271407db340b7ca69da97d1fd3d1c4da5 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 21 Dec 2016 18:40:18 -0500
Subject: [PATCH 073/414] Inject

---
 README.md                    | 2 +-
 lib/src/http/controller.dart | 7 ++++++-
 pubspec.yaml                 | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0a2dea28..1bb23ee0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.37](https://img.shields.io/badge/pub-1.0.0--dev.37-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.38](https://img.shields.io/badge/pub-1.0.0--dev.38-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index c575215b..0c7c6af1 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -34,7 +34,6 @@ class Controller {
           "All controllers must carry an @Expose() declaration.");
     }
 
-
     final routable = new Routable(debug: true);
     configureRoutes(routable);
 
@@ -80,6 +79,12 @@ class Controller {
                   if (req.injections.containsKey(name)) {
                     args.add(req.injections[name]);
                     continue;
+                  } else if (name == "req") {
+                    args.add(req);
+                    continue;
+                  } else if (name == "res") {
+                    args.add(res);
+                    continue;
                   }
 
                   final type = parameter.type.reflectedType;
diff --git a/pubspec.yaml b/pubspec.yaml
index 7a9b56d0..9eaf899f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.37
+version: 1.0.0-dev.38
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 98d9913b16618ca7345bbcae5324c4a780576c13 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 22 Dec 2016 20:49:30 -0500
Subject: [PATCH 074/414] 302!!!

---
 README.md                          | 2 +-
 lib/src/http/response_context.dart | 4 ++--
 pubspec.yaml                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1bb23ee0..d5d5c74f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.38](https://img.shields.io/badge/pub-1.0.0--dev.38-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.39](https://img.shields.io/badge/pub-1.0.0--dev.39-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 3ba795fc..cbe83e61 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -135,10 +135,10 @@ class ResponseContext extends Extensible {
   /// based on the provided params.
   ///
   /// See [Router]#navigate for more. :)
-  void redirect(url, {bool absolute: true, int code: 301}) {
+  void redirect(url, {bool absolute: true, int code: 302}) {
     headers[HttpHeaders.LOCATION] =
         url is String ? url : app.navigate(url, absolute: absolute);
-    statusCode = code ?? 301;
+    statusCode = code ?? 302;
     write('''
     <!DOCTYPE html>
     <html>
diff --git a/pubspec.yaml b/pubspec.yaml
index 9eaf899f..eb48e1de 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.38
+version: 1.0.0-dev.39
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From fea3184be184260e01ad9131d8c082dc175e48a6 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 23 Dec 2016 15:53:39 -0500
Subject: [PATCH 075/414] inject

---
 lib/src/http/request_context.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 52cad7dd..66ed9127 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -92,7 +92,7 @@ class RequestContext extends Extensible {
     return ctx;
   }
 
-  void inject(Type type, value) {
+  void inject(type, value) {
     injections[type] = value;
   }
 }

From 51b682078fda868b9295c2d267f21c28131755f9 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 23 Dec 2016 15:53:54 -0500
Subject: [PATCH 076/414] inject

---
 README.md    | 2 +-
 pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d5d5c74f..8886dff5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.39](https://img.shields.io/badge/pub-1.0.0--dev.39-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.40](https://img.shields.io/badge/pub-1.0.0--dev.40-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index eb48e1de..45051763 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.39
+version: 1.0.0-dev.40
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From b05fc64f1fe21d5a0e882e1a0a12e871a781dadb Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 30 Dec 2016 20:46:41 -0500
Subject: [PATCH 077/414] Pre-reflect

---
 LICENSE                            | 695 +----------------------------
 lib/src/http/angel_base.dart       |   1 +
 lib/src/http/controller.dart       | 229 +++++-----
 lib/src/http/response_context.dart |  30 +-
 lib/src/http/server.dart           |  92 ++--
 pubspec.yaml                       |   2 +-
 6 files changed, 221 insertions(+), 828 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5717dd98..32e25c1c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,674 +1,21 @@
-GNU GENERAL PUBLIC LICENSE
-   Version 3, 29 June 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-        Preamble
-
-The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-   TERMS AND CONDITIONS
-
-0. Definitions.
-
-"This License" refers to version 3 of the GNU General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-
-The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-The Corresponding Source for a work in source code form is that
-same work.
-
-2. Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-a) The work must carry prominent notices stating that you modified
-it, and giving a relevant date.
-
-b) The work must carry prominent notices stating that it is
-released under this License and any conditions added under section
-7.  This requirement modifies the requirement in section 4 to
-"keep intact all notices".
-
-c) You must license the entire work, as a whole, under this
-License to anyone who comes into possession of a copy.  This
-License will therefore apply, along with any applicable section 7
-additional terms, to the whole of the work, and all its parts,
-regardless of how they are packaged.  This License gives no
-permission to license the work in any other way, but it does not
-invalidate such permission if you have separately received it.
-
-d) If the work has interactive user interfaces, each must display
-Appropriate Legal Notices; however, if the Program has interactive
-interfaces that do not display Appropriate Legal Notices, your
-work need not make them do so.
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-a) Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by the
-Corresponding Source fixed on a durable physical medium
-customarily used for software interchange.
-
-b) Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by a
-written offer, valid for at least three years and valid for as
-long as you offer spare parts or customer support for that product
-model, to give anyone who possesses the object code either (1) a
-copy of the Corresponding Source for all the software in the
-product that is covered by this License, on a durable physical
-medium customarily used for software interchange, for a price no
-more than your reasonable cost of physically performing this
-conveying of source, or (2) access to copy the
-Corresponding Source from a network server at no charge.
-
-c) Convey individual copies of the object code with a copy of the
-written offer to provide the Corresponding Source.  This
-alternative is allowed only occasionally and noncommercially, and
-only if you received the object code with such an offer, in accord
-with subsection 6b.
-
-d) Convey the object code by offering access from a designated
-place (gratis or for a charge), and offer equivalent access to the
-Corresponding Source in the same way through the same place at no
-further charge.  You need not require recipients to copy the
-Corresponding Source along with the object code.  If the place to
-copy the object code is a network server, the Corresponding Source
-may be on a different server (operated by you or a third party)
-that supports equivalent copying facilities, provided you maintain
-clear directions next to the object code saying where to find the
-Corresponding Source.  Regardless of what server hosts the
-Corresponding Source, you remain obligated to ensure that it is
-available for as long as needed to satisfy these requirements.
-
-e) Convey the object code using peer-to-peer transmission, provided
-you inform other peers where the object code and Corresponding
-Source of the work are being offered to the general public at no
-charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the
-terms of sections 15 and 16 of this License; or
-
-b) Requiring preservation of specified reasonable legal notices or
-author attributions in that material or in the Appropriate Legal
-Notices displayed by works containing it; or
-
-c) Prohibiting misrepresentation of the origin of that material, or
-requiring that modified versions of such material be marked in
-reasonable ways as different from the original version; or
-
-d) Limiting the use for publicity purposes of names of licensors or
-authors of the material; or
-
-e) Declining to grant rights under trademark law for use of some
-trade names, trademarks, or service marks; or
-
-f) Requiring indemnification of licensors and authors of that
-material by anyone who conveys the material (or modified versions of
-it) with contractual assumptions of liability to the recipient, for
-any liability that these contractual assumptions directly impose on
-those licensors and authors.
-
-All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-8. Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-13. Use with the GNU Affero General Public License.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-{one line to give the program's name and a brief idea of what it does.}
-Copyright (C) {year}  {name of author}
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-{project}  Copyright (C) {year}  {fullname}
-This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
\ No newline at end of file
+MIT License
+
+Copyright (c) 2016 The Angel Framework
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 25fc84be..f1d95084 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -7,6 +7,7 @@ import 'routable.dart';
 /// A function that asynchronously generates a view from the given path and data.
 typedef Future<String> ViewGenerator(String path, [Map data]);
 
+/// Base class for Angel servers. Do not bother extending this.
 class AngelBase extends Routable {
   AngelBase({bool debug: false}):super(debug: debug);
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 0c7c6af1..fdd82143 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -3,142 +3,167 @@ library angel_framework.http.controller;
 import 'dart:async';
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
-import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
+import 'server.dart' show Angel;
 
+/// Contains a list of the data required for a DI-enabled method to run.
+///
+/// This improves performance by removing the necessity to reflect a method
+/// every time it is requested.
+///
+/// Regular request handlers can also skip DI entirely, lowering response time
+/// and memory use.
+class InjectionRequest {
+  /// A list of the data required for a DI-enabled method to run.
+  final List required = [];
+}
+
+/// Supports grouping routes with shared functionality.
 class Controller {
-  AngelBase app;
+  Angel _app;
+
+  Angel get app => _app;
+  final bool debug;
   List middleware = [];
   Map<String, Route> routeMappings = {};
   Expose exposeDecl;
 
-  Future call(AngelBase app) async {
-    this.app = app;
+  Controller({this.debug: false});
+
+  Future call(Angel app) async {
+    _app = app;
 
     // Load global expose decl
     ClassMirror classMirror = reflectClass(this.runtimeType);
-
-    for (InstanceMirror metadatum in classMirror.metadata) {
-      if (metadatum.reflectee is Expose) {
-        exposeDecl = metadatum.reflectee;
-        break;
-      }
-    }
+    Expose exposeDecl = classMirror.metadata
+        .map((m) => m.reflectee)
+        .firstWhere((r) => r is Expose, orElse: () => null);
 
     if (exposeDecl == null) {
       throw new Exception(
           "All controllers must carry an @Expose() declaration.");
     }
 
-    final routable = new Routable(debug: true);
-    configureRoutes(routable);
+    var routable = new Routable(debug: debug);
 
     app.use(exposeDecl.path, routable);
     TypeMirror typeMirror = reflectType(this.runtimeType);
-    String name = exposeDecl.as;
-
-    if (name == null || name.isEmpty)
-      name = MirrorSystem.getName(typeMirror.simpleName);
+    String name = exposeDecl.as?.isNotEmpty == true
+        ? exposeDecl.as
+        : MirrorSystem.getName(typeMirror.simpleName);
 
     app.controllers[name] = this;
+
+    // Pre-reflect methods
+    InstanceMirror instanceMirror = reflect(this);
+    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
+    final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
+    classMirror.instanceMembers.forEach(routeBuilder);
+    configureRoutes(routable);
   }
 
-  _callback(InstanceMirror instanceMirror, Routable routable, List handlers) {
-    return (Symbol key, MethodMirror methodMirror) {
-      if (methodMirror.isRegularMethod &&
-          key != #toString &&
-          key != #noSuchMethod &&
-          key != #call &&
-          key != #equals &&
-          key != #==) {
-        InstanceMirror exposeMirror = methodMirror.metadata.firstWhere(
-            (mirror) => mirror.reflectee is Expose,
-            orElse: () => null);
+  Function _routeBuilder(
+      InstanceMirror instanceMirror, Routable routable, List handlers) {
+    return (Symbol methodName, MethodMirror method) {
+      if (method.isRegularMethod &&
+          methodName != #toString &&
+          methodName != #noSuchMethod &&
+          methodName != #call &&
+          methodName != #equals &&
+          methodName != #==) {
+        Expose exposeDecl = method.metadata
+            .map((m) => m.reflectee)
+            .firstWhere((r) => r is Expose, orElse: () => null);
 
-        if (exposeMirror != null) {
-          RequestHandler handler =
-              (RequestContext req, ResponseContext res) async {
-            List args = [];
+        if (exposeDecl == null) return;
 
-            // Load parameters, and execute
-            for (int i = 0; i < methodMirror.parameters.length; i++) {
-              ParameterMirror parameter = methodMirror.parameters[i];
-              if (parameter.type.reflectedType == RequestContext)
-                args.add(req);
-              else if (parameter.type.reflectedType == ResponseContext)
-                args.add(res);
-              else {
-                String name = MirrorSystem.getName(parameter.simpleName);
-                var arg = req.params[name];
+        var reflectedMethod = instanceMirror.getField(methodName).reflectee;
+        var middleware = []..addAll(handlers)..addAll(exposeDecl.middleware);
+        var injection = new InjectionRequest();
 
-                if (arg == null) {
-                  if (req.injections.containsKey(name)) {
-                    args.add(req.injections[name]);
-                    continue;
-                  } else if (name == "req") {
-                    args.add(req);
-                    continue;
-                  } else if (name == "res") {
-                    args.add(res);
-                    continue;
-                  }
-
-                  final type = parameter.type.reflectedType;
-
-                  if (req.injections.containsKey(type)) {
-                    args.add(req.injections[type]);
-                    continue;
-                  }
-
-                  if (type != dynamic) {
-                    try {
-                      args.add(app.container.make(type));
-                      continue;
-                    } catch (e) {
-                      //
-                      print(e);
-                      print(req.injections);
-                    }
-                  }
-
-                  if (!exposeMirror.reflectee.allowNull.contains(name))
-                    throw new AngelHttpException.BadRequest(
-                        message: "Missing parameter '$name'");
-                } else
-                  args.add(arg);
-              }
-            }
-
-            return await instanceMirror.invoke(key, args).reflectee;
-          };
-
-          final middleware = []
-            ..addAll(handlers)
-            ..addAll(exposeMirror.reflectee.middleware);
-
-          final route = routable.addRoute(exposeMirror.reflectee.method,
-              exposeMirror.reflectee.path, handler,
+        // Check if normal
+        if (method.parameters.length == 2 &&
+            method.parameters[0].type.reflectedType == RequestContext &&
+            method.parameters[1].type.reflectedType == ResponseContext) {
+          // Create a regular route
+          routable.addRoute(exposeDecl.method, exposeDecl.path, reflectedMethod,
               middleware: middleware);
-
-          String name = exposeMirror.reflectee.as;
-
-          if (name == null || name.isEmpty) name = MirrorSystem.getName(key);
-
-          routeMappings[name] = route;
+          return;
         }
+
+        // Load parameters
+        for (var parameter in method.parameters) {
+          var name = MirrorSystem.getName(parameter.simpleName);
+          var type = parameter.type.reflectedType;
+
+          if (type == RequestContext || type == ResponseContext) {
+            injection.required.add(type);
+          } else if (name == 'req') {
+            injection.required.add(RequestContext);
+          } else if (name == 'res') {
+            injection.required.add(ResponseContext);
+          } else if (type == dynamic) {
+            injection.required.add(name);
+          } else {
+            injection.required.add([name, type]);
+          }
+        }
+
+        routable.addRoute(exposeDecl.method, exposeDecl.path,
+            handleContained(reflectedMethod, injection),
+            middleware: middleware);
       }
     };
   }
 
-  void configureRoutes(Routable routable) {
-    ClassMirror classMirror = reflectClass(this.runtimeType);
-    InstanceMirror instanceMirror = reflect(this);
-    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
-    final callback = _callback(instanceMirror, routable, handlers);
-    classMirror.instanceMembers.forEach(callback);
-  }
+  /// Used to add additional routes to the router from within a [Controller].
+  void configureRoutes(Routable routable) {}
+}
+
+/// Handles a request with a DI-enabled handler.
+RequestHandler handleContained(handler, InjectionRequest injection) {
+  return (RequestContext req, ResponseContext res) async {
+    List args = [];
+
+    void inject(requirement) {
+      for (var requirement in injection.required) {
+        if (requirement == RequestContext) {
+          args.add(req);
+        } else if (requirement == ResponseContext) {
+          args.add(res);
+        } else if (requirement is String) {
+          if (req.params.containsKey(requirement)) {} else if (req.injections
+              .containsKey(requirement))
+            args.add(req.injections[requirement]);
+          else {
+            throw new Exception(
+                "Cannot resolve parameter '$requirement' within handler.");
+          }
+          args.add(req.params[requirement]);
+        } else if (requirement is List) {
+          for (var child in requirement) {
+            try {
+              inject(child);
+              break;
+            } catch (e) {
+              rethrow;
+            }
+          }
+        } else if (requirement is Type && requirement != dynamic) {
+          args.add(
+              req.app.container.make(requirement, injecting: req.injections));
+        } else {
+          throw new ArgumentError(
+              '$requirement cannot be injected into a request handler.');
+        }
+      }
+    }
+
+    injection.required.forEach(inject);
+    return Function.apply(handler, args);
+  };
 }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index cbe83e61..092009a8 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -15,6 +15,9 @@ final RegExp _contentType =
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
+/// Serializes response data into a String.
+typedef String ResponseSerializer(data);
+
 /// A convenience wrapper around an outgoing HTTP request.
 class ResponseContext extends Extensible {
   bool _isOpen = true;
@@ -31,6 +34,11 @@ class ResponseContext extends Extensible {
   /// Headers that will be sent to the user.
   final Map<String, String> headers = {};
 
+  /// Serializes response data into a String.
+  ///
+  /// The default is conversion into JSON.
+  ResponseSerializer serializer = god.serialize;
+
   /// This response's status code.
   int statusCode = 200;
 
@@ -79,7 +87,7 @@ class ResponseContext extends Extensible {
   ResponseContext(this.io, this.app);
 
   /// Set this to true if you will manually close the response.
-  /// 
+  ///
   /// If `true`, all response finalizers will be skipped.
   bool willCloseItself = false;
 
@@ -108,11 +116,8 @@ class ResponseContext extends Extensible {
   }
 
   /// Serializes JSON to the response.
-  void json(value) {
-    write(god.serialize(value));
-    headers[HttpHeaders.CONTENT_TYPE] = ContentType.JSON.toString();
-    end();
-  }
+  @Deprecated('Please use `serialize` instead.')
+  void json(value) => serialize(value, contentType: ContentType.JSON);
 
   /// Returns a JSONP response.
   void jsonp(value, {String callbackName: "callback"}) {
@@ -221,6 +226,19 @@ class ResponseContext extends Extensible {
     end();
   }
 
+  /// Serializes data to the response.
+  ///
+  /// [contentType] can be either a [String], or a [ContentType].
+  void serialize(value, {contentType}) {
+    write(serializer(value));
+
+    if (contentType is String)
+      headers[HttpHeaders.CONTENT_TYPE] = contentType;
+    else if (contentType is ContentType) this.contentType = contentType;
+
+    end();
+  }
+
   /// Streams a file to this response.
   ///
   /// You can optionally transform the file stream with a [codec].
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 3bcdbe16..26bd7eac 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -5,7 +5,6 @@ import 'dart:io';
 import 'dart:math' show Random;
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
-import 'package:json_god/json_god.dart' as god;
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
@@ -41,9 +40,10 @@ class Angel extends AngelBase {
   final List<Angel> _children = [];
   Angel _parent;
   final Random _rand = new Random.secure();
-
   ServerGenerator _serverGenerator = HttpServer.bind;
 
+  final Map<dynamic, InjectionRequest> _preContained = {};
+
   /// Fired after a request is processed. Always runs.
   Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
 
@@ -82,9 +82,11 @@ class Angel extends AngelBase {
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
+
     for (String error in e.errors) {
       res.write("<li>$error</li>");
     }
+
     res.write("</ul></body></html>");
     res.end();
   };
@@ -145,7 +147,7 @@ class Angel extends AngelBase {
       if (result is bool)
         return result == true;
       else if (result != null) {
-        res.json(result);
+        res.serialize(result);
         return false;
       } else
         return res.isOpen;
@@ -161,7 +163,7 @@ class Angel extends AngelBase {
       if (result is bool)
         return result == true;
       else if (result != null) {
-        res.json(result);
+        res.serialize(result);
         return false;
       } else
         return true;
@@ -172,7 +174,7 @@ class Angel extends AngelBase {
       if (result is bool)
         return result == true;
       else if (result != null) {
-        res.json(result);
+        res.serialize(result);
         return false;
       } else
         return true;
@@ -182,9 +184,7 @@ class Angel extends AngelBase {
       return await executeHandler(requestMiddleware[handler], req, res);
     }
 
-    // res.willCloseItself = true;
-    res.write(god.serialize(handler));
-    // await res.io.close();
+    res.serialize(handler);
     return false;
   }
 
@@ -235,11 +235,13 @@ class Angel extends AngelBase {
           // Special handling for AngelHttpExceptions :)
           try {
             res.statusCode = e.statusCode;
-            String accept = request.headers.value(HttpHeaders.ACCEPT);
-            if (accept == "*/*" ||
+            List<String> accept =
+                request.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
+            if (accept.isEmpty ||
+                accept.contains('*/*') ||
                 accept.contains(ContentType.JSON.mimeType) ||
                 accept.contains("application/javascript")) {
-              res.json(e.toMap());
+              res.serialize(e.toMap());
             } else {
               await _errorHandler(e, req, res);
             }
@@ -282,45 +284,45 @@ class Angel extends AngelBase {
     }
   }
 
-  // Run a function after injecting from service container
-  Future runContained(Function handler, RequestContext req, ResponseContext res,
-      {Map<String, dynamic> namedParameters}) async {
+  /// Run a function after injecting from service container.
+  /// If this function has been reflected before, then
+  /// the execution will be faster, as the injection requirements were stored beforehand.
+  Future runContained(
+      Function handler, RequestContext req, ResponseContext res) {
+    if (_preContained.containsKey(handler)) {
+      return handleContained(handler, _preContained[handler])(req, res);
+    }
+
+    return runReflected(handler, req, res);
+  }
+
+  /// Runs with DI, and *always* reflects. Prefer [runContained].
+  Future runReflected(
+      Function handler, RequestContext req, ResponseContext res) async {
     ClosureMirror closureMirror = reflect(handler);
-    List args = [];
+    var injection = new InjectionRequest();
 
-    for (ParameterMirror parameter in closureMirror.function.parameters) {
-      if (parameter.type.reflectedType == RequestContext)
-        args.add(req);
-      else if (parameter.type.reflectedType == ResponseContext)
-        args.add(res);
-      else {
-        // First, search to see if we can map this to a type
-        if (req.injections.containsKey(parameter.type.reflectedType)) {
-          args.add(req.injections[parameter.type.reflectedType]);
-          continue;
-        } else {
-          String name = MirrorSystem.getName(parameter.simpleName);
+    // Load parameters
+    for (var parameter in closureMirror.function.parameters) {
+      var name = MirrorSystem.getName(parameter.simpleName);
+      var type = parameter.type.reflectedType;
 
-          if (req.params.containsKey(name))
-            args.add(req.params[name]);
-          else if (name == "req")
-            args.add(req);
-          else if (name == "res")
-            args.add(res);
-          else if (req.injections.containsKey(name))
-            args.add(req.injections[name]);
-          else if (parameter.type.reflectedType != dynamic) {
-            args.add(container.make(parameter.type.reflectedType,
-                injecting: req.injections));
-          } else {
-            throw new Exception(
-                "Cannot resolve parameter '$name' within handler.");
-          }
-        }
+      if (type == RequestContext || type == ResponseContext) {
+        injection.required.add(type);
+      } else if (name == 'req') {
+        injection.required.add(RequestContext);
+      } else if (name == 'res') {
+        injection.required.add(ResponseContext);
+      } else if (type == dynamic) {
+        injection.required.add(name);
+      } else {
+        injection.required.add([name, type]);
       }
     }
 
-    return await closureMirror.apply(args).reflectee;
+    _preContained[handler] = injection;
+    return handleContained(handler, injection);
+    // return await closureMirror.apply(args).reflectee;
   }
 
   /// Applies an [AngelConfigurer] to this instance.
@@ -347,7 +349,7 @@ class Angel extends AngelBase {
   /// will be copied, as well as services and response finalizers.
   ///
   /// [before] and [after] will be preserved.
-  /// 
+  ///
   /// NOTE: The above will not be properly copied if [path] is
   /// a [RegExp].
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
index 45051763..106f1b64 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.40
+version: 1.0.0-dev.41
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From ce28fa338b8f70c330c26533fcd8407eea0b6e31 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 30 Dec 2016 21:00:52 -0500
Subject: [PATCH 078/414] Fixed preprocessing?

---
 lib/src/http/controller.dart | 37 +++++-------------
 lib/src/http/server.dart     | 73 +++++++++++++++++++++++++-----------
 2 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index fdd82143..d04011b7 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -3,12 +3,11 @@ library angel_framework.http.controller;
 import 'dart:async';
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
-import 'angel_http_exception.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
-import 'server.dart' show Angel;
+import 'server.dart' show Angel, preInject;
 
 /// Contains a list of the data required for a DI-enabled method to run.
 ///
@@ -30,7 +29,6 @@ class Controller {
   final bool debug;
   List middleware = [];
   Map<String, Route> routeMappings = {};
-  Expose exposeDecl;
 
   Controller({this.debug: false});
 
@@ -39,9 +37,7 @@ class Controller {
 
     // Load global expose decl
     ClassMirror classMirror = reflectClass(this.runtimeType);
-    Expose exposeDecl = classMirror.metadata
-        .map((m) => m.reflectee)
-        .firstWhere((r) => r is Expose, orElse: () => null);
+    Expose exposeDecl = findExpose();
 
     if (exposeDecl == null) {
       throw new Exception(
@@ -83,7 +79,6 @@ class Controller {
 
         var reflectedMethod = instanceMirror.getField(methodName).reflectee;
         var middleware = []..addAll(handlers)..addAll(exposeDecl.middleware);
-        var injection = new InjectionRequest();
 
         // Check if normal
         if (method.parameters.length == 2 &&
@@ -95,26 +90,8 @@ class Controller {
           return;
         }
 
-        // Load parameters
-        for (var parameter in method.parameters) {
-          var name = MirrorSystem.getName(parameter.simpleName);
-          var type = parameter.type.reflectedType;
-
-          if (type == RequestContext || type == ResponseContext) {
-            injection.required.add(type);
-          } else if (name == 'req') {
-            injection.required.add(RequestContext);
-          } else if (name == 'res') {
-            injection.required.add(ResponseContext);
-          } else if (type == dynamic) {
-            injection.required.add(name);
-          } else {
-            injection.required.add([name, type]);
-          }
-        }
-
         routable.addRoute(exposeDecl.method, exposeDecl.path,
-            handleContained(reflectedMethod, injection),
+            handleContained(reflectedMethod, preInject(reflectedMethod)),
             middleware: middleware);
       }
     };
@@ -122,6 +99,12 @@ class Controller {
 
   /// Used to add additional routes to the router from within a [Controller].
   void configureRoutes(Routable routable) {}
+
+  /// Finds the [Expose] declaration for this class.
+  Expose findExpose() => reflectClass(runtimeType)
+      .metadata
+      .map((m) => m.reflectee)
+      .firstWhere((r) => r is Expose, orElse: () => null);
 }
 
 /// Handles a request with a DI-enabled handler.
@@ -140,7 +123,7 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
               .containsKey(requirement))
             args.add(req.injections[requirement]);
           else {
-            throw new Exception(
+            throw new ArgumentError(
                 "Cannot resolve parameter '$requirement' within handler.");
           }
           args.add(req.params[requirement]);
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 26bd7eac..23ce0063 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -126,6 +126,7 @@ class Angel extends AngelBase {
   Future<HttpServer> startServer([InternetAddress address, int port]) async {
     final host = address ?? InternetAddress.LOOPBACK_IP_V4;
     this.httpServer = await _serverGenerator(host, port ?? 0);
+    preprocessRoutes();
     return httpServer..listen(handleRequest);
   }
 
@@ -284,6 +285,27 @@ class Angel extends AngelBase {
     }
   }
 
+  /// Preprocesses all routes, and eliminates the burden of reflecting handlers
+  /// at run-time.
+  void preprocessRoutes() {
+    _add(v) {
+      if (v is Function && !_preContained.containsKey(v)) {
+        _preContained[v] = preInject(v);
+      }
+    }
+
+    void _walk(Router router) {
+      router.requestMiddleware.forEach((k, v) => _add(v));
+      router.middleware.forEach(_add);
+      router.routes
+          .where((r) => r is SymlinkRoute)
+          .map((SymlinkRoute r) => r.router)
+          .forEach(_walk);
+    }
+
+    _walk(this);
+  }
+
   /// Run a function after injecting from service container.
   /// If this function has been reflected before, then
   /// the execution will be faster, as the injection requirements were stored beforehand.
@@ -299,26 +321,7 @@ class Angel extends AngelBase {
   /// Runs with DI, and *always* reflects. Prefer [runContained].
   Future runReflected(
       Function handler, RequestContext req, ResponseContext res) async {
-    ClosureMirror closureMirror = reflect(handler);
-    var injection = new InjectionRequest();
-
-    // Load parameters
-    for (var parameter in closureMirror.function.parameters) {
-      var name = MirrorSystem.getName(parameter.simpleName);
-      var type = parameter.type.reflectedType;
-
-      if (type == RequestContext || type == ResponseContext) {
-        injection.required.add(type);
-      } else if (name == 'req') {
-        injection.required.add(RequestContext);
-      } else if (name == 'res') {
-        injection.required.add(ResponseContext);
-      } else if (type == dynamic) {
-        injection.required.add(name);
-      } else {
-        injection.required.add([name, type]);
-      }
-    }
+    var injection = preInjection(handler);
 
     _preContained[handler] = injection;
     return handleContained(handler, injection);
@@ -330,13 +333,13 @@ class Angel extends AngelBase {
     await configurer(this);
 
     if (configurer is Controller)
-      _onController.add(controllers[configurer.exposeDecl.path] = configurer);
+      _onController.add(controllers[configurer.findExpose().path] = configurer);
   }
 
   /// Fallback when an error is thrown while handling a request.
   void failSilently(HttpRequest request, ResponseContext res) {}
 
-  /// Starts the server.
+  /// Starts the server, wrapped in a [runZoned] call.
   void listen({InternetAddress address, int port: 3000}) {
     runZoned(() async {
       await startServer(address, port);
@@ -433,3 +436,29 @@ class Angel extends AngelBase {
     return app;
   }
 }
+
+/// Predetermines what needs to be injected for a handler to run.
+InjectionRequest preInject(Function handler) {
+  ClosureMirror closureMirror = reflect(handler);
+  var injection = new InjectionRequest();
+
+  // Load parameters
+  for (var parameter in closureMirror.function.parameters) {
+    var name = MirrorSystem.getName(parameter.simpleName);
+    var type = parameter.type.reflectedType;
+
+    if (type == RequestContext || type == ResponseContext) {
+      injection.required.add(type);
+    } else if (name == 'req') {
+      injection.required.add(RequestContext);
+    } else if (name == 'res') {
+      injection.required.add(ResponseContext);
+    } else if (type == dynamic) {
+      injection.required.add(name);
+    } else {
+      injection.required.add([name, type]);
+    }
+  }
+
+  return injection;
+}

From e09050f116451b7e53cae585cf19b7b070352cae Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 30 Dec 2016 21:11:55 -0500
Subject: [PATCH 079/414] findExpose

---
 lib/src/http/response_context.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 092009a8..17682c55 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -210,7 +210,7 @@ class ResponseContext extends Extensible {
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
     final head =
-        controller.exposeDecl.path.toString().replaceAll(_straySlashes, '');
+        controller.findExpose().path.toString().replaceAll(_straySlashes, '');
     final tail = matched.makeUri(params).replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);

From c771e82ad34ea00ed7482cb0a2851a04d63eadf7 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 30 Dec 2016 21:22:54 -0500
Subject: [PATCH 080/414] I love stack overflows!!!

---
 .idea/runConfigurations/DI_Tests.xml   |   2 +-
 .idea/workspace.xml                    | 358 +++++++++++++++----------
 lib/src/http/angel_http_exception.dart |  68 +++++
 lib/src/http/controller.dart           |   8 +-
 lib/src/http/memory_service.dart       |  14 +-
 5 files changed, 300 insertions(+), 150 deletions(-)

diff --git a/.idea/runConfigurations/DI_Tests.xml b/.idea/runConfigurations/DI_Tests.xml
index 5c5345d7..002c3572 100644
--- a/.idea/runConfigurations/DI_Tests.xml
+++ b/.idea/runConfigurations/DI_Tests.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DI Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
-    <option name="filePath" value="$PROJECT_DIR$/test/di.dart" />
+    <option name="filePath" value="$PROJECT_DIR$/test/di_test.dart" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2bba0364..d9596f4e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/DI_Tests.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/DI_Tests.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/memory_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -23,35 +27,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="675">
-              <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="75">
-                <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
-                <folding />
-              </first_editor>
-              <second_editor />
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#17#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -59,31 +42,48 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2175">
-              <caret line="153" column="25" lean-forward="false" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
+            <state relative-caret-position="165">
+              <caret line="208" column="26" lean-forward="true" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="474">
+              <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3555">
-              <caret line="237" column="49" lean-forward="false" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
+            <state relative-caret-position="175">
+              <caret line="237" column="42" lean-forward="true" selection-start-line="237" selection-start-column="42" selection-end-line="237" selection-end-column="42" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
+                <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <file leaf-file-name="memory_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1260">
-              <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
-              <folding />
+            <state relative-caret-position="444">
+              <caret line="74" column="26" lean-forward="true" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
+              <folding>
+                <marker date="1483150602000" expanded="true" signature="331:2888" ph="{...}" />
+                <marker date="1483150602000" expanded="true" signature="889:1201" ph="{...}" />
+                <marker date="1483150602000" expanded="true" signature="1605:2124" ph="{...}" />
+                <marker date="1483150602000" expanded="true" signature="2172:2586" ph="{...}" />
+                <marker date="1483150602000" expanded="true" signature="2628:2886" ph="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -110,11 +110,33 @@
       </file>
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="385">
+              <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="315">
+              <caret line="86" column="35" lean-forward="true" selection-start-line="86" selection-start-column="35" selection-end-line="86" selection-end-column="35" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="0">
               <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#0#22#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -136,16 +158,18 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
       </list>
     </option>
   </component>
@@ -156,10 +180,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="241" />
-    <option name="y" value="49" />
-    <option name="width" value="1621" />
-    <option name="height" value="830" />
+    <option name="x" value="324" />
+    <option name="y" value="73" />
+    <option name="width" value="1486" />
+    <option name="height" value="909" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -277,7 +301,7 @@
     <property name="js.eslint.eslintPackage" value="" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Test.Controller Tests">
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
@@ -360,6 +384,7 @@
       <workItem from="1481377809918" duration="1319000" />
       <workItem from="1481389675241" duration="158000" />
       <workItem from="1481390924053" duration="19000" />
+      <workItem from="1483149948840" duration="913000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -389,21 +414,25 @@
       <option name="project" value="LOCAL" />
       <updated>1481389821679</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="findExpose">
+      <created>1483150316137</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1483150316138</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2016.12.10 at 09h 12m 20s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2016.12.30 at 21h 15m 45s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 08h 57m 36s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2016.12.30 at 21h 22m 18s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 08h 58m 05s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 00m 40s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="DI_Tests - 2016.12.30 at 21h 14m 42s.xml">
+      <configuration name="DI Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 14s.xml">
       <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
@@ -423,9 +452,12 @@
     <history-entry file="Hooked_Tests - 2016.12.10 at 09h 04m 28s.xml">
       <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="Routing_Tests - 2016.12.30 at 21h 11m 10s.xml">
+      <configuration name="Routing Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2684000" />
+    <option name="totallyTimeSpent" value="3597000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -437,29 +469,29 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="241" y="49" width="1621" height="830" extended-state="0" />
+    <frame x="324" y="73" width="1486" height="909" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2125" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2122867" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -473,13 +505,22 @@
     <MESSAGE value="Core done?" />
     <MESSAGE value="Fixed todo" />
     <MESSAGE value="Done???" />
-    <option name="LAST_COMMIT_MESSAGE" value="Done???" />
+    <MESSAGE value="findExpose" />
+    <option name="LAST_COMMIT_MESSAGE" value="findExpose" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
@@ -521,6 +562,7 @@
           <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
+            <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -597,6 +639,7 @@
           <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
+            <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -702,72 +745,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server_shelved.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2175">
-          <caret line="153" column="25" lean-forward="false" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -775,13 +753,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3555">
-          <caret line="237" column="49" lean-forward="false" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-1374">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" column="16" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -796,23 +779,116 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1374">
+        <state relative-caret-position="1260">
+          <caret line="90" column="26" lean-forward="false" selection-start-line="90" selection-start-column="26" selection-end-line="90" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#0#47#0" expanded="true" />
+            <element signature="e#0#17#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="21" lean-forward="false" selection-start-line="1" selection-start-column="21" selection-end-line="1" selection-end-column="21" />
+        <state relative-caret-position="195">
+          <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1275">
+          <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="208" column="26" lean-forward="true" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="444">
+          <caret line="74" column="26" lean-forward="true" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
+          <folding>
+            <marker date="1483150602000" expanded="true" signature="331:2888" ph="{...}" />
+            <marker date="1483150602000" expanded="true" signature="889:1201" ph="{...}" />
+            <marker date="1483150602000" expanded="true" signature="1605:2124" ph="{...}" />
+            <marker date="1483150602000" expanded="true" signature="2172:2586" ph="{...}" />
+            <marker date="1483150602000" expanded="true" signature="2628:2886" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="385">
+          <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="86" column="35" lean-forward="true" selection-start-line="86" selection-start-column="35" selection-end-line="86" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="237" column="42" lean-forward="true" selection-start-line="237" selection-start-column="42" selection-end-line="237" selection-end-column="42" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+            <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/lib/src/http/angel_http_exception.dart b/lib/src/http/angel_http_exception.dart
index 072b716e..ebc35257 100644
--- a/lib/src/http/angel_http_exception.dart
+++ b/lib/src/http/angel_http_exception.dart
@@ -57,26 +57,88 @@ class AngelHttpException implements Exception {
 
   /// Throws a 400 Bad Request error, including an optional arrray of (validation?)
   /// errors you specify.
+  factory AngelHttpException.badRequest(
+      {String message: '400 Bad Request', List<String> errors: const []}) =>
+      new AngelHttpException(null,
+          message: message, errors: errors, statusCode: 400);
+
+  /// Throws a 401 Not Authenticated error.
+  factory AngelHttpException.notAuthenticated(
+      {String message: '401 Not Authenticated'}) =>
+      new AngelHttpException(null, message: message, statusCode: 401);
+
+  /// Throws a 402 Payment Required error.
+  factory AngelHttpException.paymentRequired(
+      {String message: '402 Payment Required'}) =>
+      new AngelHttpException(null, message: message, statusCode: 402);
+
+  /// Throws a 403 Forbidden error.
+  factory AngelHttpException.forbidden({String message: '403 Forbidden'}) =>
+      new AngelHttpException(null, message: message, statusCode: 403);
+
+  /// Throws a 404 Not Found error.
+  factory AngelHttpException.notFound({String message: '404 Not Found'}) =>
+      new AngelHttpException(null, message: message, statusCode: 404);
+
+  /// Throws a 405 Method Not Allowed error.
+  factory AngelHttpException.methodNotAllowed(
+      {String message: '405 Method Not Allowed'}) =>
+      new AngelHttpException(null, message: message, statusCode: 405);
+
+  /// Throws a 406 Not Acceptable error.
+  factory AngelHttpException.notAcceptable(
+      {String message: '406 Not Acceptable'}) =>
+      new AngelHttpException(null, message: message, statusCode: 406);
+
+  /// Throws a 408 Timeout error.
+  factory AngelHttpException.methodTimeout({String message: '408 Timeout'}) =>
+      new AngelHttpException(null, message: message, statusCode: 408);
+
+  /// Throws a 409 Conflict error.
+  factory AngelHttpException.conflict({String message: '409 Conflict'}) =>
+      new AngelHttpException(null, message: message, statusCode: 409);
+
+  /// Throws a 422 Not Processable error.
+  factory AngelHttpException.notProcessable(
+      {String message: '422 Not Processable'}) =>
+      new AngelHttpException(null, message: message, statusCode: 422);
+
+  /// Throws a 501 Not Implemented error.
+  factory AngelHttpException.notImplemented(
+      {String message: '501 Not Implemented'}) =>
+      new AngelHttpException(null, message: message, statusCode: 501);
+
+  /// Throws a 503 Unavailable error.
+  factory AngelHttpException.unavailable({String message: '503 Unavailable'}) =>
+      new AngelHttpException(null, message: message, statusCode: 503);
+
+  /// Throws a 400 Bad Request error, including an optional arrray of (validation?)
+  /// errors you specify.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.BadRequest(
           {String message: '400 Bad Request', List<String> errors: const []}) =>
       new AngelHttpException(null,
           message: message, errors: errors, statusCode: 400);
 
   /// Throws a 401 Not Authenticated error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.NotAuthenticated(
           {String message: '401 Not Authenticated'}) =>
       new AngelHttpException(null, message: message, statusCode: 401);
 
   /// Throws a 402 Payment Required error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.PaymentRequired(
           {String message: '402 Payment Required'}) =>
       new AngelHttpException(null, message: message, statusCode: 402);
 
   /// Throws a 403 Forbidden error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.Forbidden({String message: '403 Forbidden'}) =>
       new AngelHttpException(null, message: message, statusCode: 403);
 
   /// Throws a 404 Not Found error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.NotFound({String message: '404 Not Found'}) =>
       new AngelHttpException(null, message: message, statusCode: 404);
 
@@ -86,29 +148,35 @@ class AngelHttpException implements Exception {
       new AngelHttpException(null, message: message, statusCode: 405);
 
   /// Throws a 406 Not Acceptable error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.NotAcceptable(
           {String message: '406 Not Acceptable'}) =>
       new AngelHttpException(null, message: message, statusCode: 406);
 
   /// Throws a 408 Timeout error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.MethodTimeout({String message: '408 Timeout'}) =>
       new AngelHttpException(null, message: message, statusCode: 408);
 
   /// Throws a 409 Conflict error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.Conflict({String message: '409 Conflict'}) =>
       new AngelHttpException(null, message: message, statusCode: 409);
 
   /// Throws a 422 Not Processable error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.NotProcessable(
           {String message: '422 Not Processable'}) =>
       new AngelHttpException(null, message: message, statusCode: 422);
 
   /// Throws a 501 Not Implemented error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.NotImplemented(
           {String message: '501 Not Implemented'}) =>
       new AngelHttpException(null, message: message, statusCode: 501);
 
   /// Throws a 503 Unavailable error.
+  @Deprecated('Use lowercase constructor instead')
   factory AngelHttpException.Unavailable({String message: '503 Unavailable'}) =>
       new AngelHttpException(null, message: message, statusCode: 503);
 }
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index d04011b7..9fe76699 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -90,7 +90,13 @@ class Controller {
           return;
         }
 
-        routable.addRoute(exposeDecl.method, exposeDecl.path,
+        String name = exposeDecl.as?.isNotEmpty == true
+            ? exposeDecl.as
+            : MirrorSystem.getName(methodName);
+
+        routeMappings[name] = routable.addRoute(
+            exposeDecl.method,
+            exposeDecl.path,
             handleContained(reflectedMethod, preInject(reflectedMethod)),
             middleware: middleware);
       }
diff --git a/lib/src/http/memory_service.dart b/lib/src/http/memory_service.dart
index 7e68599e..852589bf 100644
--- a/lib/src/http/memory_service.dart
+++ b/lib/src/http/memory_service.dart
@@ -36,8 +36,8 @@ class MemoryService<T> extends Service {
       MemoryModel found = items[desiredId];
       if (found != null) {
         return _makeJson(desiredId, found);
-      } else throw new AngelHttpException.NotFound();
-    } else throw new AngelHttpException.NotFound();
+      } else throw new AngelHttpException.notFound();
+    } else throw new AngelHttpException.notFound();
   }
 
   Future create(data, [Map params]) async {
@@ -63,9 +63,9 @@ class MemoryService<T> extends Service {
         (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
         return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
-        throw new AngelHttpException.BadRequest(message: 'Invalid data.');
+        throw new AngelHttpException.badRequest(message: 'Invalid data.');
       }
-    } else throw new AngelHttpException.NotFound();
+    } else throw new AngelHttpException.notFound();
   }
 
   Future update(id, data, [Map params]) async {
@@ -76,9 +76,9 @@ class MemoryService<T> extends Service {
         (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
         return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
-        throw new AngelHttpException.BadRequest(message: 'Invalid data.');
+        throw new AngelHttpException.badRequest(message: 'Invalid data.');
       }
-    } else throw new AngelHttpException.NotFound();
+    } else throw new AngelHttpException.notFound();
   }
 
   Future remove(id, [Map params]) async {
@@ -87,6 +87,6 @@ class MemoryService<T> extends Service {
       MemoryModel item = items[desiredId];
       items[desiredId] = null;
       return _makeJson(desiredId, item);
-    } else throw new AngelHttpException.NotFound();
+    } else throw new AngelHttpException.notFound();
   }
 }
\ No newline at end of file

From f00705d2d0fa80ac644c01658119dd81b67573d2 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 11 Jan 2017 20:52:06 -0500
Subject: [PATCH 081/414] 42

---
 .idea/workspace.xml          | 30 ++++++++-------
 README.md                    | 20 +++++++++-
 lib/src/http/controller.dart | 74 +++++++++++++++++++-----------------
 lib/src/http/server.dart     |  7 ++--
 pubspec.yaml                 |  2 +-
 5 files changed, 78 insertions(+), 55 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d9596f4e..34d3d406 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/DI_Tests.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/DI_Tests.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/memory_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -62,8 +58,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="175">
-              <caret line="237" column="42" lean-forward="true" selection-start-line="237" selection-start-column="42" selection-end-line="237" selection-end-column="42" />
+            <state relative-caret-position="205">
+              <caret line="239" column="43" lean-forward="false" selection-start-line="239" selection-start-column="43" selection-end-line="239" selection-end-column="43" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
                 <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
@@ -384,7 +380,7 @@
       <workItem from="1481377809918" duration="1319000" />
       <workItem from="1481389675241" duration="158000" />
       <workItem from="1481390924053" duration="19000" />
-      <workItem from="1483149948840" duration="913000" />
+      <workItem from="1483149948840" duration="930000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -421,7 +417,14 @@
       <option name="project" value="LOCAL" />
       <updated>1483150316138</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="I love stack overflows!!!">
+      <created>1483150975010</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1483150975010</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -457,7 +460,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3597000" />
+    <option name="totallyTimeSpent" value="3614000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -479,7 +482,7 @@
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -506,7 +509,8 @@
     <MESSAGE value="Fixed todo" />
     <MESSAGE value="Done???" />
     <MESSAGE value="findExpose" />
-    <option name="LAST_COMMIT_MESSAGE" value="findExpose" />
+    <MESSAGE value="I love stack overflows!!!" />
+    <option name="LAST_COMMIT_MESSAGE" value="I love stack overflows!!!" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -881,8 +885,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="237" column="42" lean-forward="true" selection-start-line="237" selection-start-column="42" selection-end-line="237" selection-end-column="42" />
+        <state relative-caret-position="205">
+          <caret line="239" column="43" lean-forward="false" selection-start-line="239" selection-start-column="43" selection-end-line="239" selection-end-column="43" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
             <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
diff --git a/README.md b/README.md
index 8886dff5..991942ff 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,22 @@
 # angel_framework
 
-[![pub 1.0.0-dev.40](https://img.shields.io/badge/pub-1.0.0--dev.40-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.42](https://img.shields.io/badge/pub-1.0.0--dev.42-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
-Core libraries for the Angel Framework.
\ No newline at end of file
+Core libraries for the Angel Framework.
+
+```dart
+import 'package:angel_framework/angel_framework.dart';
+
+main() async {
+  var app = new Angel();
+
+  app
+    ..get('/hello', (req, res) {
+      res.write('world!');
+    })
+    ..post('/date', () => new DateTime.now().toString());
+
+  await app.startServer();
+}
+```
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 9fe76699..7f2fad0a 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -45,7 +45,6 @@ class Controller {
     }
 
     var routable = new Routable(debug: debug);
-
     app.use(exposeDecl.path, routable);
     TypeMirror typeMirror = reflectType(this.runtimeType);
     String name = exposeDecl.as?.isNotEmpty == true
@@ -79,21 +78,23 @@ class Controller {
 
         var reflectedMethod = instanceMirror.getField(methodName).reflectee;
         var middleware = []..addAll(handlers)..addAll(exposeDecl.middleware);
+        String name = exposeDecl.as?.isNotEmpty == true
+            ? exposeDecl.as
+            : MirrorSystem.getName(methodName);
 
         // Check if normal
         if (method.parameters.length == 2 &&
             method.parameters[0].type.reflectedType == RequestContext &&
             method.parameters[1].type.reflectedType == ResponseContext) {
           // Create a regular route
-          routable.addRoute(exposeDecl.method, exposeDecl.path, reflectedMethod,
-              middleware: middleware);
+          routeMappings[name] = routable
+              .addRoute(exposeDecl.method, exposeDecl.path, (req, res) async {
+            var result = await reflectedMethod(req, res);
+            return result is RequestHandler ? await result(req, res) : result;
+          }, middleware: middleware);
           return;
         }
 
-        String name = exposeDecl.as?.isNotEmpty == true
-            ? exposeDecl.as
-            : MirrorSystem.getName(methodName);
-
         routeMappings[name] = routable.addRoute(
             exposeDecl.method,
             exposeDecl.path,
@@ -119,40 +120,43 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
     List args = [];
 
     void inject(requirement) {
-      for (var requirement in injection.required) {
-        if (requirement == RequestContext) {
-          args.add(req);
-        } else if (requirement == ResponseContext) {
-          args.add(res);
-        } else if (requirement is String) {
-          if (req.params.containsKey(requirement)) {} else if (req.injections
-              .containsKey(requirement))
-            args.add(req.injections[requirement]);
-          else {
-            throw new ArgumentError(
-                "Cannot resolve parameter '$requirement' within handler.");
-          }
+      if (requirement == RequestContext) {
+        args.add(req);
+      } else if (requirement == ResponseContext) {
+        args.add(res);
+      } else if (requirement is String) {
+        if (req.params.containsKey(requirement)) {
           args.add(req.params[requirement]);
-        } else if (requirement is List) {
-          for (var child in requirement) {
-            try {
-              inject(child);
-              break;
-            } catch (e) {
-              rethrow;
-            }
-          }
-        } else if (requirement is Type && requirement != dynamic) {
-          args.add(
-              req.app.container.make(requirement, injecting: req.injections));
-        } else {
+        } else if (req.injections.containsKey(requirement))
+          args.add(req.injections[requirement]);
+        else {
           throw new ArgumentError(
-              '$requirement cannot be injected into a request handler.');
+              "Cannot resolve parameter '$requirement' within handler.");
         }
+      } else if (requirement is List &&
+          requirement.length == 2 &&
+          requirement.first is String &&
+          requirement.last is Type) {
+        String key = requirement.first;
+        Type type = requirement.last;
+
+        if (req.params.containsKey(key) || req.injections.containsKey(key)) {
+          inject(key);
+        } else
+          inject(type);
+      } else if (requirement is Type && requirement != dynamic) {
+        if (req.injections.containsKey(requirement))
+          args.add(req.injections[requirement]);
+        else
+          args.add(req.app.container.make(requirement));
+      } else {
+        throw new ArgumentError(
+            '$requirement cannot be injected into a request handler.');
       }
     }
 
     injection.required.forEach(inject);
-    return Function.apply(handler, args);
+    var result = Function.apply(handler, args);
+    return result is Future ? await result : result;
   };
 }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 23ce0063..458fc145 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -321,10 +321,9 @@ class Angel extends AngelBase {
   /// Runs with DI, and *always* reflects. Prefer [runContained].
   Future runReflected(
       Function handler, RequestContext req, ResponseContext res) async {
-    var injection = preInjection(handler);
-
-    _preContained[handler] = injection;
-    return handleContained(handler, injection);
+    var h =
+        handleContained(handler, _preContained[handler] = preInject(handler));
+    return await h(req, res);
     // return await closureMirror.apply(args).reflectee;
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 106f1b64..1bb182a8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.41
+version: 1.0.0-dev.42
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 466b05c347dccf0b238062ad3c24ab324d60a8b1 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 13 Jan 2017 19:36:38 -0500
Subject: [PATCH 082/414] waterfall

---
 README.md                  |  2 +-
 lib/src/http/routable.dart | 20 ++++++++++++++++++++
 pubspec.yaml               |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 991942ff..c26c18c6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.42](https://img.shields.io/badge/pub-1.0.0--dev.42-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.43](https://img.shields.io/badge/pub-1.0.0--dev.43-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 7206d878..493099b1 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -19,6 +19,26 @@ typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 /// A function that receives an incoming [RequestContext] and responds to it.
 typedef Future RequestHandler(RequestContext req, ResponseContext res);
 
+/// Sequentially runs a list of [handlers] of middleware, and breaks if any does not
+/// return `true`. Works well with [Router].chain.
+RequestMiddleware waterfall(List handlers) {
+  for (var handler in handlers) {
+    if (handler is! RequestMiddleware && handler is! RequestHandler)
+      throw new ArgumentError(
+          '`waterfall` only accepts middleware and handlers. $handler is not a valid option.');
+  }
+
+  return (req, res) async {
+    for (var handler in handlers) {
+      var result = await handler(req, res);
+
+      if (result != true) return result;
+    }
+
+    return true;
+  };
+}
+
 /// A routable server that can handle dynamic requests.
 class Routable extends Router {
   final Map<Pattern, Controller> _controllers = {};
diff --git a/pubspec.yaml b/pubspec.yaml
index 1bb182a8..6da03e3f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.42
+version: 1.0.0-dev.43
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 78865227d106549c86c0bfa17969c4f438b9134a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 14 Jan 2017 08:53:38 -0500
Subject: [PATCH 083/414] 44

---
 README.md                         | 2 +-
 lib/src/http/angel_base.dart      | 4 ++++
 lib/src/http/request_context.dart | 4 +++-
 pubspec.yaml                      | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c26c18c6..feeb1982 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.43](https://img.shields.io/badge/pub-1.0.0--dev.43-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.44](https://img.shields.io/badge/pub-1.0.0--dev.44-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index f1d95084..8bd3f67b 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -13,6 +13,10 @@ class AngelBase extends Routable {
 
   Container _container = new Container();
 
+  /// When set to true, the original body bytes will be stored
+  /// on requests. `false` by default.
+  bool storeOriginalBuffer = false;
+
   /// A [Container] used to inject dependencies.
   Container get container => _container;
 
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 66ed9127..47680402 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -87,7 +87,9 @@ class RequestContext extends Extensible {
         .replaceAll(new RegExp(r'/+$'), '');
     ctx._io = request;
 
-    ctx._body = (await parseBody(request)) ?? {};
+    ctx._body = (await parseBody(request,
+            storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
+        {};
 
     return ctx;
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 6da03e3f..097ffe77 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.43
+version: 1.0.0-dev.44
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 4ad4180f2275562600113b503f0044d108461afb Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 14 Jan 2017 08:56:14 -0500
Subject: [PATCH 084/414] 45

---
 README.md                         | 2 +-
 lib/src/http/request_context.dart | 3 +++
 pubspec.yaml                      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index feeb1982..fa04b8c1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.44](https://img.shields.io/badge/pub-1.0.0--dev.44-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.45](https://img.shields.io/badge/pub-1.0.0--dev.45-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 47680402..0050eadd 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -46,6 +46,9 @@ class RequestContext extends Extensible {
   /// Any and all files sent to the server with this request.
   List<FileUploadInfo> get files => _body.files;
 
+  /// The original body bytes sent with this request. May be empty.
+  List<int> get originalBuffer => _body.originalBuffer ?? [];
+
   /// The URL parameters extracted from the request URI.
   Map params = {};
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 097ffe77..2dca254b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.44
+version: 1.0.0-dev.45
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 462c4f4a796a4435a8969084699dead7265697c5 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 14 Jan 2017 10:39:11 -0500
Subject: [PATCH 085/414] Better errors

---
 README.md                |   2 +-
 lib/src/http/server.dart | 152 ++++++++++++++++++++-------------------
 pubspec.yaml             |   2 +-
 3 files changed, 80 insertions(+), 76 deletions(-)

diff --git a/README.md b/README.md
index fa04b8c1..0b83171b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.45](https://img.shields.io/badge/pub-1.0.0--dev.45-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.46](https://img.shields.io/badge/pub-1.0.0--dev.46-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 458fc145..1a54a982 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -190,98 +190,105 @@ class Angel extends AngelBase {
   }
 
   Future handleRequest(HttpRequest request) async {
-    _beforeProcessed.add(request);
+    try {
+      _beforeProcessed.add(request);
 
-    final req = await RequestContext.from(request, this);
-    final res = new ResponseContext(request.response, this);
-    String requestedUrl = request.uri.path.replaceAll(_straySlashes, '');
+      final req = await RequestContext.from(request, this);
+      final res = new ResponseContext(request.response, this);
+      String requestedUrl = request.uri.path.replaceAll(_straySlashes, '');
 
-    if (requestedUrl.isEmpty) requestedUrl = '/';
+      if (requestedUrl.isEmpty) requestedUrl = '/';
 
-    final resolved =
-        resolveAll(requestedUrl, requestedUrl, method: request.method);
+      final resolved =
+          resolveAll(requestedUrl, requestedUrl, method: request.method);
 
-    for (final result in resolved) req.params.addAll(result.allParams);
+      for (final result in resolved) req.params.addAll(result.allParams);
 
-    if (resolved.isNotEmpty) {
-      final route = resolved.first.route;
-      req.inject(Match, route.match(requestedUrl));
-    }
+      if (resolved.isNotEmpty) {
+        final route = resolved.first.route;
+        req.inject(Match, route.match(requestedUrl));
+      }
 
-    final m = new MiddlewarePipeline(resolved);
-    req.inject(MiddlewarePipeline, m);
+      final m = new MiddlewarePipeline(resolved);
+      req.inject(MiddlewarePipeline, m);
 
-    final pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
+      final pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
 
-    _printDebug('Handler sequence on $requestedUrl: $pipeline');
+      _printDebug('Handler sequence on $requestedUrl: $pipeline');
 
-    for (final handler in pipeline) {
-      try {
-        _printDebug('Executing handler: $handler');
-        final result = await executeHandler(handler, req, res);
-        _printDebug('Result: $result');
+      for (final handler in pipeline) {
+        try {
+          _printDebug('Executing handler: $handler');
+          final result = await executeHandler(handler, req, res);
+          _printDebug('Result: $result');
 
-        if (!result) {
-          _printDebug('Last executed handler: $handler');
-          break;
-        } else {
-          _printDebug(
-              'Handler completed successfully, did not terminate response: $handler');
-        }
-      } catch (e, st) {
-        _printDebug('Caught error in handler $handler: $e');
-        _printDebug(st);
+          if (!result) {
+            _printDebug('Last executed handler: $handler');
+            break;
+          } else {
+            _printDebug(
+                'Handler completed successfully, did not terminate response: $handler');
+          }
+        } catch (e, st) {
+          _printDebug('Caught error in handler $handler: $e');
+          _printDebug(st);
 
-        if (e is AngelHttpException) {
-          // Special handling for AngelHttpExceptions :)
-          try {
-            res.statusCode = e.statusCode;
-            List<String> accept =
-                request.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
-            if (accept.isEmpty ||
-                accept.contains('*/*') ||
-                accept.contains(ContentType.JSON.mimeType) ||
-                accept.contains("application/javascript")) {
-              res.serialize(e.toMap());
-            } else {
-              await _errorHandler(e, req, res);
+          if (e is AngelHttpException) {
+            // Special handling for AngelHttpExceptions :)
+            try {
+              res.statusCode = e.statusCode;
+              List<String> accept =
+                  request.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
+              if (accept.isEmpty ||
+                  accept.contains('*/*') ||
+                  accept.contains(ContentType.JSON.mimeType) ||
+                  accept.contains("application/javascript")) {
+                res.serialize(e.toMap());
+              } else {
+                await _errorHandler(e, req, res);
+              }
+              // _finalizeResponse(request, res);
+            } catch (e, st) {
+              _fatalErrorStream.add(
+                  new AngelFatalError(request: request, error: e, stack: st));
             }
-            // _finalizeResponse(request, res);
-          } catch (e, st) {
+          } else {
             _fatalErrorStream.add(
                 new AngelFatalError(request: request, error: e, stack: st));
           }
-        } else {
-          _fatalErrorStream
-              .add(new AngelFatalError(request: request, error: e, stack: st));
-        }
 
-        break;
+          break;
+        }
       }
-    }
 
-    try {
-      _afterProcessed.add(request);
+      try {
+        _afterProcessed.add(request);
 
-      if (!res.willCloseItself) {
-        for (var finalizer in responseFinalizers) {
-          await finalizer(req, res);
+        if (!res.willCloseItself) {
+          for (var finalizer in responseFinalizers) {
+            await finalizer(req, res);
+          }
+
+          for (var key in res.headers.keys) {
+            request.response.headers.set(key, res.headers[key]);
+          }
+
+          request.response.headers.chunkedTransferEncoding =
+              res.chunked ?? true;
+
+          request.response
+            ..statusCode = res.statusCode
+            ..cookies.addAll(res.cookies)
+            ..add(res.buffer.takeBytes());
+          await request.response.close();
         }
-
-        for (var key in res.headers.keys) {
-          request.response.headers.set(key, res.headers[key]);
-        }
-
-        request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
-
-        request.response
-          ..statusCode = res.statusCode
-          ..cookies.addAll(res.cookies)
-          ..add(res.buffer.takeBytes());
-        await request.response.close();
+      } catch (e, st) {
+        _fatalErrorStream
+            .add(new AngelFatalError(request: request, error: e, stack: st));
       }
-    } catch (e) {
-      failSilently(request, res);
+    } catch (e, st) {
+      _fatalErrorStream
+          .add(new AngelFatalError(request: request, error: e, stack: st));
     }
   }
 
@@ -335,9 +342,6 @@ class Angel extends AngelBase {
       _onController.add(controllers[configurer.findExpose().path] = configurer);
   }
 
-  /// Fallback when an error is thrown while handling a request.
-  void failSilently(HttpRequest request, ResponseContext res) {}
-
   /// Starts the server, wrapped in a [runZoned] call.
   void listen({InternetAddress address, int port: 3000}) {
     runZoned(() async {
diff --git a/pubspec.yaml b/pubspec.yaml
index 2dca254b..c1619e2a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.45
+version: 1.0.0-dev.46
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From eb1e931b89638e063898c4737e175a1159c22d12 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 15 Jan 2017 14:52:14 -0500
Subject: [PATCH 086/414] 47

---
 .idea/libraries/Dart_Packages.xml  |  60 ++++----
 .idea/workspace.xml                | 236 +++++++++++++++--------------
 README.md                          |   2 +-
 lib/src/http/controller.dart       |  26 +++-
 lib/src/http/response_context.dart |   6 +-
 lib/src/http/server.dart           |   5 +
 pubspec.yaml                       |   2 +-
 7 files changed, 185 insertions(+), 152 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 36d08e55..11a357af 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,14 +5,14 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+16/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0/lib" />
             </list>
           </value>
         </entry>
@@ -40,7 +40,7 @@
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+5/lib" />
             </list>
           </value>
         </entry>
@@ -61,7 +61,7 @@
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.13.0/lib" />
             </list>
           </value>
         </entry>
@@ -103,7 +103,7 @@
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
             </list>
           </value>
         </entry>
@@ -124,7 +124,7 @@
         <entry key="http_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
             </list>
           </value>
         </entry>
@@ -145,14 +145,7 @@
         <entry key="json_god">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="json_schema">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
             </list>
           </value>
         </entry>
@@ -208,7 +201,7 @@
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
             </list>
           </value>
         </entry>
@@ -236,7 +229,7 @@
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
             </list>
           </value>
         </entry>
@@ -264,21 +257,21 @@
         <entry key="source_map_stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.1+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_span">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.1/lib" />
             </list>
           </value>
         </entry>
@@ -306,7 +299,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.16/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.18+1/lib" />
             </list>
           </value>
         </entry>
@@ -348,28 +341,27 @@
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0-dev+16/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.9.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.13.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_schema-1.0.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
@@ -377,21 +369,21 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.1+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.16/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.18+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 34d3d406..721e5e7e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -38,8 +39,8 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="208" column="26" lean-forward="true" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
+            <state relative-caret-position="3000">
+              <caret line="208" column="26" lean-forward="false" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
               <folding />
             </state>
           </provider>
@@ -48,22 +49,19 @@
       <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="474">
-              <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+            <state relative-caret-position="150">
+              <caret line="90" column="46" lean-forward="true" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="205">
-              <caret line="239" column="43" lean-forward="false" selection-start-line="239" selection-start-column="43" selection-end-line="239" selection-end-column="43" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-                <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
-              </folding>
+            <state relative-caret-position="150">
+              <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -71,15 +69,9 @@
       <file leaf-file-name="memory_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="444">
-              <caret line="74" column="26" lean-forward="true" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
-              <folding>
-                <marker date="1483150602000" expanded="true" signature="331:2888" ph="{...}" />
-                <marker date="1483150602000" expanded="true" signature="889:1201" ph="{...}" />
-                <marker date="1483150602000" expanded="true" signature="1605:2124" ph="{...}" />
-                <marker date="1483150602000" expanded="true" signature="2172:2586" ph="{...}" />
-                <marker date="1483150602000" expanded="true" signature="2628:2886" ph="{...}" />
-              </folding>
+            <state relative-caret-position="1020">
+              <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -107,7 +99,7 @@
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="385">
+            <state relative-caret-position="960">
               <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
@@ -119,9 +111,11 @@
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="86" column="35" lean-forward="true" selection-start-line="86" selection-start-column="35" selection-end-line="86" selection-end-column="35" />
-              <folding />
+            <state relative-caret-position="1215">
+              <caret line="88" column="35" lean-forward="false" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
+              <folding>
+                <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -158,7 +152,6 @@
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
@@ -166,6 +159,7 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
       </list>
     </option>
   </component>
@@ -177,7 +171,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="324" />
-    <option name="y" value="73" />
+    <option name="y" value="70" />
     <option name="width" value="1486" />
     <option name="height" value="909" />
   </component>
@@ -199,8 +193,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -283,6 +275,8 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -381,6 +375,7 @@
       <workItem from="1481389675241" duration="158000" />
       <workItem from="1481390924053" duration="19000" />
       <workItem from="1483149948840" duration="930000" />
+      <workItem from="1484451782119" duration="617000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -460,7 +455,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3614000" />
+    <option name="totallyTimeSpent" value="4231000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -472,29 +467,29 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="324" y="73" width="1486" height="909" extended-state="0" />
+    <frame x="324" y="70" width="1486" height="909" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2122867" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32791328" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -517,11 +512,36 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3120">
+          <caret line="208" column="26" lean-forward="true" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1155">
+          <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -529,7 +549,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
           <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -546,7 +565,6 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="75">
             <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
@@ -566,7 +584,7 @@
           <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
-            <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
+            <marker date="1484408336000" expanded="true" signature="14805:14807" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -609,7 +627,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding />
+          <folding>
+            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -617,7 +637,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
           <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -643,7 +662,7 @@
           <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
-            <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
+            <marker date="1484408336000" expanded="true" signature="14805:14807" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -693,7 +712,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding />
+          <folding>
+            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -730,7 +751,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+          <folding>
+            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -738,7 +761,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
           <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -764,20 +786,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="16" lean-forward="true" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="75">
             <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
@@ -795,7 +808,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -809,6 +821,41 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3000">
+          <caret line="208" column="26" lean-forward="false" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2865">
+          <caret line="260" column="9" lean-forward="true" selection-start-line="260" selection-start-column="9" selection-end-line="260" selection-end-column="9" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+            <marker date="1484408336000" expanded="true" signature="14805:14807" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1020">
+          <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1275">
+          <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -817,6 +864,26 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="960">
+          <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1215">
+          <caret line="88" column="35" lean-forward="false" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
+          <folding>
+            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -827,72 +894,21 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="208" column="26" lean-forward="true" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="474">
-          <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+        <state relative-caret-position="150">
+          <caret line="90" column="46" lean-forward="true" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="444">
-          <caret line="74" column="26" lean-forward="true" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
-          <folding>
-            <marker date="1483150602000" expanded="true" signature="331:2888" ph="{...}" />
-            <marker date="1483150602000" expanded="true" signature="889:1201" ph="{...}" />
-            <marker date="1483150602000" expanded="true" signature="1605:2124" ph="{...}" />
-            <marker date="1483150602000" expanded="true" signature="2172:2586" ph="{...}" />
-            <marker date="1483150602000" expanded="true" signature="2628:2886" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="385">
-          <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="86" column="35" lean-forward="true" selection-start-line="86" selection-start-column="35" selection-end-line="86" selection-end-column="35" />
+        <state relative-caret-position="150">
+          <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="239" column="43" lean-forward="false" selection-start-line="239" selection-start-column="43" selection-end-line="239" selection-end-column="43" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-            <marker date="1483149636000" expanded="true" signature="14571:14573" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 0b83171b..276b7ea6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.46](https://img.shields.io/badge/pub-1.0.0--dev.46-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.47](https://img.shields.io/badge/pub-1.0.0--dev.47-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 7f2fad0a..d0f0f401 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -19,6 +19,9 @@ import 'server.dart' show Angel, preInject;
 class InjectionRequest {
   /// A list of the data required for a DI-enabled method to run.
   final List required = [];
+
+  /// A list of the data that can be null in a DI-enabled method.
+  final List optional = [];
 }
 
 /// Supports grouping routes with shared functionality.
@@ -95,10 +98,13 @@ class Controller {
           return;
         }
 
-        routeMappings[name] = routable.addRoute(
-            exposeDecl.method,
-            exposeDecl.path,
-            handleContained(reflectedMethod, preInject(reflectedMethod)),
+        var injection = preInject(reflectedMethod);
+
+        if (exposeDecl?.allowNull?.isNotEmpty == true)
+          injection.optional?.addAll(exposeDecl.allowNull);
+
+        routeMappings[name] = routable.addRoute(exposeDecl.method,
+            exposeDecl.path, handleContained(reflectedMethod, injection),
             middleware: middleware);
       }
     };
@@ -114,6 +120,16 @@ class Controller {
       .firstWhere((r) => r is Expose, orElse: () => null);
 }
 
+/// Shortcut for calling [preInject], and then [handleContained].
+/// 
+/// Use this to instantly create a request handler for a DI-enabled method.
+RequestHandler createDynamicHandler(handler,
+    {Iterable<String> optional: const []}) {
+  var injection = preInject(handler);
+  injection.optional.addAll(optional ?? []);
+  return handleContained(handler, injection);
+}
+
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(handler, InjectionRequest injection) {
   return (RequestContext req, ResponseContext res) async {
@@ -129,6 +145,8 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
           args.add(req.params[requirement]);
         } else if (req.injections.containsKey(requirement))
           args.add(req.injections[requirement]);
+        else if (injection.optional.contains(requirement))
+          args.add(null);
         else {
           throw new ArgumentError(
               "Cannot resolve parameter '$requirement' within handler.");
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 17682c55..933b9f13 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -32,7 +32,7 @@ class ResponseContext extends Extensible {
   final List<Cookie> cookies = [];
 
   /// Headers that will be sent to the user.
-  final Map<String, String> headers = {};
+  final Map<String, String> headers = {HttpHeaders.SERVER: 'angel'};
 
   /// Serializes response data into a String.
   ///
@@ -230,7 +230,9 @@ class ResponseContext extends Extensible {
   ///
   /// [contentType] can be either a [String], or a [ContentType].
   void serialize(value, {contentType}) {
-    write(serializer(value));
+    var text = serializer(value);
+    write(text);
+    headers[HttpHeaders.CONTENT_LENGTH] = text.length.toString();
 
     if (contentType is String)
       headers[HttpHeaders.CONTENT_TYPE] = contentType;
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 1a54a982..3656276c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -302,6 +302,10 @@ class Angel extends AngelBase {
     }
 
     void _walk(Router router) {
+      if (router is Angel) {
+        router..before.forEach(_add)..after.forEach(_add);
+      }
+
       router.requestMiddleware.forEach((k, v) => _add(v));
       router.middleware.forEach(_add);
       router.routes
@@ -365,6 +369,7 @@ class Angel extends AngelBase {
 
     if (routable is Angel) {
       _children.add(routable.._parent = this);
+      _preContained.addAll(routable._preContained);
 
       if (routable.before.isNotEmpty) {
         all(path, (req, res) {
diff --git a/pubspec.yaml b/pubspec.yaml
index c1619e2a..8a3becd1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.46
+version: 1.0.0-dev.47
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 929e7bbac616d3a2279ee9eccdf8d719fd3b02c2 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 20 Jan 2017 17:11:20 -0500
Subject: [PATCH 087/414] 48

---
 README.md                          |   2 +-
 lib/src/http/controller.dart       |  32 +++++-
 lib/src/http/hooked_service.dart   | 176 +++++++++++++++++++++++------
 lib/src/http/request_context.dart  |  18 +++
 lib/src/http/response_context.dart |   4 +-
 lib/src/http/server.dart           |  45 +++++---
 pubspec.yaml                       |   2 +-
 test/di_test.dart                  |   2 +-
 8 files changed, 219 insertions(+), 62 deletions(-)

diff --git a/README.md b/README.md
index 276b7ea6..b5a5c7cf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.47](https://img.shields.io/badge/pub-1.0.0--dev.47-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.48](https://img.shields.io/badge/pub-1.0.0--dev.48-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index d0f0f401..36149027 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -17,11 +17,14 @@ import 'server.dart' show Angel, preInject;
 /// Regular request handlers can also skip DI entirely, lowering response time
 /// and memory use.
 class InjectionRequest {
-  /// A list of the data required for a DI-enabled method to run.
+  /// Optional, typed data that can be passed to a DI-enabled method.
+  Map<String, Type> named = {};
+
+  /// A list of the arguments required for a DI-enabled method to run.
   final List required = [];
 
-  /// A list of the data that can be null in a DI-enabled method.
-  final List optional = [];
+  /// A list of the arguments that can be null in a DI-enabled method.
+  final List<String> optional = [];
 }
 
 /// Supports grouping routes with shared functionality.
@@ -121,7 +124,7 @@ class Controller {
 }
 
 /// Shortcut for calling [preInject], and then [handleContained].
-/// 
+///
 /// Use this to instantly create a request handler for a DI-enabled method.
 RequestHandler createDynamicHandler(handler,
     {Iterable<String> optional: const []}) {
@@ -173,8 +176,27 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
       }
     }
 
+    Map<Symbol, dynamic> named = {};
     injection.required.forEach(inject);
-    var result = Function.apply(handler, args);
+
+    injection.named.forEach((k, v) {
+      var name = new Symbol(k);
+      if (req.params.containsKey(k))
+        named[name] = v;
+      else if (req.injections.containsKey(k))
+        named[name] = v;
+      else if (req.injections.containsKey(v) && v != dynamic)
+        named[name] = v;
+      else {
+        try {
+          named[name] = req.app.container.make(v);
+        } catch (e) {
+          named[name] = null;
+        }
+      }
+    });
+
+    var result = Function.apply(handler, args, named);
     return result is Future ? await result : result;
   };
 }
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 2e5eccdb..febd3246 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -3,6 +3,8 @@ library angel_framework.http;
 import 'dart:async';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
+import 'request_context.dart';
+import 'response_context.dart';
 import 'metadata.dart';
 import 'service.dart';
 
@@ -39,6 +41,14 @@ class HookedService extends Service {
     if (inner.app != null) this.app = inner.app;
   }
 
+  Map _stripReq(Map params) {
+    if (params == null)
+      return params;
+    else
+      return params..remove('__requestctx')..remove('__responsectx');
+  }
+
+  /// Adds hooks to this instance.
   void addHooks() {
     Hooks hooks = getAnnotation(inner, Hooks);
     final before = [];
@@ -74,6 +84,7 @@ class HookedService extends Service {
     applyListeners(inner.removed, afterRemoved, true);
   }
 
+  /// Adds routes to this instance.
   @override
   void addRoutes() {
     // Set up our routes. We still need to copy middleware from inner service
@@ -87,7 +98,11 @@ class HookedService extends Service {
 
     Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
     get('/', (req, res) async {
-      return await this.index(mergeMap([req.query, restProvider]));
+      return await this.index(mergeMap([
+        req.query,
+        restProvider,
+        {'__requestctx': req, '__responsectx': res}
+      ]));
     },
         middleware: []
           ..addAll(handlers)
@@ -96,8 +111,13 @@ class HookedService extends Service {
     Middleware createMiddleware = getAnnotation(inner.create, Middleware);
     post(
         '/',
-        (req, res) async =>
-            await this.create(req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.create(
+            req.body,
+            mergeMap([
+              req.query,
+              restProvider,
+              {'__requestctx': req, '__responsectx': res}
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -107,8 +127,13 @@ class HookedService extends Service {
 
     get(
         '/:id',
-        (req, res) async => await this
-            .read(req.params['id'], mergeMap([req.query, restProvider])),
+        (req, res) async => await this.read(
+            req.params['id'],
+            mergeMap([
+              req.query,
+              restProvider,
+              {'__requestctx': req, '__responsectx': res}
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -117,7 +142,13 @@ class HookedService extends Service {
     patch(
         '/:id',
         (req, res) async => await this.modify(
-            req.params['id'], req.body, mergeMap([req.query, restProvider])),
+            req.params['id'],
+            req.body,
+            mergeMap([
+              req.query,
+              restProvider,
+              {'__requestctx': req, '__responsectx': res}
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -127,7 +158,13 @@ class HookedService extends Service {
     post(
         '/:id',
         (req, res) async => await this.update(
-            req.params['id'], req.body, mergeMap([req.query, restProvider])),
+            req.params['id'],
+            req.body,
+            mergeMap([
+              req.query,
+              restProvider,
+              {'__requestctx': req, '__responsectx': res}
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -136,8 +173,13 @@ class HookedService extends Service {
     Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
     delete(
         '/:id',
-        (req, res) async => await this
-            .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        (req, res) async => await this.remove(
+            req.params['id'],
+            mergeMap([
+              req.query,
+              restProvider,
+              {'__requestctx': req, '__responsectx': res}
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -147,123 +189,180 @@ class HookedService extends Service {
   }
 
   @override
-  Future<List> index([Map params]) async {
+  Future<List> index([Map _params]) async {
+    var params = _stripReq(_params);
     HookedServiceEvent before = await beforeIndexed._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.INDEXED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.INDEXED,
             params: params));
     if (before._canceled) {
       HookedServiceEvent after = await beforeIndexed._emit(
-          new HookedServiceEvent._base(inner, HookedServiceEvent.INDEXED,
+          new HookedServiceEvent._base(_params['__requestctx'],
+              params['__responsectx'], inner, HookedServiceEvent.INDEXED,
               params: params, result: before.result));
       return after.result;
     }
 
     List result = await inner.index(params);
     HookedServiceEvent after = await afterIndexed._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.INDEXED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.INDEXED,
             params: params, result: result));
     return after.result;
   }
 
   @override
-  Future read(id, [Map params]) async {
+  Future read(id, [Map _params]) async {
+    var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRead._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.READ,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.READ,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRead._emit(
-          new HookedServiceEvent._base(inner, HookedServiceEvent.READ,
+          new HookedServiceEvent._base(_params['__requestctx'],
+              params['__responsectx'], inner, HookedServiceEvent.READ,
               id: id, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.read(id, params);
     HookedServiceEvent after = await afterRead._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.READ,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.READ,
             id: id, params: params, result: result));
     return after.result;
   }
 
   @override
-  Future create(data, [Map params]) async {
+  Future create(data, [Map _params]) async {
+    var params = _stripReq(_params);
     HookedServiceEvent before = await beforeCreated._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.CREATED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.CREATED,
             data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterCreated._emit(
-          new HookedServiceEvent._base(inner, HookedServiceEvent.CREATED,
+          new HookedServiceEvent._base(_params['__requestctx'],
+              params['__responsectx'], inner, HookedServiceEvent.CREATED,
               data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.create(data, params);
     HookedServiceEvent after = await afterCreated._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.CREATED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.CREATED,
             data: data, params: params, result: result));
     return after.result;
   }
 
   @override
-  Future modify(id, data, [Map params]) async {
+  Future modify(id, data, [Map _params]) async {
+    var params = _stripReq(_params);
     HookedServiceEvent before = await beforeModified._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.MODIFIED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.MODIFIED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterModified._emit(
-          new HookedServiceEvent._base(inner, HookedServiceEvent.MODIFIED,
+          new HookedServiceEvent._base(_params['__requestctx'],
+              params['__responsectx'], inner, HookedServiceEvent.MODIFIED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.modify(id, data, params);
     HookedServiceEvent after = await afterModified._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.MODIFIED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.MODIFIED,
             id: id, data: data, params: params, result: result));
     return after.result;
   }
 
   @override
-  Future update(id, data, [Map params]) async {
+  Future update(id, data, [Map _params]) async {
+    var params = _stripReq(_params);
     HookedServiceEvent before = await beforeUpdated._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.UPDATED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.UPDATED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterUpdated._emit(
-          new HookedServiceEvent._base(inner, HookedServiceEvent.UPDATED,
+          new HookedServiceEvent._base(_params['__requestctx'],
+              params['__responsectx'], inner, HookedServiceEvent.UPDATED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.update(id, data, params);
     HookedServiceEvent after = await afterUpdated._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.UPDATED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.UPDATED,
             id: id, data: data, params: params, result: result));
     return after.result;
   }
 
   @override
-  Future remove(id, [Map params]) async {
+  Future remove(id, [Map _params]) async {
+    var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRemoved._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.REMOVED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.REMOVED,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRemoved._emit(
-          new HookedServiceEvent._base(inner, HookedServiceEvent.REMOVED,
+          new HookedServiceEvent._base(_params['__requestctx'],
+              params['__responsectx'], inner, HookedServiceEvent.REMOVED,
               id: id, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.remove(id, params);
     HookedServiceEvent after = await afterRemoved._emit(
-        new HookedServiceEvent._base(inner, HookedServiceEvent.REMOVED,
+        new HookedServiceEvent._base(_params['__requestctx'],
+            params['__responsectx'], inner, HookedServiceEvent.REMOVED,
             id: id, params: params, result: result));
     return after.result;
   }
+
+  /// Fires an `after` event. This will not be propagated to clients,
+  /// but will be broadcasted to WebSockets, etc.
+  Future<HookedServiceEvent> fire(String eventName, result, [HookedServiceEventListener callback]) async {
+    HookedServiceEventDispatcher dispatcher;
+
+    switch (eventName) {
+      case HookedServiceEvent.INDEXED:
+        dispatcher = afterIndexed;
+        break;
+      case HookedServiceEvent.READ:
+        dispatcher = afterRead;
+        break;
+      case HookedServiceEvent.CREATED:
+        dispatcher = afterCreated;
+        break;
+      case HookedServiceEvent.MODIFIED:
+        dispatcher = afterModified;
+        break;
+      case HookedServiceEvent.UPDATED:
+        dispatcher = afterUpdated;
+        break;
+      case HookedServiceEvent.REMOVED:
+        dispatcher = afterRemoved;
+        break;
+      default:
+        throw new ArgumentError("Invalid service event name: '$eventName'");
+    }
+
+    var ev = new HookedServiceEvent._base(null, null, this, eventName);
+    if (callback != null) await callback(ev);
+    return await dispatcher._emit(ev);
+  }
 }
 
 /// Fired when a hooked service is invoked.
@@ -287,6 +386,8 @@ class HookedServiceEvent {
   var data;
   Map _params;
   var _result;
+  RequestContext _request;
+  ResponseContext _response;
 
   String get eventName => _eventName;
 
@@ -294,12 +395,17 @@ class HookedServiceEvent {
 
   Map get params => _params;
 
+  RequestContext get request => _request;
+
+  ResponseContext get response => _response;
+
   get result => _result;
 
   /// The inner service whose method was hooked.
   Service service;
 
-  HookedServiceEvent._base(Service this.service, String this._eventName,
+  HookedServiceEvent._base(this._result, this._response, Service this.service,
+      String this._eventName,
       {id, this.data, Map params, result}) {
     _id = id;
     _params = params ?? {};
@@ -308,7 +414,7 @@ class HookedServiceEvent {
 }
 
 /// Triggered on a hooked service event.
-typedef Future HookedServiceEventListener(HookedServiceEvent event);
+typedef HookedServiceEventListener(HookedServiceEvent event);
 
 /// Can be listened to, but events may be canceled.
 class HookedServiceEventDispatcher {
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 0050eadd..8dc08c83 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -97,6 +97,24 @@ class RequestContext extends Extensible {
     return ctx;
   }
 
+  /// Grabs an object by key or type from [params], [injections], or
+  /// [app].container. Use this to perform dependency injection
+  /// within a service hook.
+  grab(key) {
+    if (params.containsKey(key))
+      return params[key];
+    else if (injections.containsKey(key))
+      return injections[key];
+    else if (key is Type) {
+      try {
+        return app.container.make(key);
+      } catch (e) {
+        return null;
+      }
+    } else
+      return null;
+  }
+
   void inject(type, value) {
     injections[type] = value;
   }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 933b9f13..1af81498 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -116,7 +116,6 @@ class ResponseContext extends Extensible {
   }
 
   /// Serializes JSON to the response.
-  @Deprecated('Please use `serialize` instead.')
   void json(value) => serialize(value, contentType: ContentType.JSON);
 
   /// Returns a JSONP response.
@@ -232,8 +231,7 @@ class ResponseContext extends Extensible {
   void serialize(value, {contentType}) {
     var text = serializer(value);
     write(text);
-    headers[HttpHeaders.CONTENT_LENGTH] = text.length.toString();
-
+    
     if (contentType is String)
       headers[HttpHeaders.CONTENT_TYPE] = contentType;
     else if (contentType is ContentType) this.contentType = contentType;
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 3656276c..f10f0df3 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -132,12 +132,11 @@ class Angel extends AngelBase {
 
   /// Loads some base dependencies into the service container.
   void bootstrapContainer() {
+    if (runtimeType != Angel) container.singleton(this, as: Angel);
     container.singleton(this, as: AngelBase);
     container.singleton(this, as: Routable);
     container.singleton(this, as: Router);
     container.singleton(this);
-
-    if (runtimeType != Angel) container.singleton(this, as: Angel);
   }
 
   Future<bool> executeHandler(
@@ -189,6 +188,7 @@ class Angel extends AngelBase {
     return false;
   }
 
+  /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
     try {
       _beforeProcessed.add(request);
@@ -270,11 +270,12 @@ class Angel extends AngelBase {
           }
 
           for (var key in res.headers.keys) {
-            request.response.headers.set(key, res.headers[key]);
+            request.response.headers.add(key, res.headers[key]);
           }
 
-          request.response.headers.chunkedTransferEncoding =
-              res.chunked ?? true;
+          request.response.headers
+            ..chunkedTransferEncoding = res.chunked ?? true
+            ..set(HttpHeaders.CONTENT_LENGTH, res.buffer.length);
 
           request.response
             ..statusCode = res.statusCode
@@ -417,17 +418,23 @@ class Angel extends AngelBase {
     _errorHandler = handler;
   }
 
-  Angel({bool debug: false}) : super(debug: debug) {
+  /// Default constructor. ;)
+  Angel({bool debug: false}) : super(debug: debug == true) {
     bootstrapContainer();
   }
 
+  /// An instance mounted on a server started by the [serverGenerator].
+  factory Angel.custom(ServerGenerator serverGenerator, {bool debug: false}) =>
+      new Angel(debug: debug == true).._serverGenerator = serverGenerator;
+
   /// Creates an HTTPS server.
+  ///
   /// Provide paths to a certificate chain and server key (both .pem).
   /// If no password is provided, a random one will be generated upon running
   /// the server.
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
       {bool debug: false, String password}) {
-    final app = new Angel(debug: debug);
+    final app = new Angel(debug: debug == true);
 
     app._serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
@@ -455,16 +462,22 @@ InjectionRequest preInject(Function handler) {
     var name = MirrorSystem.getName(parameter.simpleName);
     var type = parameter.type.reflectedType;
 
-    if (type == RequestContext || type == ResponseContext) {
-      injection.required.add(type);
-    } else if (name == 'req') {
-      injection.required.add(RequestContext);
-    } else if (name == 'res') {
-      injection.required.add(ResponseContext);
-    } else if (type == dynamic) {
-      injection.required.add(name);
+    if (!parameter.isNamed) {
+      if (parameter.isOptional) injection.optional.add(name);
+
+      if (type == RequestContext || type == ResponseContext) {
+        injection.required.add(type);
+      } else if (name == 'req') {
+        injection.required.add(RequestContext);
+      } else if (name == 'res') {
+        injection.required.add(ResponseContext);
+      } else if (type == dynamic) {
+        injection.required.add(name);
+      } else {
+        injection.required.add([name, type]);
+      }
     } else {
-      injection.required.add([name, type]);
+      injection.named[name] = type;
     }
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 8a3becd1..bb780eae 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.47
+version: 1.0.0-dev.48
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/di_test.dart b/test/di_test.dart
index 82ddecb3..2cb4233d 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -24,7 +24,7 @@ main() {
 
     app.get("/errands", (Todo singleton) => singleton);
     app.get("/errands3",
-        (Errand singleton, Todo foo, RequestContext req) => singleton.text);
+        ({Errand singleton, Todo foo, RequestContext req}) => singleton.text);
     await app.configure(new SingletonController());
     await app.configure(new ErrandController());
 

From 4c04e1193ce09c2898ea425fac2d4a10445dc8b2 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 20 Jan 2017 17:40:48 -0500
Subject: [PATCH 088/414] 49!!!

---
 README.md                        |  2 +-
 lib/src/http/hooked_service.dart | 85 +++++++++++++++++--------------
 lib/src/http/server.dart         | 86 ++++++++++++++++++--------------
 pubspec.yaml                     |  2 +-
 4 files changed, 99 insertions(+), 76 deletions(-)

diff --git a/README.md b/README.md
index b5a5c7cf..274ce33c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.48](https://img.shields.io/badge/pub-1.0.0--dev.48-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.49](https://img.shields.io/badge/pub-1.0.0--dev.49-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index febd3246..7f30b1a9 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -41,6 +41,16 @@ class HookedService extends Service {
     if (inner.app != null) this.app = inner.app;
   }
 
+  RequestContext _getRequest(Map params) {
+    if (params == null) return null;
+    return params['__requestctx'];
+  }
+
+  ResponseContext _getResponse(Map params) {
+    if (params == null) return null;
+    return params['__responsectx'];
+  }
+
   Map _stripReq(Map params) {
     if (params == null)
       return params;
@@ -192,21 +202,21 @@ class HookedService extends Service {
   Future<List> index([Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeIndexed._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.INDEXED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.INDEXED,
             params: params));
     if (before._canceled) {
       HookedServiceEvent after = await beforeIndexed._emit(
-          new HookedServiceEvent._base(_params['__requestctx'],
-              params['__responsectx'], inner, HookedServiceEvent.INDEXED,
+          new HookedServiceEvent._base(_getRequest(_params),
+              _getResponse(_params), inner, HookedServiceEvent.INDEXED,
               params: params, result: before.result));
       return after.result;
     }
 
     List result = await inner.index(params);
     HookedServiceEvent after = await afterIndexed._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.INDEXED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.INDEXED,
             params: params, result: result));
     return after.result;
   }
@@ -215,22 +225,22 @@ class HookedService extends Service {
   Future read(id, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRead._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.READ,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.READ,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRead._emit(
-          new HookedServiceEvent._base(_params['__requestctx'],
-              params['__responsectx'], inner, HookedServiceEvent.READ,
+          new HookedServiceEvent._base(_getRequest(_params),
+              _getResponse(_params), inner, HookedServiceEvent.READ,
               id: id, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.read(id, params);
     HookedServiceEvent after = await afterRead._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.READ,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.READ,
             id: id, params: params, result: result));
     return after.result;
   }
@@ -239,22 +249,22 @@ class HookedService extends Service {
   Future create(data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeCreated._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.CREATED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.CREATED,
             data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterCreated._emit(
-          new HookedServiceEvent._base(_params['__requestctx'],
-              params['__responsectx'], inner, HookedServiceEvent.CREATED,
+          new HookedServiceEvent._base(_getRequest(_params),
+              _getResponse(_params), inner, HookedServiceEvent.CREATED,
               data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.create(data, params);
     HookedServiceEvent after = await afterCreated._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.CREATED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.CREATED,
             data: data, params: params, result: result));
     return after.result;
   }
@@ -263,22 +273,22 @@ class HookedService extends Service {
   Future modify(id, data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeModified._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.MODIFIED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterModified._emit(
-          new HookedServiceEvent._base(_params['__requestctx'],
-              params['__responsectx'], inner, HookedServiceEvent.MODIFIED,
+          new HookedServiceEvent._base(_getRequest(_params),
+              _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.modify(id, data, params);
     HookedServiceEvent after = await afterModified._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.MODIFIED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
             id: id, data: data, params: params, result: result));
     return after.result;
   }
@@ -287,22 +297,22 @@ class HookedService extends Service {
   Future update(id, data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeUpdated._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.UPDATED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.UPDATED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterUpdated._emit(
-          new HookedServiceEvent._base(_params['__requestctx'],
-              params['__responsectx'], inner, HookedServiceEvent.UPDATED,
+          new HookedServiceEvent._base(_getRequest(_params),
+              _getResponse(_params), inner, HookedServiceEvent.UPDATED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.update(id, data, params);
     HookedServiceEvent after = await afterUpdated._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.UPDATED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.UPDATED,
             id: id, data: data, params: params, result: result));
     return after.result;
   }
@@ -311,29 +321,30 @@ class HookedService extends Service {
   Future remove(id, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRemoved._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.REMOVED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.REMOVED,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRemoved._emit(
-          new HookedServiceEvent._base(_params['__requestctx'],
-              params['__responsectx'], inner, HookedServiceEvent.REMOVED,
+          new HookedServiceEvent._base(_getRequest(_params),
+              _getResponse(_params), inner, HookedServiceEvent.REMOVED,
               id: id, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.remove(id, params);
     HookedServiceEvent after = await afterRemoved._emit(
-        new HookedServiceEvent._base(_params['__requestctx'],
-            params['__responsectx'], inner, HookedServiceEvent.REMOVED,
+        new HookedServiceEvent._base(_getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.REMOVED,
             id: id, params: params, result: result));
     return after.result;
   }
 
   /// Fires an `after` event. This will not be propagated to clients,
   /// but will be broadcasted to WebSockets, etc.
-  Future<HookedServiceEvent> fire(String eventName, result, [HookedServiceEventListener callback]) async {
+  Future<HookedServiceEvent> fire(String eventName, result,
+      [HookedServiceEventListener callback]) async {
     HookedServiceEventDispatcher dispatcher;
 
     switch (eventName) {
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index f10f0df3..93c72a05 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -124,7 +124,7 @@ class Angel extends AngelBase {
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
   Future<HttpServer> startServer([InternetAddress address, int port]) async {
-    final host = address ?? InternetAddress.LOOPBACK_IP_V4;
+    var host = address ?? InternetAddress.LOOPBACK_IP_V4;
     this.httpServer = await _serverGenerator(host, port ?? 0);
     preprocessRoutes();
     return httpServer..listen(handleRequest);
@@ -188,38 +188,44 @@ class Angel extends AngelBase {
     return false;
   }
 
+  Future<RequestContext> createRequestContext(HttpRequest request) {
+    _beforeProcessed.add(request);
+    return RequestContext.from(request, this);
+  }
+
+  Future<ResponseContext> createResponseContext(HttpResponse response) async =>
+      new ResponseContext(response, this);
+
   /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
     try {
-      _beforeProcessed.add(request);
-
-      final req = await RequestContext.from(request, this);
-      final res = new ResponseContext(request.response, this);
+      var req = await createRequestContext(request);
+      var res = await createResponseContext(request.response);
       String requestedUrl = request.uri.path.replaceAll(_straySlashes, '');
 
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
-      final resolved =
+      var resolved =
           resolveAll(requestedUrl, requestedUrl, method: request.method);
 
-      for (final result in resolved) req.params.addAll(result.allParams);
+      for (var result in resolved) req.params.addAll(result.allParams);
 
       if (resolved.isNotEmpty) {
-        final route = resolved.first.route;
+        var route = resolved.first.route;
         req.inject(Match, route.match(requestedUrl));
       }
 
-      final m = new MiddlewarePipeline(resolved);
+      var m = new MiddlewarePipeline(resolved);
       req.inject(MiddlewarePipeline, m);
 
-      final pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
+      var pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
 
       _printDebug('Handler sequence on $requestedUrl: $pipeline');
 
-      for (final handler in pipeline) {
+      for (var handler in pipeline) {
         try {
           _printDebug('Executing handler: $handler');
-          final result = await executeHandler(handler, req, res);
+          var result = await executeHandler(handler, req, res);
           _printDebug('Result: $result');
 
           if (!result) {
@@ -262,27 +268,7 @@ class Angel extends AngelBase {
       }
 
       try {
-        _afterProcessed.add(request);
-
-        if (!res.willCloseItself) {
-          for (var finalizer in responseFinalizers) {
-            await finalizer(req, res);
-          }
-
-          for (var key in res.headers.keys) {
-            request.response.headers.add(key, res.headers[key]);
-          }
-
-          request.response.headers
-            ..chunkedTransferEncoding = res.chunked ?? true
-            ..set(HttpHeaders.CONTENT_LENGTH, res.buffer.length);
-
-          request.response
-            ..statusCode = res.statusCode
-            ..cookies.addAll(res.cookies)
-            ..add(res.buffer.takeBytes());
-          await request.response.close();
-        }
+        await sendRequest(request, req, res);
       } catch (e, st) {
         _fatalErrorStream
             .add(new AngelFatalError(request: request, error: e, stack: st));
@@ -339,6 +325,32 @@ class Angel extends AngelBase {
     // return await closureMirror.apply(args).reflectee;
   }
 
+  /// Sends a response.
+  Future sendRequest(
+      HttpRequest request, RequestContext req, ResponseContext res) async {
+    _afterProcessed.add(request);
+
+    if (!res.willCloseItself) {
+      for (var finalizer in responseFinalizers) {
+        await finalizer(req, res);
+      }
+
+      for (var key in res.headers.keys) {
+        request.response.headers.add(key, res.headers[key]);
+      }
+
+      request.response.headers
+        ..chunkedTransferEncoding = res.chunked ?? true
+        ..set(HttpHeaders.CONTENT_LENGTH, res.buffer.length);
+
+      request.response
+        ..statusCode = res.statusCode
+        ..cookies.addAll(res.cookies)
+        ..add(res.buffer.takeBytes());
+      await request.response.close();
+    }
+  }
+
   /// Applies an [AngelConfigurer] to this instance.
   Future configure(AngelConfigurer configurer) async {
     await configurer(this);
@@ -366,7 +378,7 @@ class Angel extends AngelBase {
   @override
   use(Pattern path, Routable routable,
       {bool hooked: true, String namespace: null}) {
-    final head = path.toString().replaceAll(_straySlashes, '');
+    var head = path.toString().replaceAll(_straySlashes, '');
 
     if (routable is Angel) {
       _children.add(routable.._parent = this);
@@ -396,12 +408,12 @@ class Angel extends AngelBase {
       }
 
       routable.controllers.forEach((k, v) {
-        final tail = k.toString().replaceAll(_straySlashes, '');
+        var tail = k.toString().replaceAll(_straySlashes, '');
         controllers['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
 
       routable.services.forEach((k, v) {
-        final tail = k.toString().replaceAll(_straySlashes, '');
+        var tail = k.toString().replaceAll(_straySlashes, '');
         services['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
     }
@@ -434,7 +446,7 @@ class Angel extends AngelBase {
   /// the server.
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
       {bool debug: false, String password}) {
-    final app = new Angel(debug: debug == true);
+    var app = new Angel(debug: debug == true);
 
     app._serverGenerator = (InternetAddress address, int port) async {
       var certificateChain =
diff --git a/pubspec.yaml b/pubspec.yaml
index bb780eae..0c3a2b7d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.48
+version: 1.0.0-dev.49
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 0adfdbeb59a9e88e0dcd80dd35cbeb40af666c3e Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 27 Jan 2017 22:47:00 -0500
Subject: [PATCH 089/414] 50

---
 README.md                        |  2 +-
 lib/src/http/hooked_service.dart | 91 +++++++++++++++++---------------
 lib/src/http/routable.dart       |  4 +-
 lib/src/http/service.dart        | 20 ++++---
 pubspec.yaml                     |  2 +-
 test/common.dart                 | 11 ++++
 test/hooked_test.dart            | 20 ++++++-
 7 files changed, 96 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index 274ce33c..d7cd98d9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.49](https://img.shields.io/badge/pub-1.0.0--dev.49-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.50](https://img.shields.io/badge/pub-1.0.0--dev.50-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 7f30b1a9..780f8a50 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -55,7 +55,9 @@ class HookedService extends Service {
     if (params == null)
       return params;
     else
-      return params..remove('__requestctx')..remove('__responsectx');
+      return params.keys
+          .where((key) => key != '__requestctx' && key != '__responsectx')
+          .fold({}, (map, key) => map..[key] = params[key]);
   }
 
   /// Adds hooks to this instance.
@@ -102,17 +104,20 @@ class HookedService extends Service {
 
     // Add global middleware if declared on the instance itself
     Middleware before = getAnnotation(inner, Middleware);
-    final handlers = [];
+    final handlers = [
+      (RequestContext req, ResponseContext res) async {
+        req.query
+          ..['__requestctx'] = req
+          ..['__responsectx'] = res;
+        return true;
+      }
+    ];
 
     if (before != null) handlers.addAll(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
     get('/', (req, res) async {
-      return await this.index(mergeMap([
-        req.query,
-        restProvider,
-        {'__requestctx': req, '__responsectx': res}
-      ]));
+      return await this.index(mergeMap([req.query, restProvider]));
     },
         middleware: []
           ..addAll(handlers)
@@ -121,13 +126,8 @@ class HookedService extends Service {
     Middleware createMiddleware = getAnnotation(inner.create, Middleware);
     post(
         '/',
-        (req, res) async => await this.create(
-            req.body,
-            mergeMap([
-              req.query,
-              restProvider,
-              {'__requestctx': req, '__responsectx': res}
-            ])),
+        (req, res) async =>
+            await this.create(req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -137,13 +137,8 @@ class HookedService extends Service {
 
     get(
         '/:id',
-        (req, res) async => await this.read(
-            req.params['id'],
-            mergeMap([
-              req.query,
-              restProvider,
-              {'__requestctx': req, '__responsectx': res}
-            ])),
+        (req, res) async => await this
+            .read(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -152,13 +147,7 @@ class HookedService extends Service {
     patch(
         '/:id',
         (req, res) async => await this.modify(
-            req.params['id'],
-            req.body,
-            mergeMap([
-              req.query,
-              restProvider,
-              {'__requestctx': req, '__responsectx': res}
-            ])),
+            req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -168,13 +157,7 @@ class HookedService extends Service {
     post(
         '/:id',
         (req, res) async => await this.update(
-            req.params['id'],
-            req.body,
-            mergeMap([
-              req.query,
-              restProvider,
-              {'__requestctx': req, '__responsectx': res}
-            ])),
+            req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -183,13 +166,8 @@ class HookedService extends Service {
     Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
     delete(
         '/:id',
-        (req, res) async => await this.remove(
-            req.params['id'],
-            mergeMap([
-              req.query,
-              restProvider,
-              {'__requestctx': req, '__responsectx': res}
-            ])),
+        (req, res) async => await this
+            .remove(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -198,6 +176,33 @@ class HookedService extends Service {
     addHooks();
   }
 
+  /// Runs the [listener] before every service method;
+  void beforeAll(HookedServiceEventListener listener) {
+    beforeIndexed.listen(listener);
+    beforeRead.listen(listener);
+    beforeCreated.listen(listener);
+    beforeModified.listen(listener);
+    beforeUpdated.listen(listener);
+    beforeRemoved.listen(listener);
+  }
+
+  /// Runs the [listener] after every service method.
+  void afterAll(HookedServiceEventListener listener) {
+    afterIndexed.listen(listener);
+    afterRead.listen(listener);
+    afterCreated.listen(listener);
+    afterModified.listen(listener);
+    afterUpdated.listen(listener);
+    afterRemoved.listen(listener);
+  }
+
+  /// Runs the [listener] before [create], [modify] and [update].
+  void beforeModify(HookedServiceEventListener listener) {
+    beforeCreated.listen(listener);
+    beforeModified.listen(listener);
+    beforeUpdated.listen(listener);
+  }
+
   @override
   Future<List> index([Map _params]) async {
     var params = _stripReq(_params);
@@ -415,7 +420,7 @@ class HookedServiceEvent {
   /// The inner service whose method was hooked.
   Service service;
 
-  HookedServiceEvent._base(this._result, this._response, Service this.service,
+  HookedServiceEvent._base(this._request, this._response, Service this.service,
       String this._eventName,
       {id, this.data, Map params, result}) {
     _id = id;
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 493099b1..637c1c87 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -70,7 +70,9 @@ class Routable extends Router {
       super.registerMiddleware(name, middleware);
 
   /// Retrieves the service assigned to the given path.
-  Service service(Pattern path) => _services[path];
+  Service service(Pattern path) =>
+      _services[path] ??
+      _services[path.toString().replaceAll(_straySlashes, '')];
 
   /// Retrieves the controller with the given name.
   Controller controller(String name) => controllers[name];
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index d7f6e1a0..9d129a2d 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -26,6 +26,9 @@ class Providers {
 
   /// Represents a request over WebSockets.
   static final Providers WEBSOCKET = const Providers(VIA_WEBSOCKET);
+
+  @override
+  bool operator ==(other) => other is Providers && other.via == via;
 }
 
 /// A front-facing interface that can present data to and operate on data on behalf of the user.
@@ -83,7 +86,10 @@ class Service extends Routable {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(this.create, Middleware);
-    post('/', (req, res) async => await this.create(req.body, mergeMap([req.query, restProvider])),
+    post(
+        '/',
+        (req, res) async =>
+            await this.create(req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -94,7 +100,7 @@ class Service extends Routable {
     get(
         '/:id',
         (req, res) async => await this
-        .read(req.params['id'], mergeMap([req.query, restProvider])),
+            .read(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -102,8 +108,8 @@ class Service extends Routable {
     Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async =>
-    await this.modify(req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.modify(
+            req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -112,8 +118,8 @@ class Service extends Routable {
     Middleware updateMiddleware = getAnnotation(this.update, Middleware);
     post(
         '/:id',
-        (req, res) async =>
-    await this.update(req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.update(
+            req.params['id'], req.body, mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -123,7 +129,7 @@ class Service extends Routable {
     delete(
         '/:id',
         (req, res) async => await this
-        .remove(req.params['id'], mergeMap([req.query, restProvider])),
+            .remove(req.params['id'], mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/pubspec.yaml b/pubspec.yaml
index 0c3a2b7d..b03e9043 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.49
+version: 1.0.0-dev.50
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/common.dart b/test/common.dart
index 97f7c0b1..6e17aaa3 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -9,6 +9,17 @@ class Todo extends MemoryModel {
   Todo({String this.text, String this.over});
 }
 
+class BookService extends Service {
+  @override
+  index([params]) async {
+    print('Book params: $params');
+    
+    return [
+      {'foo': 'bar'}
+    ];
+  }
+}
+
 incrementTodoTimes(e) {
   IncrementService.TIMES++;
 }
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 471ff17d..e24a4b83 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -21,9 +21,10 @@ main() {
     app = new Angel();
     client = new http.Client();
     app.use('/todos', new MemoryService<Todo>());
+    app.use('/books', new BookService());
     Todos = app.service("todos");
 
-    // app.dumpTree(showMatchers: true);
+    app.fatalErrorStream.listen((e) => throw e.error);
 
     server = await app.startServer();
     url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
@@ -95,4 +96,21 @@ main() {
     await service.index();
     expect(IncrementService.TIMES, equals(2));
   });
+
+  test('inject request + response', () async {
+    HookedService books = app.service('books');
+
+    books.beforeIndexed.listen((e) {
+      expect([e.request, e.response], everyElement(isNotNull));
+      print('Indexing books at path: ${e.request.path}');
+    });
+
+    var response = await client.get('$url/books');
+    print(response.body);
+
+    var result = god.deserialize(response.body);
+    expect(result, isList);
+    expect(result, isNotEmpty);
+    expect(result[0], equals({'foo': 'bar'}));
+  });
 }

From 19af9b6e5f5104c0c6a43a597ffef0bb4127b102 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 28 Jan 2017 16:08:07 -0500
Subject: [PATCH 090/414] 51

---
 README.md                              |  2 +-
 lib/hooks.dart                         | 21 ++++++
 lib/src/http/angel_http_exception.dart | 63 ++++++++---------
 lib/src/http/hooked_service.dart       | 96 ++++++++++++++++++++------
 lib/src/http/service.dart              | 12 ++--
 pubspec.yaml                           |  2 +-
 6 files changed, 135 insertions(+), 61 deletions(-)
 create mode 100644 lib/hooks.dart

diff --git a/README.md b/README.md
index d7cd98d9..a6efbe79 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.50](https://img.shields.io/badge/pub-1.0.0--dev.50-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.51](https://img.shields.io/badge/pub-1.0.0--dev.51-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/hooks.dart b/lib/hooks.dart
new file mode 100644
index 00000000..7ed483c9
--- /dev/null
+++ b/lib/hooks.dart
@@ -0,0 +1,21 @@
+/// Easy helper hooks.
+library angel_framework.hooks;
+
+import 'package:json_god/json_god.dart' as god;
+import 'angel_framework.dart';
+
+/// Transforms `e.data` into JSON-friendly data, i.e. a Map.
+HookedServiceEventListener toJson() {
+  return (HookedServiceEvent e) {
+    if (e.data != null && e.data is! Map) e.data = god.serializeObject(e.data);
+  };
+}
+
+/// Transforms `e.data` into an instance of the given [type],
+/// if it is not already.
+HookedServiceEventListener toType(Type type) {
+  return (HookedServiceEvent e) {
+    if (e.data != null && e.data.runtimeType != type)
+      e.data = god.deserializeDatum(e.data, outputType: type);
+  };
+}
diff --git a/lib/src/http/angel_http_exception.dart b/lib/src/http/angel_http_exception.dart
index ebc35257..54cb14a0 100644
--- a/lib/src/http/angel_http_exception.dart
+++ b/lib/src/http/angel_http_exception.dart
@@ -58,18 +58,18 @@ class AngelHttpException implements Exception {
   /// Throws a 400 Bad Request error, including an optional arrray of (validation?)
   /// errors you specify.
   factory AngelHttpException.badRequest(
-      {String message: '400 Bad Request', List<String> errors: const []}) =>
+          {String message: '400 Bad Request', List<String> errors: const []}) =>
       new AngelHttpException(null,
           message: message, errors: errors, statusCode: 400);
 
   /// Throws a 401 Not Authenticated error.
   factory AngelHttpException.notAuthenticated(
-      {String message: '401 Not Authenticated'}) =>
+          {String message: '401 Not Authenticated'}) =>
       new AngelHttpException(null, message: message, statusCode: 401);
 
   /// Throws a 402 Payment Required error.
   factory AngelHttpException.paymentRequired(
-      {String message: '402 Payment Required'}) =>
+          {String message: '402 Payment Required'}) =>
       new AngelHttpException(null, message: message, statusCode: 402);
 
   /// Throws a 403 Forbidden error.
@@ -82,12 +82,12 @@ class AngelHttpException implements Exception {
 
   /// Throws a 405 Method Not Allowed error.
   factory AngelHttpException.methodNotAllowed(
-      {String message: '405 Method Not Allowed'}) =>
+          {String message: '405 Method Not Allowed'}) =>
       new AngelHttpException(null, message: message, statusCode: 405);
 
   /// Throws a 406 Not Acceptable error.
   factory AngelHttpException.notAcceptable(
-      {String message: '406 Not Acceptable'}) =>
+          {String message: '406 Not Acceptable'}) =>
       new AngelHttpException(null, message: message, statusCode: 406);
 
   /// Throws a 408 Timeout error.
@@ -100,83 +100,84 @@ class AngelHttpException implements Exception {
 
   /// Throws a 422 Not Processable error.
   factory AngelHttpException.notProcessable(
-      {String message: '422 Not Processable'}) =>
+          {String message: '422 Not Processable'}) =>
       new AngelHttpException(null, message: message, statusCode: 422);
 
   /// Throws a 501 Not Implemented error.
   factory AngelHttpException.notImplemented(
-      {String message: '501 Not Implemented'}) =>
+          {String message: '501 Not Implemented'}) =>
       new AngelHttpException(null, message: message, statusCode: 501);
 
   /// Throws a 503 Unavailable error.
   factory AngelHttpException.unavailable({String message: '503 Unavailable'}) =>
       new AngelHttpException(null, message: message, statusCode: 503);
 
-  /// Throws a 400 Bad Request error, including an optional arrray of (validation?)
-  /// errors you specify.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.BadRequest(
           {String message: '400 Bad Request', List<String> errors: const []}) =>
       new AngelHttpException(null,
           message: message, errors: errors, statusCode: 400);
 
-  /// Throws a 401 Not Authenticated error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.NotAuthenticated(
           {String message: '401 Not Authenticated'}) =>
       new AngelHttpException(null, message: message, statusCode: 401);
 
-  /// Throws a 402 Payment Required error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.PaymentRequired(
           {String message: '402 Payment Required'}) =>
       new AngelHttpException(null, message: message, statusCode: 402);
 
-  /// Throws a 403 Forbidden error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.Forbidden({String message: '403 Forbidden'}) =>
       new AngelHttpException(null, message: message, statusCode: 403);
 
-  /// Throws a 404 Not Found error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.NotFound({String message: '404 Not Found'}) =>
       new AngelHttpException(null, message: message, statusCode: 404);
 
-  /// Throws a 405 Method Not Allowed error.
+  @deprecated
+
+  /// DEPRECATED: Use lowercase constructor instead.
   factory AngelHttpException.MethodNotAllowed(
           {String message: '405 Method Not Allowed'}) =>
       new AngelHttpException(null, message: message, statusCode: 405);
 
-  /// Throws a 406 Not Acceptable error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.NotAcceptable(
           {String message: '406 Not Acceptable'}) =>
       new AngelHttpException(null, message: message, statusCode: 406);
 
-  /// Throws a 408 Timeout error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.MethodTimeout({String message: '408 Timeout'}) =>
       new AngelHttpException(null, message: message, statusCode: 408);
 
-  /// Throws a 409 Conflict error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.Conflict({String message: '409 Conflict'}) =>
       new AngelHttpException(null, message: message, statusCode: 409);
 
-  /// Throws a 422 Not Processable error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.NotProcessable(
           {String message: '422 Not Processable'}) =>
       new AngelHttpException(null, message: message, statusCode: 422);
 
-  /// Throws a 501 Not Implemented error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.NotImplemented(
           {String message: '501 Not Implemented'}) =>
       new AngelHttpException(null, message: message, statusCode: 501);
 
-  /// Throws a 503 Unavailable error.
-  @Deprecated('Use lowercase constructor instead')
+  /// DEPRECATED: Use lowercase constructor instead.
+  @deprecated
   factory AngelHttpException.Unavailable({String message: '503 Unavailable'}) =>
       new AngelHttpException(null, message: message, statusCode: 503);
 }
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 780f8a50..73eb5fa9 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -176,7 +176,54 @@ class HookedService extends Service {
     addHooks();
   }
 
-  /// Runs the [listener] before every service method;
+  /// Runs the [listener] before every service method specified.
+  void before(
+      Iterable<String> eventNames, HookedServiceEventListener listener) {
+    eventNames.map((name) {
+      switch (name) {
+        case HookedServiceEvent.INDEXED:
+          return beforeIndexed;
+        case HookedServiceEvent.READ:
+          return beforeRead;
+        case HookedServiceEvent.CREATED:
+          return beforeCreated;
+        case HookedServiceEvent.MODIFIED:
+          return beforeModified;
+        case HookedServiceEvent.UPDATED:
+          return beforeUpdated;
+        case HookedServiceEvent.REMOVED:
+          return beforeRemoved;
+        default:
+          throw new ArgumentError('Invalid service method: ${name}');
+      }
+    }).forEach((HookedServiceEventDispatcher dispatcher) =>
+        dispatcher.listen(listener));
+  }
+
+  /// Runs the [listener] after every service method specified.
+  void after(Iterable<String> eventNames, HookedServiceEventListener listener) {
+    eventNames.map((name) {
+      switch (name) {
+        case HookedServiceEvent.INDEXED:
+          return afterIndexed;
+        case HookedServiceEvent.READ:
+          return afterRead;
+        case HookedServiceEvent.CREATED:
+          return afterCreated;
+        case HookedServiceEvent.MODIFIED:
+          return afterModified;
+        case HookedServiceEvent.UPDATED:
+          return afterUpdated;
+        case HookedServiceEvent.REMOVED:
+          return afterRemoved;
+        default:
+          throw new ArgumentError('Invalid service method: ${name}');
+      }
+    }).forEach((HookedServiceEventDispatcher dispatcher) =>
+        dispatcher.listen(listener));
+  }
+
+  /// Runs the [listener] before every service method.
   void beforeAll(HookedServiceEventListener listener) {
     beforeIndexed.listen(listener);
     beforeRead.listen(listener);
@@ -207,12 +254,12 @@ class HookedService extends Service {
   Future<List> index([Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeIndexed._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.INDEXED,
             params: params));
     if (before._canceled) {
       HookedServiceEvent after = await beforeIndexed._emit(
-          new HookedServiceEvent._base(_getRequest(_params),
+          new HookedServiceEvent._base(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.INDEXED,
               params: params, result: before.result));
       return after.result;
@@ -220,7 +267,7 @@ class HookedService extends Service {
 
     List result = await inner.index(params);
     HookedServiceEvent after = await afterIndexed._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(true, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.INDEXED,
             params: params, result: result));
     return after.result;
@@ -230,13 +277,13 @@ class HookedService extends Service {
   Future read(id, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRead._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.READ,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRead._emit(
-          new HookedServiceEvent._base(_getRequest(_params),
+          new HookedServiceEvent._base(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.READ,
               id: id, params: params, result: before.result));
       return after.result;
@@ -244,7 +291,7 @@ class HookedService extends Service {
 
     var result = await inner.read(id, params);
     HookedServiceEvent after = await afterRead._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(true, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.READ,
             id: id, params: params, result: result));
     return after.result;
@@ -254,13 +301,13 @@ class HookedService extends Service {
   Future create(data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeCreated._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.CREATED,
             data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterCreated._emit(
-          new HookedServiceEvent._base(_getRequest(_params),
+          new HookedServiceEvent._base(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.CREATED,
               data: data, params: params, result: before.result));
       return after.result;
@@ -268,7 +315,7 @@ class HookedService extends Service {
 
     var result = await inner.create(data, params);
     HookedServiceEvent after = await afterCreated._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(true, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.CREATED,
             data: data, params: params, result: result));
     return after.result;
@@ -278,13 +325,13 @@ class HookedService extends Service {
   Future modify(id, data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeModified._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterModified._emit(
-          new HookedServiceEvent._base(_getRequest(_params),
+          new HookedServiceEvent._base(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
@@ -292,7 +339,7 @@ class HookedService extends Service {
 
     var result = await inner.modify(id, data, params);
     HookedServiceEvent after = await afterModified._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(true, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
             id: id, data: data, params: params, result: result));
     return after.result;
@@ -302,13 +349,13 @@ class HookedService extends Service {
   Future update(id, data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeUpdated._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.UPDATED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterUpdated._emit(
-          new HookedServiceEvent._base(_getRequest(_params),
+          new HookedServiceEvent._base(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.UPDATED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
@@ -316,7 +363,7 @@ class HookedService extends Service {
 
     var result = await inner.update(id, data, params);
     HookedServiceEvent after = await afterUpdated._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(true, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.UPDATED,
             id: id, data: data, params: params, result: result));
     return after.result;
@@ -326,13 +373,13 @@ class HookedService extends Service {
   Future remove(id, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRemoved._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.REMOVED,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRemoved._emit(
-          new HookedServiceEvent._base(_getRequest(_params),
+          new HookedServiceEvent._base(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.REMOVED,
               id: id, params: params, result: before.result));
       return after.result;
@@ -340,7 +387,7 @@ class HookedService extends Service {
 
     var result = await inner.remove(id, params);
     HookedServiceEvent after = await afterRemoved._emit(
-        new HookedServiceEvent._base(_getRequest(_params),
+        new HookedServiceEvent._base(true, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.REMOVED,
             id: id, params: params, result: result));
     return after.result;
@@ -375,7 +422,7 @@ class HookedService extends Service {
         throw new ArgumentError("Invalid service event name: '$eventName'");
     }
 
-    var ev = new HookedServiceEvent._base(null, null, this, eventName);
+    var ev = new HookedServiceEvent._base(true, null, null, this, eventName);
     if (callback != null) await callback(ev);
     return await dispatcher._emit(ev);
   }
@@ -399,6 +446,7 @@ class HookedServiceEvent {
   bool _canceled = false;
   String _eventName;
   var _id;
+  bool _isAfter;
   var data;
   Map _params;
   var _result;
@@ -409,6 +457,10 @@ class HookedServiceEvent {
 
   get id => _id;
 
+  bool get isAfter => _isAfter == true;
+
+  bool get isBefore => !isAfter;
+
   Map get params => _params;
 
   RequestContext get request => _request;
@@ -420,8 +472,8 @@ class HookedServiceEvent {
   /// The inner service whose method was hooked.
   Service service;
 
-  HookedServiceEvent._base(this._request, this._response, Service this.service,
-      String this._eventName,
+  HookedServiceEvent._base(this._isAfter, this._request, this._response,
+      Service this.service, String this._eventName,
       {id, this.data, Map params, result}) {
     _id = id;
     _params = params ?? {};
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 9d129a2d..5512e7b5 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -40,32 +40,32 @@ class Service extends Routable {
 
   /// Retrieves all resources.
   Future<List> index([Map params]) {
-    throw new AngelHttpException.MethodNotAllowed();
+    throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Retrieves the desired resource.
   Future read(id, [Map params]) {
-    throw new AngelHttpException.MethodNotAllowed();
+    throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Creates a resource.
   Future create(data, [Map params]) {
-    throw new AngelHttpException.MethodNotAllowed();
+    throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Modifies a resource.
   Future modify(id, data, [Map params]) {
-    throw new AngelHttpException.MethodNotAllowed();
+    throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Overwrites a resource.
   Future update(id, data, [Map params]) {
-    throw new AngelHttpException.MethodNotAllowed();
+    throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Removes the given resource.
   Future remove(id, [Map params]) {
-    throw new AngelHttpException.MethodNotAllowed();
+    throw new AngelHttpException.methodNotAllowed();
   }
 
   void addRoutes() {
diff --git a/pubspec.yaml b/pubspec.yaml
index b03e9043..8ebee790 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.50
+version: 1.0.0-dev.51
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 6b7d9e884f00d7d0535d18c0c5ae02413c91ef08 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 28 Jan 2017 16:25:02 -0500
Subject: [PATCH 091/414] 52

---
 README.md                        |  2 +-
 lib/hooks.dart                   | 66 ++++++++++++++++++++++++++++++++
 lib/src/http/hooked_service.dart | 11 ++----
 pubspec.yaml                     |  2 +-
 4 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index a6efbe79..6974fe84 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.51](https://img.shields.io/badge/pub-1.0.0--dev.51-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.52](https://img.shields.io/badge/pub-1.0.0--dev.52-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 7ed483c9..6962ee3b 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -1,6 +1,7 @@
 /// Easy helper hooks.
 library angel_framework.hooks;
 
+import 'dart:async';
 import 'package:json_god/json_god.dart' as god;
 import 'angel_framework.dart';
 
@@ -19,3 +20,68 @@ HookedServiceEventListener toType(Type type) {
       e.data = god.deserializeDatum(e.data, outputType: type);
   };
 }
+
+/// Removes one or more [key]s from service results.
+/// Works on single results, and iterable results.
+HookedServiceEventListener remove(key, remover(key, obj)) {
+  return (HookedServiceEvent e) async {
+    if (!e.isAfter) throw new StateError("'remove' only works on after hooks.");
+
+    _remover(key, obj) {
+      if (remover != null)
+        return remover(key, obj);
+      else if (obj is List)
+        return obj..remove(key);
+      else if (obj is Iterable)
+        return obj.where((k) => !key);
+      else if (obj is Map)
+        return obj..remove(key);
+      else if (obj is Extensible)
+        return obj..properties.remove(key);
+      else
+        throw new ArgumentError("Cannot remove key 'key' from $obj.");
+    }
+
+    var keys = key is Iterable ? key : [key];
+
+    _removeAll(obj) async {
+      var r = obj;
+
+      for (var key in keys) {
+        r = await _remover(key, r);
+      }
+
+      return r;
+    }
+
+    if (e.result is Iterable) {
+      var r = await Future.wait(e.result.map(_removeAll));
+      e.result = e.result is List ? r.toList() : r;
+    } else
+      e.result = await _removeAll(e.result);
+  };
+}
+
+/// Disables a service method for access from a provider.
+///
+/// [provider] can be either a String, [Providers], an Iterable of String, or a
+/// function that takes a [HookedServiceEvent] and returns a bool.
+/// Futures are allowed.
+HookedServiceEventListener disable([provider]) {
+  return (HookedServiceEvent e) async {
+    if (provider is Function) {
+      var r = await provider(e);
+
+      if (r != true) throw new AngelHttpException.methodNotAllowed();
+    } else {
+      _provide(p) => p is Providers ? p : new Providers(p.toString());
+
+      var providers =
+          provider is Iterable ? provider.map(_provide) : [_provide(provider)];
+
+      if (providers.any((Providers p) => p == e.params['provider'])) {
+        throw new AngelHttpException.methodNotAllowed();
+      }
+    }
+  };
+}
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 73eb5fa9..d5824548 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -438,9 +438,9 @@ class HookedServiceEvent {
   static const String REMOVED = "removed";
 
   /// Use this to end processing of an event.
-  void cancel(result) {
+  void cancel([result]) {
     _canceled = true;
-    _result = result;
+    this.result = result ?? this.result;
   }
 
   bool _canceled = false;
@@ -449,9 +449,9 @@ class HookedServiceEvent {
   bool _isAfter;
   var data;
   Map _params;
-  var _result;
   RequestContext _request;
   ResponseContext _response;
+  var result;
 
   String get eventName => _eventName;
 
@@ -467,17 +467,14 @@ class HookedServiceEvent {
 
   ResponseContext get response => _response;
 
-  get result => _result;
-
   /// The inner service whose method was hooked.
   Service service;
 
   HookedServiceEvent._base(this._isAfter, this._request, this._response,
       Service this.service, String this._eventName,
-      {id, this.data, Map params, result}) {
+      {id, this.data, Map params, this.result}) {
     _id = id;
     _params = params ?? {};
-    _result = result;
   }
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 8ebee790..6d04f23c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.51
+version: 1.0.0-dev.52
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 069670580998214b7756182f73b538966ce6cd6c Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 29 Jan 2017 14:49:28 -0500
Subject: [PATCH 092/414] 53

---
 README.md      |   2 +-
 lib/hooks.dart | 109 ++++++++++++++++++++++++++++++++++++-------------
 pubspec.yaml   |   2 +-
 3 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 6974fe84..7ea3b0d8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.52](https://img.shields.io/badge/pub-1.0.0--dev.52-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.53](https://img.shields.io/badge/pub-1.0.0--dev.53-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 6962ee3b..c16408a4 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -2,27 +2,62 @@
 library angel_framework.hooks;
 
 import 'dart:async';
+import 'dart:mirrors';
 import 'package:json_god/json_god.dart' as god;
 import 'angel_framework.dart';
 
-/// Transforms `e.data` into JSON-friendly data, i.e. a Map.
-HookedServiceEventListener toJson() {
-  return (HookedServiceEvent e) {
-    if (e.data != null && e.data is! Map) e.data = god.serializeObject(e.data);
+/// Sequentially runs a set of [listeners].
+HookedServiceEventListener chainListeners(
+    Iterable<HookedServiceEventListener> listeners) {
+  return (HookedServiceEvent e) async {
+    for (HookedServiceEventListener listener in listeners) await listener(e);
   };
 }
 
-/// Transforms `e.data` into an instance of the given [type],
+/// Runs a [callback] on every service, and listens for future services to run it again.
+AngelConfigurer hookAllServices(callback(Service service)) {
+  return (Angel app) async {
+    List<Service> touched = [];
+
+    for (var service in app.services.values) {
+      if (!touched.contains(service)) {
+        await callback(service);
+        touched.add(service);
+      }
+    }
+
+    app.onService.listen((service) {
+      if (!touched.contains(service)) return callback(service);
+    });
+  };
+}
+
+/// Transforms `e.data` or `e.result` into JSON-friendly data, i.e. a Map.
+HookedServiceEventListener toJson() {
+  return (HookedServiceEvent e) {
+    normalize(obj) {
+      if (obj != null && obj is! Map) obj = god.serializeObject(obj);
+    }
+
+    normalize(e.isBefore ? e.data : e.result);
+  };
+}
+
+/// Transforms `e.data` or `e.result` into an instance of the given [type],
 /// if it is not already.
 HookedServiceEventListener toType(Type type) {
   return (HookedServiceEvent e) {
-    if (e.data != null && e.data.runtimeType != type)
-      e.data = god.deserializeDatum(e.data, outputType: type);
+    normalize(obj) {
+      if (obj != null && obj.runtimeType != type)
+        obj = god.deserializeDatum(obj, outputType: type);
+    }
+
+    normalize(e.isBefore ? e.data : e.result);
   };
 }
 
-/// Removes one or more [key]s from service results.
-/// Works on single results, and iterable results.
+/// Removes one or more [key]s from `e.data` or `e.result`.
+/// Works on single objects and iterables.
 HookedServiceEventListener remove(key, remover(key, obj)) {
   return (HookedServiceEvent e) async {
     if (!e.isAfter) throw new StateError("'remove' only works on after hooks.");
@@ -38,8 +73,14 @@ HookedServiceEventListener remove(key, remover(key, obj)) {
         return obj..remove(key);
       else if (obj is Extensible)
         return obj..properties.remove(key);
-      else
-        throw new ArgumentError("Cannot remove key 'key' from $obj.");
+      else {
+        try {
+          reflect(obj).setField(new Symbol(key), null);
+          return obj;
+        } catch (e) {
+          throw new ArgumentError("Cannot remove key 'key' from $obj.");
+        }
+      }
     }
 
     var keys = key is Iterable ? key : [key];
@@ -54,33 +95,45 @@ HookedServiceEventListener remove(key, remover(key, obj)) {
       return r;
     }
 
-    if (e.result is Iterable) {
-      var r = await Future.wait(e.result.map(_removeAll));
-      e.result = e.result is List ? r.toList() : r;
-    } else
-      e.result = await _removeAll(e.result);
+    normalize(obj) async {
+      if (obj != null) {
+        if (obj is Iterable) {
+          var r = await Future.wait(obj.map(_removeAll));
+          obj = obj is List ? r.toList() : r;
+        } else
+          obj = await _removeAll(obj);
+      }
+    }
+
+    await normalize(e.isBefore ? e.data : e.result);
   };
 }
 
-/// Disables a service method for access from a provider.
+/// Disables a service method for client access from a provider.
 ///
 /// [provider] can be either a String, [Providers], an Iterable of String, or a
 /// function that takes a [HookedServiceEvent] and returns a bool.
 /// Futures are allowed.
+///
+/// If [provider] is `null`, then it will be disabled to all clients.
 HookedServiceEventListener disable([provider]) {
   return (HookedServiceEvent e) async {
-    if (provider is Function) {
-      var r = await provider(e);
-
-      if (r != true) throw new AngelHttpException.methodNotAllowed();
-    } else {
-      _provide(p) => p is Providers ? p : new Providers(p.toString());
-
-      var providers =
-          provider is Iterable ? provider.map(_provide) : [_provide(provider)];
-
-      if (providers.any((Providers p) => p == e.params['provider'])) {
+    if (e.params.containsKey('provider')) {
+      if (provider == null)
         throw new AngelHttpException.methodNotAllowed();
+      else if (provider is Function) {
+        var r = await provider(e);
+        if (r != true) throw new AngelHttpException.methodNotAllowed();
+      } else {
+        _provide(p) => p is Providers ? p : new Providers(p.toString());
+
+        var providers = provider is Iterable
+            ? provider.map(_provide)
+            : [_provide(provider)];
+
+        if (providers.any((Providers p) => p == e.params['provider'])) {
+          throw new AngelHttpException.methodNotAllowed();
+        }
       }
     }
   };
diff --git a/pubspec.yaml b/pubspec.yaml
index 6d04f23c..9d02ae63 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.52
+version: 1.0.0-dev.53
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 6eebc7afa870bc4dedc3e196b45483ea3f1c4a02 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 1 Feb 2017 16:43:18 -0500
Subject: [PATCH 093/414] 54

---
 README.md                           |  2 +-
 lib/src/http/anonymous_service.dart | 50 ++++++++++++++++++++++++
 lib/src/http/hooked_service.dart    | 14 +++----
 lib/src/http/http.dart              |  1 +
 lib/src/http/memory_service.dart    | 60 +++++++++++++++++++++--------
 lib/src/http/server.dart            |  7 ++++
 lib/src/http/service.dart           | 23 +++++++----
 pubspec.yaml                        |  2 +-
 8 files changed, 127 insertions(+), 32 deletions(-)
 create mode 100644 lib/src/http/anonymous_service.dart

diff --git a/README.md b/README.md
index 7ea3b0d8..827a6ee2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.53](https://img.shields.io/badge/pub-1.0.0--dev.53-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.54](https://img.shields.io/badge/pub-1.0.0--dev.54-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/anonymous_service.dart b/lib/src/http/anonymous_service.dart
new file mode 100644
index 00000000..dbe927eb
--- /dev/null
+++ b/lib/src/http/anonymous_service.dart
@@ -0,0 +1,50 @@
+import 'dart:async';
+import 'service.dart';
+
+/// An easy helper class to create one-off services without having to create an entire class.
+///
+/// Well-suited for testing.
+class AnonymousService extends Service {
+  Function _index, _read, _create, _modify, _update, _remove;
+
+  AnonymousService(
+      {Future<List> index([Map params]),
+      Future read(id, [Map params]),
+      Future create(data, [Map params]),
+      Future modify(id, data, [Map params]),
+      Future update(id, data, [Map params]),
+      Future remove(id, [Map params])})
+      : super() {
+    _index = index;
+    _read = read;
+    _create = create;
+    _modify = modify;
+    _update = update;
+    _remove = remove;
+  }
+
+  @override
+  index([Map params]) => _index != null ? _index(params) : super.index(params);
+
+  @override
+  read(id, [Map params]) =>
+      _read != null ? _read(id, params) : super.read(id, params);
+
+  @override
+  create(data, [Map params]) =>
+      _create != null ? _create(data, params) : super.create(data, params);
+
+  @override
+  modify(id, data, [Map params]) => _modify != null
+      ? _modify(id, data, params)
+      : super.modify(id, data, params);
+
+  @override
+  update(id, data, [Map params]) => _update != null
+      ? _update(id, data, params)
+      : super.update(id, data, params);
+
+  @override
+  remove(id, [Map params]) =>
+      _remove != null ? _remove(id, params) : super.remove(id, params);
+}
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index d5824548..e46d0103 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -138,7 +138,7 @@ class HookedService extends Service {
     get(
         '/:id',
         (req, res) async => await this
-            .read(req.params['id'], mergeMap([req.query, restProvider])),
+            .read(toId(req.params['id']), mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -146,8 +146,8 @@ class HookedService extends Service {
     Middleware modifyMiddleware = getAnnotation(inner.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async => await this.modify(
-            req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.modify(toId(req.params['id']), req.body,
+            mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -156,8 +156,8 @@ class HookedService extends Service {
     Middleware updateMiddleware = getAnnotation(inner.update, Middleware);
     post(
         '/:id',
-        (req, res) async => await this.update(
-            req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.update(toId(req.params['id']), req.body,
+            mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -166,8 +166,8 @@ class HookedService extends Service {
     Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
     delete(
         '/:id',
-        (req, res) async => await this
-            .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        (req, res) async => await this.remove(
+            toId(req.params['id']), mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 5ca7da13..67eca08c 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -4,6 +4,7 @@ library angel_framework.http;
 export 'package:angel_route/angel_route.dart';
 export 'angel_base.dart';
 export 'angel_http_exception.dart';
+export 'anonymous_service.dart';
 export 'base_middleware.dart';
 export 'base_plugin.dart';
 export 'controller.dart';
diff --git a/lib/src/http/memory_service.dart b/lib/src/http/memory_service.dart
index 852589bf..1d6d1b6b 100644
--- a/lib/src/http/memory_service.dart
+++ b/lib/src/http/memory_service.dart
@@ -8,11 +8,25 @@ import '../defs.dart';
 import 'angel_http_exception.dart';
 import 'service.dart';
 
+int _getId(id) {
+  try {
+    return int.parse(id.toString());
+  } catch (e) {
+    throw new AngelHttpException.badRequest(message: 'Invalid ID.');
+  }
+}
+
 /// An in-memory [Service].
 class MemoryService<T> extends Service {
-  Map <int, MemoryModel> items = {};
+  /// If set to `true`, clients can remove all items by passing a `null` `id` to `remove`.
+  ///
+  /// `false` by default.
+  final bool allowRemoveAll;
 
-  MemoryService() :super() {
+  //// The data contained in this service.
+  final Map<int, MemoryModel> items = {};
+
+  MemoryService({this.allowRemoveAll: false}) : super() {
     if (!reflectType(T).isAssignableTo(reflectType(MemoryModel))) {
       throw new Exception(
           "MemoryServices only support classes that inherit from MemoryModel.");
@@ -31,19 +45,22 @@ class MemoryService<T> extends Service {
   }
 
   Future read(id, [Map params]) async {
-    int desiredId = int.parse(id.toString());
+    int desiredId = _getId(id);
     if (items.containsKey(desiredId)) {
       MemoryModel found = items[desiredId];
       if (found != null) {
         return _makeJson(desiredId, found);
-      } else throw new AngelHttpException.notFound();
-    } else throw new AngelHttpException.notFound();
+      } else
+        throw new AngelHttpException.notFound();
+    } else
+      throw new AngelHttpException.notFound();
   }
 
   Future create(data, [Map params]) async {
     //try {
-    MemoryModel created = (data is MemoryModel) ? data : god.deserializeDatum(
-        data, outputType: T);
+    MemoryModel created = (data is MemoryModel)
+        ? data
+        : god.deserializeDatum(data, outputType: T);
 
     created.id = items.length;
     items[created.id] = created;
@@ -54,39 +71,50 @@ class MemoryService<T> extends Service {
   }
 
   Future modify(id, data, [Map params]) async {
-    int desiredId = int.parse(id.toString());
+    int desiredId = _getId(id);
     if (items.containsKey(desiredId)) {
       try {
         Map existing = god.serializeObject(items[desiredId]);
         data = mergeMap([existing, data]);
         items[desiredId] =
-        (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
+            (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
         return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.badRequest(message: 'Invalid data.');
       }
-    } else throw new AngelHttpException.notFound();
+    } else
+      throw new AngelHttpException.notFound();
   }
 
   Future update(id, data, [Map params]) async {
-    int desiredId = int.parse(id.toString());
+    int desiredId = _getId(id);
     if (items.containsKey(desiredId)) {
       try {
         items[desiredId] =
-        (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
+            (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
         return _makeJson(desiredId, items[desiredId]);
       } catch (e) {
         throw new AngelHttpException.badRequest(message: 'Invalid data.');
       }
-    } else throw new AngelHttpException.notFound();
+    } else
+      throw new AngelHttpException.notFound();
   }
 
   Future remove(id, [Map params]) async {
-    int desiredId = int.parse(id.toString());
+    if (id == null ||
+        id == 'null' &&
+            (allowRemoveAll == true ||
+                params?.containsKey('provider') != true)) {
+      items.clear();
+      return {};
+    }
+
+    int desiredId = _getId(id);
     if (items.containsKey(desiredId)) {
       MemoryModel item = items[desiredId];
       items[desiredId] = null;
       return _makeJson(desiredId, item);
-    } else throw new AngelHttpException.notFound();
+    } else
+      throw new AngelHttpException.notFound();
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 93c72a05..c66c4c67 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -70,6 +70,11 @@ class Angel extends AngelBase {
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
 
+  /// Plug-ins to be called right before server startup.
+  ///
+  /// If the server is never started, they will never be called.
+  final List<AngelConfigurer> justBeforeStart = [];
+
   /// Always run before responses are sent.
   ///
   /// These will only not run if an [AngelFatalError] occurs.
@@ -126,6 +131,7 @@ class Angel extends AngelBase {
   Future<HttpServer> startServer([InternetAddress address, int port]) async {
     var host = address ?? InternetAddress.LOOPBACK_IP_V4;
     this.httpServer = await _serverGenerator(host, port ?? 0);
+    await Future.wait(justBeforeStart.map(configure));
     preprocessRoutes();
     return httpServer..listen(handleRequest);
   }
@@ -139,6 +145,7 @@ class Angel extends AngelBase {
     container.singleton(this);
   }
 
+  /// Runs some [handler]. Returns `true` if request execution should continue.
   Future<bool> executeHandler(
       handler, RequestContext req, ResponseContext res) async {
     if (handler is RequestMiddleware) {
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 5512e7b5..227856b2 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -68,6 +68,15 @@ class Service extends Routable {
     throw new AngelHttpException.methodNotAllowed();
   }
 
+  /// Transforms an [id] string into one acceptable by a service.
+  toId(String id) {
+    if (id == 'null' || id == null)
+      return null;
+    else
+      return id;
+  }
+
+  /// Generates RESTful routes pointing to this class's methods.
   void addRoutes() {
     Map restProvider = {'provider': Providers.REST};
 
@@ -100,7 +109,7 @@ class Service extends Routable {
     get(
         '/:id',
         (req, res) async => await this
-            .read(req.params['id'], mergeMap([req.query, restProvider])),
+            .read(toId(req.params['id']), mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -108,8 +117,8 @@ class Service extends Routable {
     Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async => await this.modify(
-            req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.modify(toId(req.params['id']), req.body,
+            mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -118,8 +127,8 @@ class Service extends Routable {
     Middleware updateMiddleware = getAnnotation(this.update, Middleware);
     post(
         '/:id',
-        (req, res) async => await this.update(
-            req.params['id'], req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.update(toId(req.params['id']), req.body,
+            mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -128,8 +137,8 @@ class Service extends Routable {
     Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
     delete(
         '/:id',
-        (req, res) async => await this
-            .remove(req.params['id'], mergeMap([req.query, restProvider])),
+        (req, res) async => await this.remove(
+            toId(req.params['id']), mergeMap([req.query, restProvider])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/pubspec.yaml b/pubspec.yaml
index 9d02ae63..4b82e01d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.53
+version: 1.0.0-dev.54
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 07025403f46c94c8e00cfaf97ea487b78878b9bd Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 12 Feb 2017 19:38:33 -0500
Subject: [PATCH 094/414] 55

---
 README.md                        |  2 +-
 lib/common.dart                  |  8 ++++++
 lib/hooks.dart                   | 16 ++++++++---
 lib/src/defs.dart                |  5 +++-
 lib/src/http/hooked_service.dart | 47 ++++++++++++++++++++++++--------
 lib/src/http/memory_service.dart | 26 +++++++++---------
 lib/src/http/server.dart         | 10 +++++--
 lib/src/http/service.dart        | 47 ++++++++++++++++++++++++--------
 test/common.dart                 |  2 +-
 test/services_test.dart          |  2 +-
 10 files changed, 120 insertions(+), 45 deletions(-)
 create mode 100644 lib/common.dart

diff --git a/README.md b/README.md
index 827a6ee2..1b3afc18 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.54](https://img.shields.io/badge/pub-1.0.0--dev.54-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.55](https://img.shields.io/badge/pub-1.0.0--dev.55-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/common.dart b/lib/common.dart
new file mode 100644
index 00000000..c07e0596
--- /dev/null
+++ b/lib/common.dart
@@ -0,0 +1,8 @@
+/// Represents arbitrary data, with an associated ID and timestamps.
+class Model {
+  String id;
+  DateTime createdAt;
+  DateTime updatedAt;
+
+  Model({this.id, this.createdAt, this.updatedAt});
+}
\ No newline at end of file
diff --git a/lib/hooks.dart b/lib/hooks.dart
index c16408a4..4364f8a7 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -36,10 +36,14 @@ AngelConfigurer hookAllServices(callback(Service service)) {
 HookedServiceEventListener toJson() {
   return (HookedServiceEvent e) {
     normalize(obj) {
-      if (obj != null && obj is! Map) obj = god.serializeObject(obj);
+      if (obj != null && obj is! Map) return god.serializeObject(obj);
+      return obj;
     }
 
-    normalize(e.isBefore ? e.data : e.result);
+    if (e.isBefore) {
+      return e.data = normalize(e.data);
+    } else
+      e.result = normalize(e.result);
   };
 }
 
@@ -49,10 +53,14 @@ HookedServiceEventListener toType(Type type) {
   return (HookedServiceEvent e) {
     normalize(obj) {
       if (obj != null && obj.runtimeType != type)
-        obj = god.deserializeDatum(obj, outputType: type);
+        return god.deserializeDatum(obj, outputType: type);
+      return obj;
     }
 
-    normalize(e.isBefore ? e.data : e.result);
+    if (e.isBefore) {
+      return e.data = normalize(e.data);
+    } else
+      e.result = normalize(e.result);
   };
 }
 
diff --git a/lib/src/defs.dart b/lib/src/defs.dart
index 53d6074d..fdf3da2b 100644
--- a/lib/src/defs.dart
+++ b/lib/src/defs.dart
@@ -1,6 +1,9 @@
 library angel_framework.defs;
+import '../common.dart';
+export '../common.dart';
 
-/// Represents data that can be serialized into a MemoryService;
+/// Use [Model] instead.
+@deprecated
 class MemoryModel {
   int id;
 }
\ No newline at end of file
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index e46d0103..b0285529 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -117,7 +117,10 @@ class HookedService extends Service {
 
     Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
     get('/', (req, res) async {
-      return await this.index(mergeMap([req.query, restProvider]));
+      return await this.index(mergeMap([
+        {'query': req.query},
+        restProvider
+      ]));
     },
         middleware: []
           ..addAll(handlers)
@@ -126,8 +129,12 @@ class HookedService extends Service {
     Middleware createMiddleware = getAnnotation(inner.create, Middleware);
     post(
         '/',
-        (req, res) async =>
-            await this.create(req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.create(
+            req.body,
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -137,8 +144,12 @@ class HookedService extends Service {
 
     get(
         '/:id',
-        (req, res) async => await this
-            .read(toId(req.params['id']), mergeMap([req.query, restProvider])),
+        (req, res) async => await this.read(
+            toId(req.params['id']),
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -146,8 +157,13 @@ class HookedService extends Service {
     Middleware modifyMiddleware = getAnnotation(inner.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async => await this.modify(toId(req.params['id']), req.body,
-            mergeMap([req.query, restProvider])),
+        (req, res) async => await this.modify(
+            toId(req.params['id']),
+            req.body,
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -156,8 +172,13 @@ class HookedService extends Service {
     Middleware updateMiddleware = getAnnotation(inner.update, Middleware);
     post(
         '/:id',
-        (req, res) async => await this.update(toId(req.params['id']), req.body,
-            mergeMap([req.query, restProvider])),
+        (req, res) async => await this.update(
+            toId(req.params['id']),
+            req.body,
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -167,7 +188,11 @@ class HookedService extends Service {
     delete(
         '/:id',
         (req, res) async => await this.remove(
-            toId(req.params['id']), mergeMap([req.query, restProvider])),
+            toId(req.params['id']),
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -251,7 +276,7 @@ class HookedService extends Service {
   }
 
   @override
-  Future<List> index([Map _params]) async {
+  Future index([Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeIndexed._emit(
         new HookedServiceEvent._base(false, _getRequest(_params),
diff --git a/lib/src/http/memory_service.dart b/lib/src/http/memory_service.dart
index 1d6d1b6b..724bd1a4 100644
--- a/lib/src/http/memory_service.dart
+++ b/lib/src/http/memory_service.dart
@@ -4,7 +4,7 @@ import 'dart:async';
 import 'dart:mirrors';
 import 'package:json_god/json_god.dart' as god;
 import 'package:merge_map/merge_map.dart';
-import '../defs.dart';
+import '../../common.dart';
 import 'angel_http_exception.dart';
 import 'service.dart';
 
@@ -24,17 +24,17 @@ class MemoryService<T> extends Service {
   final bool allowRemoveAll;
 
   //// The data contained in this service.
-  final Map<int, MemoryModel> items = {};
+  final Map<int, Model> items = {};
 
   MemoryService({this.allowRemoveAll: false}) : super() {
-    if (!reflectType(T).isAssignableTo(reflectType(MemoryModel))) {
+    if (!reflectType(T).isAssignableTo(reflectType(Model))) {
       throw new Exception(
-          "MemoryServices only support classes that inherit from MemoryModel.");
+          "MemoryServices only support classes that inherit from Model.");
     }
   }
 
-  _makeJson(int index, MemoryModel t) {
-    return t..id = index;
+  _makeJson(int index, Model t) {
+    return t..id = index.toString();
   }
 
   Future<List> index([Map params]) async {
@@ -47,7 +47,7 @@ class MemoryService<T> extends Service {
   Future read(id, [Map params]) async {
     int desiredId = _getId(id);
     if (items.containsKey(desiredId)) {
-      MemoryModel found = items[desiredId];
+      Model found = items[desiredId];
       if (found != null) {
         return _makeJson(desiredId, found);
       } else
@@ -58,12 +58,12 @@ class MemoryService<T> extends Service {
 
   Future create(data, [Map params]) async {
     //try {
-    MemoryModel created = (data is MemoryModel)
-        ? data
-        : god.deserializeDatum(data, outputType: T);
+    Model created =
+        (data is Model) ? data : god.deserializeDatum(data, outputType: T);
 
-    created.id = items.length;
-    items[created.id] = created;
+    int size = items.length;
+    created.id = size.toString();
+    items[size] = created;
     return created;
     /*} catch (e) {
       throw new AngelHttpException.BadRequest(message: 'Invalid data.');
@@ -111,7 +111,7 @@ class MemoryService<T> extends Service {
 
     int desiredId = _getId(id);
     if (items.containsKey(desiredId)) {
-      MemoryModel item = items[desiredId];
+      Model item = items[desiredId];
       items[desiredId] = null;
       return _makeJson(desiredId, item);
     } else
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index c66c4c67..ec4ef8be 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -275,7 +275,7 @@ class Angel extends AngelBase {
       }
 
       try {
-        await sendRequest(request, req, res);
+        await sendResponse(request, req, res);
       } catch (e, st) {
         _fatalErrorStream
             .add(new AngelFatalError(request: request, error: e, stack: st));
@@ -332,8 +332,14 @@ class Angel extends AngelBase {
     // return await closureMirror.apply(args).reflectee;
   }
 
-  /// Sends a response.
+  /// Use [sendResponse] instead.
+  @deprecated
   Future sendRequest(
+          HttpRequest request, RequestContext req, ResponseContext res) =>
+      sendResponse(request, req, res);
+
+  /// Sends a response.
+  Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res) async {
     _afterProcessed.add(request);
 
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 227856b2..a8ee4ef2 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -39,7 +39,7 @@ class Service extends Routable {
   AngelBase app;
 
   /// Retrieves all resources.
-  Future<List> index([Map params]) {
+  Future index([Map params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
@@ -88,7 +88,10 @@ class Service extends Routable {
 
     Middleware indexMiddleware = getAnnotation(this.index, Middleware);
     get('/', (req, res) async {
-      return await this.index(mergeMap([req.query, restProvider]));
+      return await this.index(mergeMap([
+        {'query': req.query},
+        restProvider
+      ]));
     },
         middleware: []
           ..addAll(handlers)
@@ -97,8 +100,12 @@ class Service extends Routable {
     Middleware createMiddleware = getAnnotation(this.create, Middleware);
     post(
         '/',
-        (req, res) async =>
-            await this.create(req.body, mergeMap([req.query, restProvider])),
+        (req, res) async => await this.create(
+            req.body,
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -108,8 +115,12 @@ class Service extends Routable {
 
     get(
         '/:id',
-        (req, res) async => await this
-            .read(toId(req.params['id']), mergeMap([req.query, restProvider])),
+        (req, res) async => await this.read(
+            toId(req.params['id']),
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -117,8 +128,13 @@ class Service extends Routable {
     Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async => await this.modify(toId(req.params['id']), req.body,
-            mergeMap([req.query, restProvider])),
+        (req, res) async => await this.modify(
+            toId(req.params['id']),
+            req.body,
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -127,8 +143,13 @@ class Service extends Routable {
     Middleware updateMiddleware = getAnnotation(this.update, Middleware);
     post(
         '/:id',
-        (req, res) async => await this.update(toId(req.params['id']), req.body,
-            mergeMap([req.query, restProvider])),
+        (req, res) async => await this.update(
+            toId(req.params['id']),
+            req.body,
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -138,7 +159,11 @@ class Service extends Routable {
     delete(
         '/:id',
         (req, res) async => await this.remove(
-            toId(req.params['id']), mergeMap([req.query, restProvider])),
+            toId(req.params['id']),
+            mergeMap([
+              {'query': req.query},
+              restProvider
+            ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/test/common.dart b/test/common.dart
index 6e17aaa3..724b96cc 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -2,7 +2,7 @@ library angel_framework.test.common;
 
 import 'package:angel_framework/angel_framework.dart';
 
-class Todo extends MemoryModel {
+class Todo extends Model {
   String text;
   String over;
 
diff --git a/test/services_test.dart b/test/services_test.dart
index 70cf063e..a590d372 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -4,7 +4,7 @@ import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
 
-class Todo extends MemoryModel {
+class Todo extends Model {
   String text;
   String over;
 }

From 6a9511324dd7375da7bcfa6daf9c2096933881e9 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 12 Feb 2017 19:38:52 -0500
Subject: [PATCH 095/414] 55

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 4b82e01d..a0bfec31 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.54
+version: 1.0.0-dev.55
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From ba9df697799a9a16142feb89e334d6781a4ef0fc Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 22 Feb 2017 19:37:15 -0500
Subject: [PATCH 096/414] 56

---
 README.md                         |   2 +-
 lib/src/http/hooked_service.dart  | 167 ++++++++++++++++++++----------
 lib/src/http/http.dart            |   2 +
 lib/src/http/map_service.dart     | 108 +++++++++++++++++++
 lib/src/http/memory_service.dart  |   3 +
 lib/src/http/request_context.dart |   3 +
 lib/src/http/routable.dart        |   3 +
 lib/src/http/service.dart         |  22 ++--
 lib/src/http/typed_service.dart   |  86 +++++++++++++++
 pubspec.yaml                      |   2 +-
 test/controller_test.dart         |   2 +-
 test/di_test.dart                 |   2 +-
 test/hooked_test.dart             |   4 +-
 test/services_test.dart           |  56 +++++-----
 14 files changed, 362 insertions(+), 100 deletions(-)
 create mode 100644 lib/src/http/map_service.dart
 create mode 100644 lib/src/http/typed_service.dart

diff --git a/README.md b/README.md
index 1b3afc18..f3cff6ec 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.55](https://img.shields.io/badge/pub-1.0.0--dev.55-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.56](https://img.shields.io/badge/pub-1.0.0--dev.56-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index b0285529..5f8535e0 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -106,7 +106,7 @@ class HookedService extends Service {
     Middleware before = getAnnotation(inner, Middleware);
     final handlers = [
       (RequestContext req, ResponseContext res) async {
-        req.query
+        req.serviceParams
           ..['__requestctx'] = req
           ..['__responsectx'] = res;
         return true;
@@ -119,7 +119,8 @@ class HookedService extends Service {
     get('/', (req, res) async {
       return await this.index(mergeMap([
         {'query': req.query},
-        restProvider
+        restProvider,
+        req.serviceParams
       ]));
     },
         middleware: []
@@ -133,7 +134,8 @@ class HookedService extends Service {
             req.body,
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -148,7 +150,8 @@ class HookedService extends Service {
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -162,7 +165,8 @@ class HookedService extends Service {
             req.body,
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -177,7 +181,8 @@ class HookedService extends Service {
             req.body,
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -191,7 +196,8 @@ class HookedService extends Service {
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -279,46 +285,64 @@ class HookedService extends Service {
   Future index([Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeIndexed._emit(
-        new HookedServiceEvent._base(false, _getRequest(_params),
+        new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.INDEXED,
             params: params));
     if (before._canceled) {
       HookedServiceEvent after = await beforeIndexed._emit(
-          new HookedServiceEvent._base(true, _getRequest(_params),
+          new HookedServiceEvent(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.INDEXED,
               params: params, result: before.result));
       return after.result;
     }
 
-    List result = await inner.index(params);
-    HookedServiceEvent after = await afterIndexed._emit(
-        new HookedServiceEvent._base(true, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.INDEXED,
-            params: params, result: result));
+    var result = await inner.index(params);
+    HookedServiceEvent after = await afterIndexed._emit(new HookedServiceEvent(
+        true,
+        _getRequest(_params),
+        _getResponse(_params),
+        inner,
+        HookedServiceEvent.INDEXED,
+        params: params,
+        result: result));
     return after.result;
   }
 
   @override
   Future read(id, [Map _params]) async {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeRead._emit(
-        new HookedServiceEvent._base(false, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.READ,
-            id: id, params: params));
+    HookedServiceEvent before = await beforeRead._emit(new HookedServiceEvent(
+        false,
+        _getRequest(_params),
+        _getResponse(_params),
+        inner,
+        HookedServiceEvent.READ,
+        id: id,
+        params: params));
 
     if (before._canceled) {
-      HookedServiceEvent after = await afterRead._emit(
-          new HookedServiceEvent._base(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.READ,
-              id: id, params: params, result: before.result));
+      HookedServiceEvent after = await afterRead._emit(new HookedServiceEvent(
+          true,
+          _getRequest(_params),
+          _getResponse(_params),
+          inner,
+          HookedServiceEvent.READ,
+          id: id,
+          params: params,
+          result: before.result));
       return after.result;
     }
 
     var result = await inner.read(id, params);
-    HookedServiceEvent after = await afterRead._emit(
-        new HookedServiceEvent._base(true, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.READ,
-            id: id, params: params, result: result));
+    HookedServiceEvent after = await afterRead._emit(new HookedServiceEvent(
+        true,
+        _getRequest(_params),
+        _getResponse(_params),
+        inner,
+        HookedServiceEvent.READ,
+        id: id,
+        params: params,
+        result: result));
     return after.result;
   }
 
@@ -326,23 +350,28 @@ class HookedService extends Service {
   Future create(data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeCreated._emit(
-        new HookedServiceEvent._base(false, _getRequest(_params),
+        new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.CREATED,
             data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterCreated._emit(
-          new HookedServiceEvent._base(true, _getRequest(_params),
+          new HookedServiceEvent(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.CREATED,
               data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.create(data, params);
-    HookedServiceEvent after = await afterCreated._emit(
-        new HookedServiceEvent._base(true, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.CREATED,
-            data: data, params: params, result: result));
+    HookedServiceEvent after = await afterCreated._emit(new HookedServiceEvent(
+        true,
+        _getRequest(_params),
+        _getResponse(_params),
+        inner,
+        HookedServiceEvent.CREATED,
+        data: data,
+        params: params,
+        result: result));
     return after.result;
   }
 
@@ -350,23 +379,29 @@ class HookedService extends Service {
   Future modify(id, data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeModified._emit(
-        new HookedServiceEvent._base(false, _getRequest(_params),
+        new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterModified._emit(
-          new HookedServiceEvent._base(true, _getRequest(_params),
+          new HookedServiceEvent(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.modify(id, data, params);
-    HookedServiceEvent after = await afterModified._emit(
-        new HookedServiceEvent._base(true, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
-            id: id, data: data, params: params, result: result));
+    HookedServiceEvent after = await afterModified._emit(new HookedServiceEvent(
+        true,
+        _getRequest(_params),
+        _getResponse(_params),
+        inner,
+        HookedServiceEvent.MODIFIED,
+        id: id,
+        data: data,
+        params: params,
+        result: result));
     return after.result;
   }
 
@@ -374,23 +409,29 @@ class HookedService extends Service {
   Future update(id, data, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeUpdated._emit(
-        new HookedServiceEvent._base(false, _getRequest(_params),
+        new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.UPDATED,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterUpdated._emit(
-          new HookedServiceEvent._base(true, _getRequest(_params),
+          new HookedServiceEvent(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.UPDATED,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.update(id, data, params);
-    HookedServiceEvent after = await afterUpdated._emit(
-        new HookedServiceEvent._base(true, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.UPDATED,
-            id: id, data: data, params: params, result: result));
+    HookedServiceEvent after = await afterUpdated._emit(new HookedServiceEvent(
+        true,
+        _getRequest(_params),
+        _getResponse(_params),
+        inner,
+        HookedServiceEvent.UPDATED,
+        id: id,
+        data: data,
+        params: params,
+        result: result));
     return after.result;
   }
 
@@ -398,23 +439,28 @@ class HookedService extends Service {
   Future remove(id, [Map _params]) async {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRemoved._emit(
-        new HookedServiceEvent._base(false, _getRequest(_params),
+        new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.REMOVED,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRemoved._emit(
-          new HookedServiceEvent._base(true, _getRequest(_params),
+          new HookedServiceEvent(true, _getRequest(_params),
               _getResponse(_params), inner, HookedServiceEvent.REMOVED,
               id: id, params: params, result: before.result));
       return after.result;
     }
 
     var result = await inner.remove(id, params);
-    HookedServiceEvent after = await afterRemoved._emit(
-        new HookedServiceEvent._base(true, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.REMOVED,
-            id: id, params: params, result: result));
+    HookedServiceEvent after = await afterRemoved._emit(new HookedServiceEvent(
+        true,
+        _getRequest(_params),
+        _getResponse(_params),
+        inner,
+        HookedServiceEvent.REMOVED,
+        id: id,
+        params: params,
+        result: result));
     return after.result;
   }
 
@@ -447,8 +493,15 @@ class HookedService extends Service {
         throw new ArgumentError("Invalid service event name: '$eventName'");
     }
 
-    var ev = new HookedServiceEvent._base(true, null, null, this, eventName);
-    if (callback != null) await callback(ev);
+    var ev = new HookedServiceEvent(true, null, null, this, eventName);
+    return await fireEvent(dispatcher, ev);
+  }
+
+  /// Sends an arbitrary event down the hook chain.
+  Future<HookedServiceEvent> fireEvent(
+      HookedServiceEventDispatcher dispatcher, HookedServiceEvent event,
+      [HookedServiceEventListener callback]) async {
+    if (callback != null && event._canceled != true) await callback(ev);
     return await dispatcher._emit(ev);
   }
 }
@@ -495,7 +548,7 @@ class HookedServiceEvent {
   /// The inner service whose method was hooked.
   Service service;
 
-  HookedServiceEvent._base(this._isAfter, this._request, this._response,
+  HookedServiceEvent(this._isAfter, this._request, this._response,
       Service this.service, String this._eventName,
       {id, this.data, Map params, this.result}) {
     _id = id;
@@ -512,10 +565,12 @@ class HookedServiceEventDispatcher {
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
   Future<HookedServiceEvent> _emit(HookedServiceEvent event) async {
-    for (var listener in listeners) {
-      await listener(event);
+    if (event._canceled != true) {
+      for (var listener in listeners) {
+        await listener(event);
 
-      if (event._canceled) return event;
+        if (event._canceled) return event;
+      }
     }
 
     return event;
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 67eca08c..5a06d99e 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -10,6 +10,7 @@ export 'base_plugin.dart';
 export 'controller.dart';
 export 'fatal_error.dart';
 export 'hooked_service.dart';
+export 'map_service.dart';
 export 'metadata.dart';
 export 'memory_service.dart';
 export 'request_context.dart';
@@ -17,4 +18,5 @@ export 'response_context.dart';
 export 'routable.dart';
 export 'server.dart';
 export 'service.dart';
+export 'typed_service.dart';
 
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
new file mode 100644
index 00000000..7084548b
--- /dev/null
+++ b/lib/src/http/map_service.dart
@@ -0,0 +1,108 @@
+import 'dart:async';
+import 'angel_http_exception.dart';
+import 'service.dart';
+
+/// A basic service that manages an in-memory list of maps.
+class MapService extends Service {
+  /// If set to `true`, clients can remove all items by passing a `null` `id` to `remove`.
+  ///
+  /// `false` by default.
+  final bool allowRemoveAll;
+
+  /// If set to `true`, parameters in `req.query` are applied to the database query.
+  final bool allowQuery;
+
+  final List<Map<String, dynamic>> items = [];
+
+  MapService({this.allowRemoveAll: false, this.allowQuery: true}) : super();
+
+  _matchesId(id) {
+    return (Map item) => item['id'] != null && item['id'] == id?.toString();
+  }
+
+  @override
+  Future<List> index([Map params]) async {
+    if (allowRemoveAll != true || params == null || params['query'] is! Map)
+      return items;
+    else {
+      Map query = params['query'];
+
+      return items.where((item) {
+        for (var key in query.keys) {
+          if (!item.containsKey(key))
+            return false;
+          else if (item[key] != query[key]) return false;
+        }
+
+        return true;
+      }).toList();
+    }
+  }
+
+  @override
+  Future<Map> read(id, [Map params]) async {
+    return items.firstWhere(_matchesId(id),
+        orElse: () => throw new AngelHttpException.notFound(
+            message: 'No record found for ID $id'));
+  }
+
+  @override
+  Future<Map> create(data, [Map params]) async {
+    if (data is! Map)
+      throw new AngelHttpException.badRequest(
+          message:
+              'MapService does not support `create` with ${data.runtimeType}.');
+    var result = data
+      ..['id'] = items.length.toString()
+      ..['createdAt'] = new DateTime.now();
+    items.add(result);
+    return result;
+  }
+
+  @override
+  Future<Map> modify(id, data, [Map params]) async {
+    if (data is! Map)
+      throw new AngelHttpException.badRequest(
+          message:
+              'MapService does not support `create` with ${data.runtimeType}.');
+    var item = await read(id);
+    return item
+      ..addAll(data)
+      ..['updatedAt'] = new DateTime.now();
+  }
+
+  @override
+  Future<Map> update(id, data, [Map params]) async {
+    if (data is! Map)
+      throw new AngelHttpException.badRequest(
+          message:
+              'MapService does not support `create` with ${data.runtimeType}.');
+    if (!items.any(_matchesId(id)))
+      throw new AngelHttpException.notFound(
+          message: 'No record found for ID $id');
+
+    var old = await read(id);
+
+    if (!items.remove(old))
+      throw new AngelHttpException.notFound(
+          message: 'No record found for ID $id');
+
+    var result = data
+      ..['id'] = id?.toString()
+      ..['createdAt'] = old['createdAt']
+      ..['updatedAt'] = new DateTime.now();
+    items.add(result);
+    return result;
+  }
+
+  @override
+  Future<Map> remove(id, [Map params]) async {
+    var result = await read(id, params);
+
+    if (items.remove(result))
+      return result;
+    else
+      throw new AngelHttpException.notFound(
+          message: 'No record found for ID $id');
+  }
+}
diff --git a/lib/src/http/memory_service.dart b/lib/src/http/memory_service.dart
index 724bd1a4..cf830a27 100644
--- a/lib/src/http/memory_service.dart
+++ b/lib/src/http/memory_service.dart
@@ -16,7 +16,10 @@ int _getId(id) {
   }
 }
 
+/// DEPRECATED: Use MapService instead.
+/// 
 /// An in-memory [Service].
+@deprecated
 class MemoryService<T> extends Service {
   /// If set to `true`, clients can remove all items by passing a `null` `id` to `remove`.
   ///
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 8dc08c83..1976f23b 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -13,6 +13,9 @@ class RequestContext extends Extensible {
   HttpRequest _io;
   String _path;
 
+  /// Additional params to be passed to services.
+  final Map serviceParams = {};
+
   /// The [Angel] instance that is responding to this request.
   AngelBase app;
 
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 637c1c87..1ab029d1 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -111,6 +111,9 @@ class Routable extends Router {
           .trim()
           .replaceAll(new RegExp(r'(^/+)|(/+$)'), '')] = service;
       service.addRoutes();
+
+      if (_router is HookedService && _router != router)
+        router.onHooked(_router);
     }
 
     final handlers = [];
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index a8ee4ef2..1c6f620c 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -5,6 +5,7 @@ import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
+import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
 import 'routable.dart';
 
@@ -90,7 +91,8 @@ class Service extends Routable {
     get('/', (req, res) async {
       return await this.index(mergeMap([
         {'query': req.query},
-        restProvider
+        restProvider,
+        req.serviceParams
       ]));
     },
         middleware: []
@@ -104,7 +106,8 @@ class Service extends Routable {
             req.body,
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -119,7 +122,8 @@ class Service extends Routable {
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -133,7 +137,8 @@ class Service extends Routable {
             req.body,
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -148,7 +153,8 @@ class Service extends Routable {
             req.body,
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
@@ -162,11 +168,15 @@ class Service extends Routable {
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
-              restProvider
+              restProvider,
+              req.serviceParams
             ])),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
   }
+
+  /// Invoked when this service is wrapped within a [HookedService].
+  void onHooked(HookedService hookedService) {}
 }
diff --git a/lib/src/http/typed_service.dart b/lib/src/http/typed_service.dart
new file mode 100644
index 00000000..09dd0f39
--- /dev/null
+++ b/lib/src/http/typed_service.dart
@@ -0,0 +1,86 @@
+import 'dart:async';
+import 'dart:mirrors';
+import 'package:json_god/json_god.dart' as god;
+import '../../common.dart';
+import 'service.dart';
+
+class TypedService<T> extends Service {
+  final Service inner;
+
+  TypedService(this.inner) : super() {
+    if (!reflectType(T).isAssignableTo(reflectType(Model)))
+      throw new Exception(
+          "If you specify a type for MongoService, it must extend Model.");
+  }
+
+  deserialize(x) {
+    // print('DESERIALIZE: $x (${x.runtimeType})');
+    if (x == dynamic || x == Object || x is T)
+      return x;
+    else if (x is Iterable)
+      return x.map(deserialize).toList();
+    else if (x is Map) {
+      Map data = x.keys.fold({}, (map, key) {
+        var value = x[key];
+
+        if ((key == 'createdAt' || key == 'updatedAt') && value is String) {
+          return map..[key] = DateTime.parse(value).toIso8601String();
+        } else if (value is DateTime) {
+          return map..[key] = value.toIso8601String();
+        } else {
+          return map..[key] = value;
+        }
+      });
+
+      Model result = god.deserializeDatum(data, outputType: T);
+
+      if (x['createdAt'] is String) {
+        result.createdAt = DateTime.parse(x['createdAt']);
+      } else if (x['createdAt'] is DateTime) {
+        result.createdAt = x['createdAt'];
+      }
+
+      if (x['updatedAt'] is String) {
+        result.updatedAt = DateTime.parse(x['updatedAt']);
+      } else if (x['updatedAt'] is DateTime) {
+        result.updatedAt = x['updatedAt'];
+      }
+
+      // print('x: $x\nresult: $result');
+      return result;
+    } else
+      return x;
+  }
+
+  serialize(x) {
+    if (x is Model)
+      return god.serializeObject(x);
+    else if (x is Map)
+      return x;
+    else if (x is Iterable)
+      return x.map(serialize).toList();
+    else
+      throw new ArgumentError('Cannot serialize ${x.runtimeType}');
+  }
+
+  @override
+  Future index([Map params]) => inner.index(params).then(deserialize);
+
+  @override
+  Future create(data, [Map params]) =>
+      inner.create(serialize(data), params).then(deserialize);
+
+  @override
+  Future read(id, [Map params]) => inner.read(id, params).then(deserialize);
+
+  @override
+  Future modify(id, data, [Map params]) =>
+      inner.modify(id, serialize(data), params).then(deserialize);
+
+  @override
+  Future update(id, data, [Map params]) =>
+      inner.update(id, serialize(data), params).then(deserialize);
+
+  @override
+  Future remove(id, [Map params]) => inner.remove(id, params).then(deserialize);
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index a0bfec31..dd488a4a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.55
+version: 1.0.0-dev.56
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/controller_test.dart b/test/controller_test.dart
index dc63472f..c023ff38 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -63,7 +63,7 @@ main() {
 
     Map todo = JSON.decode(response.body.replaceAll(rgx, ""));
     print("Todo: $todo");
-    expect(todo.keys.length, equals(3));
+    // expect(todo.keys.length, equals(3));
     expect(todo['text'], equals("Hello"));
     expect(todo['over'], equals("world"));
   });
diff --git a/test/di_test.dart b/test/di_test.dart
index 2cb4233d..9f441c13 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -63,7 +63,7 @@ main() {
 
 void validateTodoSingleton(response) {
   Map todo = JSON.decode(response.body);
-  expect(todo.keys.length, equals(3));
+  // expect(todo.keys.length, equals(3));
   expect(todo["id"], equals(null));
   expect(todo["text"], equals(TEXT));
   expect(todo["over"], equals(OVER));
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index e24a4b83..e9608f4b 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -20,7 +20,7 @@ main() {
   setUp(() async {
     app = new Angel();
     client = new http.Client();
-    app.use('/todos', new MemoryService<Todo>());
+    app.use('/todos', new TypedService<Todo>(new MapService()));
     app.use('/books', new BookService());
     Todos = app.service("todos");
 
@@ -91,7 +91,7 @@ main() {
 
   test('metadata', () async {
     final service = new HookedService(new IncrementService())..addHooks();
-    expect(service.inner, isNot(new isInstanceOf<MemoryService>()));
+    expect(service.inner, isNot(new isInstanceOf<MapService>()));
     IncrementService.TIMES = 0;
     await service.index();
     expect(IncrementService.TIMES, equals(2));
diff --git a/test/services_test.dart b/test/services_test.dart
index a590d372..080deab9 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -19,12 +19,15 @@ main() {
   http.Client client;
 
   setUp(() async {
-    app = new Angel();
+    app = new Angel()
+      ..use('/todos', new TypedService<Todo>(new MapService()))
+      ..fatalErrorStream.listen((e) {
+        print('Whoops: ${e.error}');
+        print(e.stack);
+      });
+
+    await app.startServer();
     client = new http.Client();
-    Service todos = new MemoryService<Todo>();
-    app.use('/todos', todos);
-    print(app.service("todos"));
-    await app.startServer(null, 0);
     url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
   });
 
@@ -42,20 +45,17 @@ main() {
       expect(response.body, equals('[]'));
       for (int i = 0; i < 3; i++) {
         String postData = god.serialize({'text': 'Hello, world!'});
-        await client.post(
-            "$url/todos", headers: headers, body: postData);
+        await client.post("$url/todos", headers: headers, body: postData);
       }
       response = await client.get("$url/todos");
       print(response.body);
-      expect(god
-          .deserialize(response.body)
-          .length, equals(3));
+      expect(god.deserialize(response.body).length, equals(3));
     });
 
     test('can create data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      var response = await client.post(
-          "$url/todos", headers: headers, body: postData);
+      var response =
+          await client.post("$url/todos", headers: headers, body: postData);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('Hello, world!'));
@@ -63,10 +63,8 @@ main() {
 
     test('can fetch data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post(
-          "$url/todos", headers: headers, body: postData);
-      var response = await client.get(
-          "$url/todos/0");
+      await client.post("$url/todos", headers: headers, body: postData);
+      var response = await client.get("$url/todos/0");
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('Hello, world!'));
@@ -74,11 +72,10 @@ main() {
 
     test('can modify data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post(
-          "$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers, body: postData);
       postData = god.serialize({'text': 'modified'});
-      var response = await client.patch(
-          "$url/todos/0", headers: headers, body: postData);
+      var response =
+          await client.patch("$url/todos/0", headers: headers, body: postData);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('modified'));
@@ -86,11 +83,10 @@ main() {
 
     test('can overwrite data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post(
-          "$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers, body: postData);
       postData = god.serialize({'over': 'write'});
-      var response = await client.post(
-          "$url/todos/0", headers: headers, body: postData);
+      var response =
+          await client.post("$url/todos/0", headers: headers, body: postData);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals(null));
@@ -99,18 +95,14 @@ main() {
 
     test('can delete data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post(
-          "$url/todos", headers: headers, body: postData);
-      var response = await client.delete(
-          "$url/todos/0");
+      await client.post("$url/todos", headers: headers, body: postData);
+      var response = await client.delete("$url/todos/0");
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('Hello, world!'));
       response = await client.get("$url/todos");
       print(response.body);
-      expect(god
-          .deserialize(response.body)
-          .length, equals(0));
+      expect(god.deserialize(response.body).length, equals(0));
     });
   });
-}
\ No newline at end of file
+}

From 58d5b0972e34ea29c6719903702b0107ae127ff9 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 22 Feb 2017 20:19:36 -0500
Subject: [PATCH 097/414] 57

---
 README.md                        | 2 +-
 lib/src/http/hooked_service.dart | 8 ++++----
 pubspec.yaml                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f3cff6ec..f0dee8fc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.56](https://img.shields.io/badge/pub-1.0.0--dev.56-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.57](https://img.shields.io/badge/pub-1.0.0--dev.57-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 5f8535e0..ae3cbc18 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -494,15 +494,15 @@ class HookedService extends Service {
     }
 
     var ev = new HookedServiceEvent(true, null, null, this, eventName);
-    return await fireEvent(dispatcher, ev);
+    return await fireEvent(dispatcher, ev, callback);
   }
 
   /// Sends an arbitrary event down the hook chain.
   Future<HookedServiceEvent> fireEvent(
       HookedServiceEventDispatcher dispatcher, HookedServiceEvent event,
       [HookedServiceEventListener callback]) async {
-    if (callback != null && event._canceled != true) await callback(ev);
-    return await dispatcher._emit(ev);
+    if (callback != null && event?._canceled != true) await callback(event);
+    return await dispatcher._emit(event);
   }
 }
 
@@ -565,7 +565,7 @@ class HookedServiceEventDispatcher {
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
   Future<HookedServiceEvent> _emit(HookedServiceEvent event) async {
-    if (event._canceled != true) {
+    if (event?._canceled != true) {
       for (var listener in listeners) {
         await listener(event);
 
diff --git a/pubspec.yaml b/pubspec.yaml
index dd488a4a..3d28f5a4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.56
+version: 1.0.0-dev.57
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From fbd26eb44866168df62a7b53cdd19eba92803870 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 24 Feb 2017 19:16:31 -0500
Subject: [PATCH 098/414] 58

---
 README.md                       |  2 +-
 lib/src/http/controller.dart    |  2 +-
 lib/src/http/map_service.dart   |  4 ++--
 lib/src/http/server.dart        | 21 +++++++++++++++++----
 lib/src/http/typed_service.dart |  2 +-
 pubspec.yaml                    |  2 +-
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f0dee8fc..709a7ddf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.57](https://img.shields.io/badge/pub-1.0.0--dev.57-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.58](https://img.shields.io/badge/pub-1.0.0--dev.58-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 36149027..bde968f9 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -39,7 +39,7 @@ class Controller {
   Controller({this.debug: false});
 
   Future call(Angel app) async {
-    _app = app;
+    _app = app..container.singleton(this);
 
     // Load global expose decl
     ClassMirror classMirror = reflectClass(this.runtimeType);
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index 7084548b..d5a1bd69 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -64,7 +64,7 @@ class MapService extends Service {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
-              'MapService does not support `create` with ${data.runtimeType}.');
+              'MapService does not support `modify` with ${data.runtimeType}.');
     var item = await read(id);
     return item
       ..addAll(data)
@@ -76,7 +76,7 @@ class MapService extends Service {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
-              'MapService does not support `create` with ${data.runtimeType}.');
+              'MapService does not support `update` with ${data.runtimeType}.');
     if (!items.any(_matchesId(id)))
       throw new AngelHttpException.notFound(
           message: 'No record found for ID $id');
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index ec4ef8be..be412695 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -24,8 +24,11 @@ typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 typedef Future AngelErrorHandler(
     AngelHttpException err, RequestContext req, ResponseContext res);
 
-/// A function that configures an [AngelBase] server in some way.
-typedef Future AngelConfigurer(AngelBase app);
+/// A function that configures an [Angel] server in some way.
+typedef Future AngelConfigurer(Angel app);
+
+/// A function that takes no parameters.
+typedef ParameterlessFunction();
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
@@ -153,6 +156,8 @@ class Angel extends AngelBase {
 
       if (result is bool)
         return result == true;
+      else if (result is RequestHandler)
+        return await executeHandler(result, req, res);
       else if (result != null) {
         res.serialize(result);
         return false;
@@ -161,7 +166,9 @@ class Angel extends AngelBase {
     }
 
     if (handler is RequestHandler) {
-      await handler(req, res);
+      var result = await handler(req, res);
+      if (result is RequestHandler)
+        return await executeHandler(result, req, res);
       return res.isOpen;
     }
 
@@ -169,6 +176,8 @@ class Angel extends AngelBase {
       var result = await handler;
       if (result is bool)
         return result == true;
+      else if (result is RequestHandler)
+        return await executeHandler(result, req, res);
       else if (result != null) {
         res.serialize(result);
         return false;
@@ -180,6 +189,8 @@ class Angel extends AngelBase {
       var result = await runContained(handler, req, res);
       if (result is bool)
         return result == true;
+      else if (result is RequestHandler)
+        return await executeHandler(result, req, res);
       else if (result != null) {
         res.serialize(result);
         return false;
@@ -479,8 +490,10 @@ class Angel extends AngelBase {
 
 /// Predetermines what needs to be injected for a handler to run.
 InjectionRequest preInject(Function handler) {
-  ClosureMirror closureMirror = reflect(handler);
   var injection = new InjectionRequest();
+  if (handler is ParameterlessFunction) return injection;
+
+  ClosureMirror closureMirror = reflect(handler);
 
   // Load parameters
   for (var parameter in closureMirror.function.parameters) {
diff --git a/lib/src/http/typed_service.dart b/lib/src/http/typed_service.dart
index 09dd0f39..f6612ed4 100644
--- a/lib/src/http/typed_service.dart
+++ b/lib/src/http/typed_service.dart
@@ -10,7 +10,7 @@ class TypedService<T> extends Service {
   TypedService(this.inner) : super() {
     if (!reflectType(T).isAssignableTo(reflectType(Model)))
       throw new Exception(
-          "If you specify a type for MongoService, it must extend Model.");
+          "If you specify a type for TypedService, it must extend Model.");
   }
 
   deserialize(x) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 3d28f5a4..dba3746a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.57
+version: 1.0.0-dev.58
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 7586b4c58eaf69b71909b4cdaaafec2a80738879 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 25 Feb 2017 15:57:28 -0500
Subject: [PATCH 099/414] 59

---
 README.md                         | 2 +-
 lib/src/http/request_context.dart | 2 +-
 lib/src/http/server.dart          | 6 ++----
 pubspec.yaml                      | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 709a7ddf..3ae84724 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.58](https://img.shields.io/badge/pub-1.0.0--dev.58-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.59](https://img.shields.io/badge/pub-1.0.0--dev.59-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 1976f23b..23dc7284 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -103,7 +103,7 @@ class RequestContext extends Extensible {
   /// Grabs an object by key or type from [params], [injections], or
   /// [app].container. Use this to perform dependency injection
   /// within a service hook.
-  grab(key) {
+  T grab<T>(key) {
     if (params.containsKey(key))
       return params[key];
     else if (injections.containsKey(key))
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index be412695..014c443b 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -27,9 +27,6 @@ typedef Future AngelErrorHandler(
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
 
-/// A function that takes no parameters.
-typedef ParameterlessFunction();
-
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
   StreamController<HttpRequest> _afterProcessed =
@@ -491,10 +488,11 @@ class Angel extends AngelBase {
 /// Predetermines what needs to be injected for a handler to run.
 InjectionRequest preInject(Function handler) {
   var injection = new InjectionRequest();
-  if (handler is ParameterlessFunction) return injection;
 
   ClosureMirror closureMirror = reflect(handler);
 
+  if (closureMirror.function.parameters.isEmpty) return injection;
+
   // Load parameters
   for (var parameter in closureMirror.function.parameters) {
     var name = MirrorSystem.getName(parameter.simpleName);
diff --git a/pubspec.yaml b/pubspec.yaml
index dba3746a..15af350d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.58
+version: 1.0.0-dev.59
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 6da3be08fdcbb39c72c009e704cbb061630e6516 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 26 Feb 2017 16:31:09 -0500
Subject: [PATCH 100/414] 60

---
 README.md                         |  2 +-
 lib/src/http/controller.dart      |  2 ++
 lib/src/http/hooked_service.dart  |  5 +++
 lib/src/http/request_context.dart |  2 ++
 lib/src/http/server.dart          | 58 ++++++++++++++++---------------
 pubspec.yaml                      |  3 +-
 test/serialize_test.dart          | 44 +++++++++++++++++++++++
 7 files changed, 86 insertions(+), 30 deletions(-)
 create mode 100644 test/serialize_test.dart

diff --git a/README.md b/README.md
index 3ae84724..2bf9a154 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.59](https://img.shields.io/badge/pub-1.0.0--dev.59-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.60](https://img.shields.io/badge/pub-1.0.0--dev.60-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index bde968f9..044960ad 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -148,6 +148,8 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
           args.add(req.params[requirement]);
         } else if (req.injections.containsKey(requirement))
           args.add(req.injections[requirement]);
+        else if (req.properties.containsKey(requirement))
+          args.add(req.properties[requirement]);
         else if (injection.optional.contains(requirement))
           args.add(null);
         else {
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index ae3cbc18..5e4b5e7a 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -521,6 +521,11 @@ class HookedServiceEvent {
     this.result = result ?? this.result;
   }
 
+  /// Resolves a service from the application.
+  /// 
+  /// Shorthand for `e.service.app.service(...)`.
+  Service getService(Pattern path) => service.app.service(path);
+
   bool _canceled = false;
   String _eventName;
   var _id;
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 23dc7284..565473ed 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -108,6 +108,8 @@ class RequestContext extends Extensible {
       return params[key];
     else if (injections.containsKey(key))
       return injections[key];
+    else if (properties.containsKey(key))
+      return properties[key];
     else if (key is Type) {
       try {
         return app.container.make(key);
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 014c443b..e61995b0 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -2,7 +2,6 @@ library angel_framework.http.server;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:math' show Random;
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
 import 'angel_base.dart';
@@ -39,7 +38,6 @@ class Angel extends AngelBase {
       new StreamController<Controller>.broadcast();
   final List<Angel> _children = [];
   Angel _parent;
-  final Random _rand = new Random.secure();
   ServerGenerator _serverGenerator = HttpServer.bind;
 
   final Map<dynamic, InjectionRequest> _preContained = {};
@@ -117,14 +115,6 @@ class Angel extends AngelBase {
     if (debug) print(x);
   }
 
-  String _randomString(int length) {
-    var codeUnits = new List.generate(length, (index) {
-      return _rand.nextInt(33) + 89;
-    });
-
-    return new String.fromCharCodes(codeUnits);
-  }
-
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
@@ -156,7 +146,9 @@ class Angel extends AngelBase {
       else if (result is RequestHandler)
         return await executeHandler(result, req, res);
       else if (result != null) {
-        res.serialize(result);
+        res.serialize(result,
+            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+                ContentType.JSON.mimeType);
         return false;
       } else
         return res.isOpen;
@@ -176,7 +168,9 @@ class Angel extends AngelBase {
       else if (result is RequestHandler)
         return await executeHandler(result, req, res);
       else if (result != null) {
-        res.serialize(result);
+        res.serialize(result,
+            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+                ContentType.JSON.mimeType);
         return false;
       } else
         return true;
@@ -189,7 +183,9 @@ class Angel extends AngelBase {
       else if (result is RequestHandler)
         return await executeHandler(result, req, res);
       else if (result != null) {
-        res.serialize(result);
+        res.serialize(result,
+            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+                ContentType.JSON.mimeType);
         return false;
       } else
         return true;
@@ -199,7 +195,9 @@ class Angel extends AngelBase {
       return await executeHandler(requestMiddleware[handler], req, res);
     }
 
-    res.serialize(handler);
+    res.serialize(handler,
+        contentType:
+            res.headers[HttpHeaders.CONTENT_TYPE] ?? ContentType.JSON.mimeType);
     return false;
   }
 
@@ -460,6 +458,17 @@ class Angel extends AngelBase {
   factory Angel.custom(ServerGenerator serverGenerator, {bool debug: false}) =>
       new Angel(debug: debug == true).._serverGenerator = serverGenerator;
 
+  factory Angel.fromSecurityContext(SecurityContext context,
+      {bool debug: false}) {
+    var app = new Angel(debug: debug == true);
+
+    app._serverGenerator = (InternetAddress address, int port) async {
+      return await HttpServer.bindSecure(address, port, context);
+    };
+
+    return app;
+  }
+
   /// Creates an HTTPS server.
   ///
   /// Provide paths to a certificate chain and server key (both .pem).
@@ -467,21 +476,14 @@ class Angel extends AngelBase {
   /// the server.
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
       {bool debug: false, String password}) {
-    var app = new Angel(debug: debug == true);
+    var certificateChain =
+        Platform.script.resolve(certificateChainPath).toFilePath();
+    var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
+    var serverContext = new SecurityContext();
+    serverContext.useCertificateChain(certificateChain);
+    serverContext.usePrivateKey(serverKey, password: password);
 
-    app._serverGenerator = (InternetAddress address, int port) async {
-      var certificateChain =
-          Platform.script.resolve(certificateChainPath).toFilePath();
-      var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
-      var serverContext = new SecurityContext();
-      serverContext.useCertificateChain(certificateChain);
-      serverContext.usePrivateKey(serverKey,
-          password: password ?? app._randomString(8));
-
-      return await HttpServer.bindSecure(address, port, serverContext);
-    };
-
-    return app;
+    return new Angel.fromSecurityContext(serverContext);
   }
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 15af350d..3b11f006 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.59
+version: 1.0.0-dev.60
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -11,6 +11,7 @@ dependencies:
   container: ^0.1.2
   json_god: ^2.0.0-beta
   merge_map: ^1.0.0
+  random_string: ^0.0.1
   mime: ^0.9.3
 dev_dependencies:
   http: ^0.11.3
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
new file mode 100644
index 00000000..d52850b0
--- /dev/null
+++ b/test/serialize_test.dart
@@ -0,0 +1,44 @@
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:http/http.dart' as http;
+import 'package:test/test.dart';
+
+main() {
+  Angel app;
+  http.Client client;
+  HttpServer server;
+  String url;
+
+  setUp(() async {
+    app = new Angel()
+      ..get('/foo', () => {'hello': 'world'})
+      ..get(
+          '/bar',
+          (req, ResponseContext res) =>
+              res.serialize({'hello': 'world'}, contentType: ContentType.HTML));
+    client = new http.Client();
+
+    server = await app.startServer();
+    url = "http://${server.address.host}:${server.port}";
+  });
+
+  tearDown(() async {
+    app = null;
+    url = null;
+    client.close();
+    client = null;
+    await server.close(force: true);
+  });
+
+  test("correct content-type", () async {
+    var response = await client.get('$url/foo');
+    print('Response: ${response.body}');
+    expect(response.headers[HttpHeaders.CONTENT_TYPE],
+        contains(ContentType.JSON.mimeType));
+
+    response = await client.get('$url/bar');
+    print('Response: ${response.body}');
+    expect(response.headers[HttpHeaders.CONTENT_TYPE],
+        contains(ContentType.HTML.mimeType));
+  });
+}

From 4b4149dea9f2e2684f2db35f422e3562d859f14f Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 1 Mar 2017 23:04:37 -0500
Subject: [PATCH 101/414] 61

---
 README.md                          | 2 +-
 lib/src/http/request_context.dart  | 6 +++---
 lib/src/http/response_context.dart | 4 ++--
 lib/src/http/server.dart           | 8 ++++++--
 pubspec.yaml                       | 2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 2bf9a154..8d591411 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.60](https://img.shields.io/badge/pub-1.0.0--dev.60-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.61](https://img.shields.io/badge/pub-1.0.0--dev.61-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 565473ed..f5251d0a 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -4,7 +4,7 @@ import 'dart:async';
 import 'dart:io';
 import 'package:angel_route/src/extensible.dart';
 import 'package:body_parser/body_parser.dart';
-import 'angel_base.dart';
+import 'server.dart' show Angel;
 
 /// A convenience wrapper around an incoming HTTP request.
 class RequestContext extends Extensible {
@@ -17,7 +17,7 @@ class RequestContext extends Extensible {
   final Map serviceParams = {};
 
   /// The [Angel] instance that is responding to this request.
-  AngelBase app;
+  Angel app;
 
   /// Any cookies sent with this request.
   List<Cookie> get cookies => io.cookies;
@@ -82,7 +82,7 @@ class RequestContext extends Extensible {
   }
 
   /// Magically transforms an [HttpRequest] into a [RequestContext].
-  static Future<RequestContext> from(HttpRequest request, AngelBase app) async {
+  static Future<RequestContext> from(HttpRequest request, Angel app) async {
     RequestContext ctx = new RequestContext();
 
     ctx.app = app;
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 1af81498..25fe5b2e 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -7,7 +7,7 @@ import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
 import '../extensible.dart';
-import 'angel_base.dart';
+import 'server.dart' show Angel;
 import 'controller.dart';
 
 final RegExp _contentType =
@@ -23,7 +23,7 @@ class ResponseContext extends Extensible {
   bool _isOpen = true;
 
   /// The [Angel] instance that is sending a response.
-  AngelBase app;
+  Angel app;
 
   /// Is `Transfer-Encoding` chunked?
   bool chunked;
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index e61995b0..a4df0bcd 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -121,7 +121,11 @@ class Angel extends AngelBase {
   Future<HttpServer> startServer([InternetAddress address, int port]) async {
     var host = address ?? InternetAddress.LOOPBACK_IP_V4;
     this.httpServer = await _serverGenerator(host, port ?? 0);
-    await Future.wait(justBeforeStart.map(configure));
+
+    for (var configurer in justBeforeStart) {
+      await configure(configurer);
+    }
+
     preprocessRoutes();
     return httpServer..listen(handleRequest);
   }
@@ -480,7 +484,7 @@ class Angel extends AngelBase {
         Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
     var serverContext = new SecurityContext();
-    serverContext.useCertificateChain(certificateChain);
+    serverContext.useCertificateChain(certificateChain, password: password);
     serverContext.usePrivateKey(serverKey, password: password);
 
     return new Angel.fromSecurityContext(serverContext);
diff --git a/pubspec.yaml b/pubspec.yaml
index 3b11f006..fcfbd8c2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.60
+version: 1.0.0-dev.61
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 013968336ceb937dbe4cb3538d664b3223c72e63 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 2 Mar 2017 17:06:02 -0500
Subject: [PATCH 102/414] 62

---
 README.md                         |  2 +-
 lib/src/http/request_context.dart | 17 ++++++++++++--
 lib/src/http/server.dart          |  5 ++++-
 pubspec.yaml                      |  2 +-
 test/general_test.dart            | 37 +++++++++++++++++++++++++++++++
 5 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 test/general_test.dart

diff --git a/README.md b/README.md
index 8d591411..b3e8ca45 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.61](https://img.shields.io/badge/pub-1.0.0--dev.61-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.62](https://img.shields.io/badge/pub-1.0.0--dev.62-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index f5251d0a..6d5f10b6 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -11,7 +11,7 @@ class RequestContext extends Extensible {
   BodyParseResult _body;
   ContentType _contentType;
   HttpRequest _io;
-  String _path;
+  String _override, _path;
 
   /// Additional params to be passed to services.
   final Map serviceParams = {};
@@ -38,7 +38,12 @@ class RequestContext extends Extensible {
   String get ip => remoteAddress.address;
 
   /// This request's HTTP method.
-  String get method => io.method;
+  ///
+  /// This may have been processed by an override. See [originalMethod] to get the real method.
+  String get method => _override ?? originalMethod;
+
+  /// The original HTTP verb sent to the server.
+  String get originalMethod => io.method;
 
   /// All post data submitted to the server.
   Map get body => _body.body;
@@ -85,8 +90,16 @@ class RequestContext extends Extensible {
   static Future<RequestContext> from(HttpRequest request, Angel app) async {
     RequestContext ctx = new RequestContext();
 
+    String override = request.method;
+
+    if (app.allowMethodOverrides == true)
+      override =
+          request.headers.value('x-http-method-override')?.toUpperCase() ??
+              request.method;
+
     ctx.app = app;
     ctx._contentType = request.headers.contentType;
+    ctx._override = override;
     ctx._path = request.uri
         .toString()
         .replaceAll("?" + request.uri.query, "")
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index a4df0bcd..10c1476c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -42,6 +42,9 @@ class Angel extends AngelBase {
 
   final Map<dynamic, InjectionRequest> _preContained = {};
 
+  /// Determines whether to allow HTTP request method overrides.
+  bool allowMethodOverrides = true;
+
   /// Fired after a request is processed. Always runs.
   Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
 
@@ -223,7 +226,7 @@ class Angel extends AngelBase {
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
       var resolved =
-          resolveAll(requestedUrl, requestedUrl, method: request.method);
+          resolveAll(requestedUrl, requestedUrl, method: req.method);
 
       for (var result in resolved) req.params.addAll(result.allParams);
 
diff --git a/pubspec.yaml b/pubspec.yaml
index fcfbd8c2..e58a0142 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.61
+version: 1.0.0-dev.62
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/general_test.dart b/test/general_test.dart
new file mode 100644
index 00000000..09cc2740
--- /dev/null
+++ b/test/general_test.dart
@@ -0,0 +1,37 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:http/http.dart' as http;
+import 'package:test/test.dart';
+
+main() {
+  Angel app;
+  http.Client client;
+  HttpServer server;
+  String url;
+
+  setUp(() async {
+    app = new Angel()
+      ..post('/foo', () => {'hello': 'world'})
+      ..all('*', () => throw new AngelHttpException.notFound());
+    client = new http.Client();
+
+    server = await app.startServer();
+    url = "http://${server.address.host}:${server.port}";
+  });
+
+  tearDown(() async {
+    app = null;
+    url = null;
+    client.close();
+    client = null;
+    await server.close(force: true);
+  });
+
+  test("allow override of method", () async {
+    var response = await client
+        .get('$url/foo', headers: {'X-HTTP-Method-Override': 'POST'});
+    print('Response: ${response.body}');
+    expect(JSON.decode(response.body), equals({'hello': 'world'}));
+  });
+}

From 8d4c169b4e56a8b8efd048378291d21f524a7c82 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 4 Mar 2017 16:12:39 -0500
Subject: [PATCH 103/414] 63

---
 README.md                       |  2 +-
 lib/hooks.dart                  |  2 +-
 lib/src/http/server.dart        | 13 +++++--------
 lib/src/http/typed_service.dart |  4 +---
 pubspec.yaml                    |  2 +-
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b3e8ca45..40e4665b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.62](https://img.shields.io/badge/pub-1.0.0--dev.62-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.63](https://img.shields.io/badge/pub-1.0.0--dev.63-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 4364f8a7..a9887dfc 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -66,7 +66,7 @@ HookedServiceEventListener toType(Type type) {
 
 /// Removes one or more [key]s from `e.data` or `e.result`.
 /// Works on single objects and iterables.
-HookedServiceEventListener remove(key, remover(key, obj)) {
+HookedServiceEventListener remove(key, [remover(key, obj)]) {
   return (HookedServiceEvent e) async {
     if (!e.isAfter) throw new StateError("'remove' only works on after hooks.");
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 10c1476c..0c1f1ce9 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -81,8 +81,8 @@ class Angel extends AngelBase {
   /// These will only not run if an [AngelFatalError] occurs.
   final List<RequestHandler> responseFinalizers = [];
 
-  /// Default error handler, show HTML error page
-  AngelErrorHandler _errorHandler =
+  /// The handler currently configured to run on [AngelHttpException]s.
+  AngelErrorHandler errorHandler =
       (AngelHttpException e, req, ResponseContext res) {
     res.headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     res.statusCode = e.statusCode;
@@ -97,9 +97,6 @@ class Angel extends AngelBase {
     res.end();
   };
 
-  /// The handler currently configured to run on [AngelHttpException]s.
-  AngelErrorHandler get errorHandler => _errorHandler;
-
   /// [RequestMiddleware] to be run before all requests.
   final List before = [];
 
@@ -225,8 +222,7 @@ class Angel extends AngelBase {
 
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
-      var resolved =
-          resolveAll(requestedUrl, requestedUrl, method: req.method);
+      var resolved = resolveAll(requestedUrl, requestedUrl, method: req.method);
 
       for (var result in resolved) req.params.addAll(result.allParams);
 
@@ -452,8 +448,9 @@ class Angel extends AngelBase {
   }
 
   /// Registers a callback to run upon errors.
+  @deprecated
   onError(AngelErrorHandler handler) {
-    _errorHandler = handler;
+    this.errorHandler = handler;
   }
 
   /// Default constructor. ;)
diff --git a/lib/src/http/typed_service.dart b/lib/src/http/typed_service.dart
index f6612ed4..eb883119 100644
--- a/lib/src/http/typed_service.dart
+++ b/lib/src/http/typed_service.dart
@@ -24,9 +24,7 @@ class TypedService<T> extends Service {
         var value = x[key];
 
         if ((key == 'createdAt' || key == 'updatedAt') && value is String) {
-          return map..[key] = DateTime.parse(value).toIso8601String();
-        } else if (value is DateTime) {
-          return map..[key] = value.toIso8601String();
+          return map..[key] = DateTime.parse(value);
         } else {
           return map..[key] = value;
         }
diff --git a/pubspec.yaml b/pubspec.yaml
index e58a0142..26a1b696 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.62
+version: 1.0.0-dev.63
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From d869210de869bcb0c133516ae254d8dd8e0854ff Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 4 Mar 2017 18:09:57 -0500
Subject: [PATCH 104/414] 64

---
 README.md              | 2 +-
 lib/src/http/http.dart | 1 +
 pubspec.yaml           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 40e4665b..0302bc7f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.63](https://img.shields.io/badge/pub-1.0.0--dev.63-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.64](https://img.shields.io/badge/pub-1.0.0--dev.64-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 5a06d99e..197cf9f3 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -2,6 +2,7 @@
 library angel_framework.http;
 
 export 'package:angel_route/angel_route.dart';
+export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'angel_base.dart';
 export 'angel_http_exception.dart';
 export 'anonymous_service.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 26a1b696..43e49157 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.63
+version: 1.0.0-dev.64
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 4e51d87b61c623b62ea69aa546d9d5ff65c3f12b Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 5 Mar 2017 19:52:16 -0500
Subject: [PATCH 105/414] 65

---
 README.md                |  4 ++--
 lib/src/http/server.dart | 22 ++++++++++++++++++++--
 pubspec.yaml             |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0302bc7f..9d89f3f9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.64](https://img.shields.io/badge/pub-1.0.0--dev.64-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.65](https://img.shields.io/badge/pub-1.0.0--dev.65-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
@@ -19,4 +19,4 @@ main() async {
 
   await app.startServer();
 }
-```
\ No newline at end of file
+```
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 0c1f1ce9..b614eda1 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -139,6 +139,22 @@ class Angel extends AngelBase {
     container.singleton(this);
   }
 
+  /// Shortcut for adding a middleware to inject a key/value pair on every request.
+  void inject(key, value) {
+    before.add((RequestContext req, ResponseContext res) async {
+      req.inject(key, value);
+      return true;
+    });
+  }
+
+  /// Shortcut for adding a middleware to inject a serialize on every request.
+  void injectSerializer(ResponseSerializer serializer) {
+    before.add((RequestContext req, ResponseContext res) async {
+      res.serializer = serialize;
+      return true;
+    });
+  }
+
   /// Runs some [handler]. Returns `true` if request execution should continue.
   Future<bool> executeHandler(
       handler, RequestContext req, ResponseContext res) async {
@@ -265,9 +281,11 @@ class Angel extends AngelBase {
                   accept.contains('*/*') ||
                   accept.contains(ContentType.JSON.mimeType) ||
                   accept.contains("application/javascript")) {
-                res.serialize(e.toMap());
+                res.serialize(e.toMap(),
+                    contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+                        ContentType.JSON.mimeType);
               } else {
-                await _errorHandler(e, req, res);
+                await errorHandler(e, req, res);
               }
               // _finalizeResponse(request, res);
             } catch (e, st) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 43e49157..8e0d0a92 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.64
+version: 1.0.0-dev.65
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 4ad9e06269776b1a055810d6657ccb63c2302adf Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 5 Mar 2017 21:06:52 -0500
Subject: [PATCH 106/414] 66

---
 README.md                | 2 +-
 lib/src/http/server.dart | 2 +-
 pubspec.yaml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9d89f3f9..8e7f90a7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.65](https://img.shields.io/badge/pub-1.0.0--dev.65-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.66](https://img.shields.io/badge/pub-1.0.0--dev.66-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index b614eda1..08b900dc 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -150,7 +150,7 @@ class Angel extends AngelBase {
   /// Shortcut for adding a middleware to inject a serialize on every request.
   void injectSerializer(ResponseSerializer serializer) {
     before.add((RequestContext req, ResponseContext res) async {
-      res.serializer = serialize;
+      res.serializer = serializer;
       return true;
     });
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 8e0d0a92..463e9a37 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.65
+version: 1.0.0-dev.66
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 44683b8a3497892d3e5876d230b48da565694b35 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 5 Mar 2017 23:55:13 -0500
Subject: [PATCH 107/414] 67

---
 README.md      | 2 +-
 lib/hooks.dart | 5 ++++-
 pubspec.yaml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8e7f90a7..da92e3ca 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.66](https://img.shields.io/badge/pub-1.0.0--dev.66-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.67](https://img.shields.io/badge/pub-1.0.0--dev.67-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index a9887dfc..c1013952 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -66,6 +66,8 @@ HookedServiceEventListener toType(Type type) {
 
 /// Removes one or more [key]s from `e.data` or `e.result`.
 /// Works on single objects and iterables.
+///
+/// Only applies to the client-side.
 HookedServiceEventListener remove(key, [remover(key, obj)]) {
   return (HookedServiceEvent e) async {
     if (!e.isAfter) throw new StateError("'remove' only works on after hooks.");
@@ -113,7 +115,8 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
       }
     }
 
-    await normalize(e.isBefore ? e.data : e.result);
+    if (e.params?.containsKey('provider') == true)
+      await normalize(e.isBefore ? e.data : e.result);
   };
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 463e9a37..b17f44a8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.66
+version: 1.0.0-dev.67
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 12587bb5a0030b8b38246357bc3b94c8b7310d4a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 11 Mar 2017 02:13:57 -0500
Subject: [PATCH 108/414] transform hook

---
 lib/hooks.dart | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/hooks.dart b/lib/hooks.dart
index c1013952..691a8a31 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -47,6 +47,10 @@ HookedServiceEventListener toJson() {
   };
 }
 
+/// Mutates `e.data` or `e.result` using the given [transformer].
+HookedServiceEventListener transform(transformer(obj)) {
+}
+
 /// Transforms `e.data` or `e.result` into an instance of the given [type],
 /// if it is not already.
 HookedServiceEventListener toType(Type type) {

From 09247069dc42cbe25c165e0cbbdb1ea2f6477994 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 11 Mar 2017 02:17:52 -0500
Subject: [PATCH 109/414] transform & more

---
 lib/hooks.dart | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/hooks.dart b/lib/hooks.dart
index 691a8a31..c8b2430d 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -41,7 +41,7 @@ HookedServiceEventListener toJson() {
     }
 
     if (e.isBefore) {
-      return e.data = normalize(e.data);
+      e.data = normalize(e.data);
     } else
       e.result = normalize(e.result);
   };
@@ -49,6 +49,21 @@ HookedServiceEventListener toJson() {
 
 /// Mutates `e.data` or `e.result` using the given [transformer].
 HookedServiceEventListener transform(transformer(obj)) {
+  normalize(obj) {
+    if (obj == null)
+      return null;
+    else if (obj is Iterable)
+      return obj.map(normalize).toList();
+    else
+      return transformer(obj);
+  }
+
+  return (HookedServiceEvent e) {
+    if (e.isBefore) {
+      e.data = normalize(e.data);
+    } else
+      e.result = normalize(e.result);
+  };
 }
 
 /// Transforms `e.data` or `e.result` into an instance of the given [type],
@@ -62,7 +77,7 @@ HookedServiceEventListener toType(Type type) {
     }
 
     if (e.isBefore) {
-      return e.data = normalize(e.data);
+      e.data = normalize(e.data);
     } else
       e.result = normalize(e.result);
   };

From daafe2eaf6314f8b50ebbb1af8f53da2d35dd36c Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 11 Mar 2017 02:18:26 -0500
Subject: [PATCH 110/414] transform & more

---
 README.md    | 2 +-
 pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index da92e3ca..6d6af8f8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.67](https://img.shields.io/badge/pub-1.0.0--dev.67-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.68](https://img.shields.io/badge/pub-1.0.0--dev.68-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/pubspec.yaml b/pubspec.yaml
index b17f44a8..e10fa460 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.67
+version: 1.0.0-dev.68
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From cc793f673647cb67ff53cd760a620dd4d83db93b Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 28 Mar 2017 19:29:22 -0400
Subject: [PATCH 111/414] 69

---
 README.md                          |   2 +-
 example/common.dart                |   5 ++
 example/json.dart                  |  52 ++++++++++++
 lib/hooks.dart                     | 114 +++++++++++++++++++++----
 lib/src/http/angel_base.dart       |   7 +-
 lib/src/http/controller.dart       |  15 +++-
 lib/src/http/hooked_service.dart   |  59 ++++++++++---
 lib/src/http/map_service.dart      |   6 +-
 lib/src/http/request_context.dart  |  90 ++++++++++++++++++--
 lib/src/http/response_context.dart | 129 ++++++++++++++++++++++++++---
 lib/src/http/routable.dart         |  13 +--
 lib/src/http/server.dart           |   6 +-
 lib/src/http/service.dart          |  56 ++++++++++---
 pubspec.yaml                       |   2 +-
 test/routing_test.dart             |   2 +-
 test/services_test.dart            |   5 ++
 16 files changed, 486 insertions(+), 77 deletions(-)
 create mode 100644 example/common.dart
 create mode 100644 example/json.dart

diff --git a/README.md b/README.md
index 6d6af8f8..afa70e62 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.68](https://img.shields.io/badge/pub-1.0.0--dev.68-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.69](https://img.shields.io/badge/pub-1.0.0--dev.69-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/example/common.dart b/example/common.dart
new file mode 100644
index 00000000..c47d469d
--- /dev/null
+++ b/example/common.dart
@@ -0,0 +1,5 @@
+import 'dart:async';
+import 'dart:io';
+
+Future<HttpServer> startShared(InternetAddress address, int port) => HttpServer
+    .bind(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, shared: true);
diff --git a/example/json.dart b/example/json.dart
new file mode 100644
index 00000000..d84278e5
--- /dev/null
+++ b/example/json.dart
@@ -0,0 +1,52 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'dart:isolate';
+import 'package:angel_framework/angel_framework.dart';
+import 'common.dart';
+
+main() async {
+  int x = 0;
+  var c = new Completer();
+  var exit = new ReceivePort();
+  List<Isolate> isolates = [];
+
+  exit.listen((_) {
+    if (++x >= 50) {
+      c.complete();
+    }
+  });
+
+  for (int i = 0; i < 50; i++) {
+    var isolate = await Isolate.spawn(serverMain, null);
+    isolates.add(isolate);
+    print('Spawned isolate #${i + 1}...');
+
+    isolate.addOnExitListener(exit.sendPort);
+  }
+
+  print('Angel listening at http://localhost:3000');
+  await c.future;
+}
+
+serverMain(_) async {
+  var app = new Angel.custom(startShared); // Run a cluster
+
+  app.get('/', {
+    "foo": "bar",
+    "one": [2, "three"],
+    "bar": {"baz": "quux"}
+  });
+
+  // Performance tuning
+  app
+    ..lazyParseBodies = true
+    ..injectSerializer(JSON.encode);
+
+  app.fatalErrorStream.listen((e) {
+    print(e.error);
+    print(e.stack);
+  });
+
+  await app.startServer(InternetAddress.LOOPBACK_IP_V4, 3000);
+}
diff --git a/lib/hooks.dart b/lib/hooks.dart
index c8b2430d..684abc6b 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -32,20 +32,8 @@ AngelConfigurer hookAllServices(callback(Service service)) {
   };
 }
 
-/// Transforms `e.data` or `e.result` into JSON-friendly data, i.e. a Map.
-HookedServiceEventListener toJson() {
-  return (HookedServiceEvent e) {
-    normalize(obj) {
-      if (obj != null && obj is! Map) return god.serializeObject(obj);
-      return obj;
-    }
-
-    if (e.isBefore) {
-      e.data = normalize(e.data);
-    } else
-      e.result = normalize(e.result);
-  };
-}
+/// Transforms `e.data` or `e.result` into JSON-friendly data, i.e. a Map. Runs on Iterables as well.
+HookedServiceEventListener toJson() => transform(god.serializeObject);
 
 /// Mutates `e.data` or `e.result` using the given [transformer].
 HookedServiceEventListener transform(transformer(obj)) {
@@ -61,7 +49,7 @@ HookedServiceEventListener transform(transformer(obj)) {
   return (HookedServiceEvent e) {
     if (e.isBefore) {
       e.data = normalize(e.data);
-    } else
+    } else if (e.isAfter)
       e.result = normalize(e.result);
   };
 }
@@ -134,8 +122,13 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
       }
     }
 
-    if (e.params?.containsKey('provider') == true)
-      await normalize(e.isBefore ? e.data : e.result);
+    if (e.params?.containsKey('provider') == true) {
+      if (e.isBefore) {
+        e.data = await normalize(e.data);
+      } else if (e.isAfter) {
+        e.result = await normalize(e.result);
+      }
+    }
   };
 }
 
@@ -168,3 +161,90 @@ HookedServiceEventListener disable([provider]) {
     }
   };
 }
+
+/// Serializes the current time to `e.data` or `e.result`.
+/// You can provide an [assign] function to set the property on your object, and skip reflection.
+///
+/// Default key: `createdAt`
+HookedServiceEventListener addCreatedAt({
+  assign(obj, String now),
+  String key,
+}) {
+  var name = key?.isNotEmpty == true ? key : 'createdAt';
+
+  return (HookedServiceEvent e) async {
+    _assign(obj, String now) {
+      if (assign != null)
+        return assign(obj, now);
+      else if (obj is Map)
+        obj.remove(name);
+      else if (obj is Extensible)
+        obj..properties.remove(name);
+      else {
+        try {
+          reflect(obj).setField(new Symbol(name), now);
+        } catch (e) {
+          throw new ArgumentError("Cannot set key '$name' on $obj.");
+        }
+      }
+    }
+
+    var now = new DateTime.now().toIso8601String();
+
+    normalize(obj) async {
+      if (obj != null) {
+        if (obj is Iterable) {
+          obj.forEach(normalize);
+        } else {
+          await _assign(obj, now);
+        }
+      }
+    }
+
+    if (e.params?.containsKey('provider') == true)
+      await normalize(e.isBefore ? e.data : e.result);
+  };
+}
+
+/// Serializes the current time to `e.data` or `e.result`.
+/// You can provide an [assign] function to set the property on your object, and skip reflection.///
+/// Default key: `createdAt`
+HookedServiceEventListener addUpatedAt({
+  assign(obj, String now),
+  String key,
+}) {
+  var name = key?.isNotEmpty == true ? key : 'updatedAt';
+
+  return (HookedServiceEvent e) async {
+    _assign(obj, String now) {
+      if (assign != null)
+        return assign(obj, now);
+      else if (obj is Map)
+        obj.remove(name);
+      else if (obj is Extensible)
+        obj..properties.remove(name);
+      else {
+        try {
+          reflect(obj).setField(new Symbol(name), now);
+        } catch (e) {
+          throw new ArgumentError("Cannot SET key '$name' ON $obj.");
+        }
+      }
+    }
+
+    var now = new DateTime.now().toIso8601String();
+
+    normalize(obj) async {
+      if (obj != null) {
+        if (obj is Iterable) {
+          obj.forEach(normalize);
+        } else {
+          await _assign(obj, now);
+        }
+      }
+    }
+
+    if (e.params?.containsKey('provider') == true)
+      await normalize(e.isBefore ? e.data : e.result);
+  };
+}
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 8bd3f67b..60b4124c 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -13,7 +13,12 @@ class AngelBase extends Routable {
 
   Container _container = new Container();
 
-  /// When set to true, the original body bytes will be stored
+  /// When set to true, the request body will not be parsed
+  /// automatically. You can call `req.parse()` manually,
+  /// or use `lazyBody()`.
+  bool lazyParseBodies = false;
+
+  /// When set to `true`, the original body bytes will be stored
   /// on requests. `false` by default.
   bool storeOriginalBuffer = false;
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 044960ad..88927505 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -31,15 +31,26 @@ class InjectionRequest {
 class Controller {
   Angel _app;
 
+  /// The [Angel] application powering this controller.
   Angel get app => _app;
+
   final bool debug;
+
+  /// If `true` (default), this class will inject itself as a singleton into the [app]'s container when bootstrapped.
+  final bool injectSingleton;
+
+  /// Middleware to run before all handlers in this class.
   List middleware = [];
+
+  /// A mapping of route paths to routes, produced from the [Expose] annotations on this class.
   Map<String, Route> routeMappings = {};
 
-  Controller({this.debug: false});
+  Controller({this.debug: false, this.injectSingleton: true});
 
   Future call(Angel app) async {
-    _app = app..container.singleton(this);
+    _app = app;
+
+    if (injectSingleton != false) _app.container.singleton(this);
 
     // Load global expose decl
     ClassMirror classMirror = reflectClass(this.runtimeType);
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 5e4b5e7a..9cd3eb1f 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -3,6 +3,7 @@ library angel_framework.http;
 import 'dart:async';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
+import 'angel_http_exception.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'metadata.dart';
@@ -128,15 +129,18 @@ class HookedService extends Service {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(inner.create, Middleware);
-    post(
-        '/',
-        (req, res) async => await this.create(
-            req.body,
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
+
+    post('/', (req, res) async {
+      var r = await this.create(
+          await req.lazyBody(),
+          mergeMap([
+            {'query': req.query},
+            restProvider,
+            req.serviceParams
+          ]));
+      res.statusCode = 201;
+      return r;
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -162,7 +166,7 @@ class HookedService extends Service {
         '/:id',
         (req, res) async => await this.modify(
             toId(req.params['id']),
-            req.body,
+            await req.lazyBody(),
             mergeMap([
               {'query': req.query},
               restProvider,
@@ -178,7 +182,21 @@ class HookedService extends Service {
         '/:id',
         (req, res) async => await this.update(
             toId(req.params['id']),
-            req.body,
+            await req.lazyBody(),
+            mergeMap([
+              {'query': req.query},
+              restProvider,
+              req.serviceParams
+            ])),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
+    put(
+        '/:id',
+        (req, res) async => await this.update(
+            toId(req.params['id']),
+            await req.lazyBody(),
             mergeMap([
               {'query': req.query},
               restProvider,
@@ -190,6 +208,19 @@ class HookedService extends Service {
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
+    delete(
+        '/',
+        (req, res) async => await this.remove(
+            null,
+            mergeMap([
+              {'query': req.query},
+              restProvider,
+              req.serviceParams
+            ])),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
         (req, res) async => await this.remove(
@@ -204,6 +235,10 @@ class HookedService extends Service {
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
 
+    // REST compliance
+    put('/', () => throw new AngelHttpException.notFound());
+    patch('/', () => throw new AngelHttpException.notFound());
+
     addHooks();
   }
 
@@ -522,7 +557,7 @@ class HookedServiceEvent {
   }
 
   /// Resolves a service from the application.
-  /// 
+  ///
   /// Shorthand for `e.service.app.service(...)`.
   Service getService(Pattern path) => service.app.service(path);
 
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index d5a1bd69..d06fbf73 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -65,6 +65,8 @@ class MapService extends Service {
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `modify` with ${data.runtimeType}.');
+    if (!items.any(_matchesId(id))) return await create(data, params);
+
     var item = await read(id);
     return item
       ..addAll(data)
@@ -77,9 +79,7 @@ class MapService extends Service {
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `update` with ${data.runtimeType}.');
-    if (!items.any(_matchesId(id)))
-      throw new AngelHttpException.notFound(
-          message: 'No record found for ID $id');
+    if (!items.any(_matchesId(id))) return await create(data, params);
 
     var old = await read(id);
 
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 6d5f10b6..805778e3 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -45,17 +45,50 @@ class RequestContext extends Extensible {
   /// The original HTTP verb sent to the server.
   String get originalMethod => io.method;
 
+  StateError _unparsed(String type, String caps) => new StateError(
+      'Cannot get the $type of an unparsed request. Use lazy${caps}() instead.');
+
   /// All post data submitted to the server.
-  Map get body => _body.body;
+  ///
+  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
+  /// then an error will be thrown.
+  /// 
+  /// **If you are writing a plug-in, use [lazyBody] instead.**
+  Map get body {
+    if (_body == null)
+      throw _unparsed('body', 'Body');
+    else
+      return _body.body;
+  }
 
   /// The content type of an incoming request.
   ContentType get contentType => _contentType;
 
   /// Any and all files sent to the server with this request.
-  List<FileUploadInfo> get files => _body.files;
+  ///
+  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
+  /// then an error will be thrown.
+  /// 
+  /// **If you are writing a plug-in, use [lazyFiles] instead.**
+  List<FileUploadInfo> get files {
+    if (_body == null)
+      throw _unparsed('query', 'Files');
+    else
+      return _body.files;
+  }
 
   /// The original body bytes sent with this request. May be empty.
-  List<int> get originalBuffer => _body.originalBuffer ?? [];
+  ///
+  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
+  /// then an error will be thrown.
+  /// 
+  /// **If you are writing a plug-in, use [lazyOriginalBuffer] instead.**
+  List<int> get originalBuffer {
+    if (_body == null)
+      throw _unparsed('original buffer', 'OriginalBuffer');
+    else
+      return _body.originalBuffer ?? [];
+  }
 
   /// The URL parameters extracted from the request URI.
   Map params = {};
@@ -64,7 +97,17 @@ class RequestContext extends Extensible {
   String get path => _path;
 
   /// The parsed request query string.
-  Map get query => _body.query;
+  ///
+  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
+  /// then [uri].query will be returned.
+  /// 
+  /// **If you are writing a plug-in, consider using [lazyQuery] instead.** 
+  Map get query {
+    if (_body == null)
+      return uri.queryParameters;
+    else
+      return _body.query;
+  }
 
   /// The remote address requesting this resource.
   InternetAddress get remoteAddress => io.connectionInfo.remoteAddress;
@@ -106,9 +149,10 @@ class RequestContext extends Extensible {
         .replaceAll(new RegExp(r'/+$'), '');
     ctx._io = request;
 
-    ctx._body = (await parseBody(request,
-            storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
-        {};
+    if (app.lazyParseBodies != true)
+      ctx._body = (await parseBody(request,
+              storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
+          {};
 
     return ctx;
   }
@@ -133,7 +177,39 @@ class RequestContext extends Extensible {
       return null;
   }
 
+  /// Shorthand to add to [injections].
   void inject(type, value) {
     injections[type] = value;
   }
+
+  /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the body.
+  Future<Map> lazyBody() => parse().then((b) => b.body);
+
+  /// Retrieves the request files if it has already been parsed, or lazy-parses it before returning the files.
+  Future<List<FileUploadInfo>> lazyFiles() => parse().then((b) => b.files);
+
+  /// Retrieves the request files if it has already been parsed, or lazy-parses it before returning the files.
+  ///
+  /// This will return an empty `List` if you have not enabled `storeOriginalBuffer` on your [app] instance.
+  Future<List<int>> lazyOriginalBuffer() =>
+      parse().then((b) => b.originalBuffer);
+
+  /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the query.
+  ///
+  /// If [forceParse] is not `true`, then [uri].query will be returned, and no parsing will be performed.
+  Future<Map<String, dynamic>> lazyQuery({bool forceParse: false}) {
+    if (_body == null && forceParse != true)
+      return new Future.value(uri.query);
+    else
+      return parse().then((b) => b.query);
+  }
+
+  /// Manually parses the request body, if it has not already been parsed.
+  Future<BodyParseResult> parse() async {
+    if (_body != null)
+      return _body;
+    else
+      return _body = await parseBody(io,
+          storeOriginalBuffer: app.storeOriginalBuffer == true);
+  }
 }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 25fe5b2e..38f17a83 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -20,6 +20,8 @@ typedef String ResponseSerializer(data);
 
 /// A convenience wrapper around an outgoing HTTP request.
 class ResponseContext extends Extensible {
+  final _LockableBytesBuilder _buffer = new _LockableBytesBuilder();
+  final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
   bool _isOpen = true;
 
   /// The [Angel] instance that is sending a response.
@@ -32,11 +34,27 @@ class ResponseContext extends Extensible {
   final List<Cookie> cookies = [];
 
   /// Headers that will be sent to the user.
-  final Map<String, String> headers = {HttpHeaders.SERVER: 'angel'};
+  ///
+  /// If the response is closed, then this getter will return an immutable `Map`.
+  Map<String, String> get headers {
+    if (!_isOpen)
+      return new Map<String, String>.unmodifiable(_headers);
+    else
+      return _headers;
+  }
 
   /// Serializes response data into a String.
   ///
-  /// The default is conversion into JSON.
+  /// The default is conversion into JSON via `package:json_god`.
+  ///
+  /// If you are 100% sure that your response handlers will only
+  /// be JSON-encodable objects (i.e. primitives, `List`s and `Map`s),
+  /// then consider setting [serializer] to `JSON.encode`.
+  ///
+  /// To set it globally for the whole [app], use the following helper:
+  /// ```dart
+  /// app.injectSerializer(JSON.encode);
+  /// ```
   ResponseSerializer serializer = god.serialize;
 
   /// This response's status code.
@@ -46,7 +64,7 @@ class ResponseContext extends Extensible {
   bool get isOpen => _isOpen;
 
   /// A set of UTF-8 encoded bytes that will be written to the response.
-  final BytesBuilder buffer = new BytesBuilder();
+  BytesBuilder get buffer => _buffer;
 
   /// Sets the status code to be sent with this response.
   @Deprecated('Please use `statusCode=` instead.')
@@ -91,8 +109,12 @@ class ResponseContext extends Extensible {
   /// If `true`, all response finalizers will be skipped.
   bool willCloseItself = false;
 
+  StateError _closed() => new StateError('Cannot modify a closed response.');
+
   /// Sends a download as a response.
   download(File file, {String filename}) async {
+    if (!_isOpen) throw _closed();
+
     headers["Content-Disposition"] =
         'attachment; filename="${filename ?? file.path}"';
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
@@ -103,6 +125,7 @@ class ResponseContext extends Extensible {
 
   /// Prevents more data from being written to the response.
   void end() {
+    _buffer._lock();
     _isOpen = false;
   }
 
@@ -119,14 +142,24 @@ class ResponseContext extends Extensible {
   void json(value) => serialize(value, contentType: ContentType.JSON);
 
   /// Returns a JSONP response.
-  void jsonp(value, {String callbackName: "callback"}) {
-    write("$callbackName(${god.serialize(value)})");
-    headers[HttpHeaders.CONTENT_TYPE] = "application/javascript";
+  void jsonp(value, {String callbackName: "callback", contentType}) {
+    if (!_isOpen) throw _closed();
+    write("$callbackName(${serializer(value)})");
+
+    if (contentType != null) {
+      if (contentType is ContentType)
+        this.contentType = contentType;
+      else
+        headers[HttpHeaders.CONTENT_TYPE] = contentType.toString();
+    } else
+      headers[HttpHeaders.CONTENT_TYPE] = 'application/javascript';
+
     end();
   }
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) async {
+    if (!_isOpen) throw _closed();
     write(await app.viewGenerator(view, data));
     headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     end();
@@ -140,6 +173,7 @@ class ResponseContext extends Extensible {
   ///
   /// See [Router]#navigate for more. :)
   void redirect(url, {bool absolute: true, int code: 302}) {
+    if (!_isOpen) throw _closed();
     headers[HttpHeaders.LOCATION] =
         url is String ? url : app.navigate(url, absolute: absolute);
     statusCode = code ?? 302;
@@ -165,6 +199,7 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given named [Route].
   void redirectTo(String name, [Map params, int code]) {
+    if (!_isOpen) throw _closed();
     Route _findRoute(Router r) {
       for (Route route in r.routes) {
         if (route is SymlinkRoute) {
@@ -189,6 +224,7 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given [Controller] action.
   void redirectToAction(String action, [Map params, int code]) {
+    if (!_isOpen) throw _closed();
     // UserController@show
     List<String> split = action.split("@");
 
@@ -218,7 +254,7 @@ class ResponseContext extends Extensible {
   /// Copies a file's contents into the response buffer.
   Future sendFile(File file,
       {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
-    if (!isOpen) return;
+    if (!_isOpen) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     buffer.add(await file.readAsBytes());
@@ -229,9 +265,10 @@ class ResponseContext extends Extensible {
   ///
   /// [contentType] can be either a [String], or a [ContentType].
   void serialize(value, {contentType}) {
+    if (!_isOpen) throw _closed();
     var text = serializer(value);
     write(text);
-    
+
     if (contentType is String)
       headers[HttpHeaders.CONTENT_TYPE] = contentType;
     else if (contentType is ContentType) this.contentType = contentType;
@@ -247,7 +284,7 @@ class ResponseContext extends Extensible {
       int sleepMs: 0,
       bool resumable: true,
       Codec<List<int>, List<int>> codec}) async {
-    if (!isOpen) return;
+    if (!_isOpen) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     end();
@@ -261,7 +298,9 @@ class ResponseContext extends Extensible {
 
   /// Writes data to the response.
   void write(value, {Encoding encoding: UTF8}) {
-    if (isOpen) {
+    if (!_isOpen)
+      throw _closed();
+    else {
       if (value is List<int>)
         buffer.add(value);
       else
@@ -269,3 +308,73 @@ class ResponseContext extends Extensible {
     }
   }
 }
+
+abstract class _LockableBytesBuilder extends BytesBuilder {
+  factory _LockableBytesBuilder() => new _LockableBytesBuilderImpl();
+  void _lock();
+}
+
+class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
+  bool _closed = false;
+  final List<int> _data = [];
+
+  StateError _deny() =>
+      new StateError('Cannot modified a closed response\'s buffer.');
+
+  @override
+  void _lock() {
+    _closed = true;
+  }
+
+  @override
+  void add(List<int> bytes) {
+    if (_closed)
+      throw _deny();
+    else {
+      _data.addAll(bytes);
+    }
+  }
+
+  @override
+  void addByte(int byte) {
+    if (_closed)
+      throw _deny();
+    else {
+      _data.add(byte);
+    }
+  }
+
+  @override
+  void clear() {
+    if (_closed)
+      throw _deny();
+    else {
+      _data.clear();
+    }
+  }
+
+  @override
+  bool get isEmpty => _data.isEmpty;
+
+  @override
+  bool get isNotEmpty => _data.isNotEmpty;
+
+  @override
+  int get length => _data.length;
+
+  @override
+  List<int> takeBytes() {
+    if (_closed)
+      return toBytes();
+    else {
+      var r = new List<int>.from(_data);
+      clear();
+      return r;
+    }
+  }
+
+  @override
+  List<int> toBytes() {
+    return _data;
+  }
+}
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 1ab029d1..53ac7756 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -19,19 +19,12 @@ typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 /// A function that receives an incoming [RequestContext] and responds to it.
 typedef Future RequestHandler(RequestContext req, ResponseContext res);
 
-/// Sequentially runs a list of [handlers] of middleware, and breaks if any does not
+/// Sequentially runs a list of [handlers] of middleware, and returns early if any does not
 /// return `true`. Works well with [Router].chain.
 RequestMiddleware waterfall(List handlers) {
-  for (var handler in handlers) {
-    if (handler is! RequestMiddleware && handler is! RequestHandler)
-      throw new ArgumentError(
-          '`waterfall` only accepts middleware and handlers. $handler is not a valid option.');
-  }
-
-  return (req, res) async {
+  return (RequestContext req, res) async {
     for (var handler in handlers) {
-      var result = await handler(req, res);
-
+      var result = await req.app.executeHandler(handler, req, res);
       if (result != true) return result;
     }
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 08b900dc..53b73672 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -63,6 +63,9 @@ class Angel extends AngelBase {
   /// `'production'`.
   bool get isProduction => Platform.environment['ANGEL_ENV'] == 'production';
 
+  /// The function used to bind this instance to an HTTP server.
+  ServerGenerator get serverGenerator => _serverGenerator;
+
   /// Fired whenever a controller is added to this instance.
   ///
   /// **NOTE**: This is a broadcast stream.
@@ -78,7 +81,8 @@ class Angel extends AngelBase {
 
   /// Always run before responses are sent.
   ///
-  /// These will only not run if an [AngelFatalError] occurs.
+  /// These will only not run if an [AngelFatalError] occurs,
+  /// or if a response's `willCloseItself` is set to `true`.
   final List<RequestHandler> responseFinalizers = [];
 
   /// The handler currently configured to run on [AngelHttpException]s.
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 1c6f620c..5cee5774 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -1,6 +1,7 @@
 library angel_framework.http.service;
 
 import 'dart:async';
+import 'package:angel_framework/src/http/response_context.dart';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'angel_base.dart';
@@ -100,15 +101,17 @@ class Service extends Routable {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(this.create, Middleware);
-    post(
-        '/',
-        (req, res) async => await this.create(
-            req.body,
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
+    post('/', (req, ResponseContext res) async {
+      var r = await this.create(
+          await req.lazyBody(),
+          mergeMap([
+            {'query': req.query},
+            restProvider,
+            req.serviceParams
+          ]));
+      res.statusCode = 201;
+      return r;
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -134,7 +137,7 @@ class Service extends Routable {
         '/:id',
         (req, res) async => await this.modify(
             toId(req.params['id']),
-            req.body,
+            await req.lazyBody(),
             mergeMap([
               {'query': req.query},
               restProvider,
@@ -150,7 +153,21 @@ class Service extends Routable {
         '/:id',
         (req, res) async => await this.update(
             toId(req.params['id']),
-            req.body,
+            await req.lazyBody(),
+            mergeMap([
+              {'query': req.query},
+              restProvider,
+              req.serviceParams
+            ])),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
+    put(
+        '/:id',
+        (req, res) async => await this.update(
+            toId(req.params['id']),
+            await req.lazyBody(),
             mergeMap([
               {'query': req.query},
               restProvider,
@@ -162,6 +179,19 @@ class Service extends Routable {
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
+    delete(
+        '/',
+        (req, res) async => await this.remove(
+            null,
+            mergeMap([
+              {'query': req.query},
+              restProvider,
+              req.serviceParams
+            ])),
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
         (req, res) async => await this.remove(
@@ -175,6 +205,10 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
+
+    // REST compliance
+    put('/', () => throw new AngelHttpException.notFound());
+    patch('/', () => throw new AngelHttpException.notFound());
   }
 
   /// Invoked when this service is wrapped within a [HookedService].
diff --git a/pubspec.yaml b/pubspec.yaml
index e10fa460..547697e1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.68
+version: 1.0.0-dev.69
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 9a302949..070dd23a 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -59,7 +59,7 @@ main() {
         middleware: ['interceptor']);
     app.get('/hello', 'world');
     app.get('/name/:first/last/:last', (req, res) => req.params);
-    app.post('/lambda', (req, res) => req.body);
+    app.post('/lambda', (RequestContext req, res) => req.lazyBody());
     app.use('/todos/:id', todos);
     app
         .get('/greet/:name',
diff --git a/test/services_test.dart b/test/services_test.dart
index 080deab9..ee376cbf 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -56,6 +56,7 @@ main() {
       String postData = god.serialize({'text': 'Hello, world!'});
       var response =
           await client.post("$url/todos", headers: headers, body: postData);
+      expect(response.statusCode, 201);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('Hello, world!'));
@@ -65,6 +66,7 @@ main() {
       String postData = god.serialize({'text': 'Hello, world!'});
       await client.post("$url/todos", headers: headers, body: postData);
       var response = await client.get("$url/todos/0");
+      expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('Hello, world!'));
@@ -76,6 +78,7 @@ main() {
       postData = god.serialize({'text': 'modified'});
       var response =
           await client.patch("$url/todos/0", headers: headers, body: postData);
+      expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('modified'));
@@ -87,6 +90,7 @@ main() {
       postData = god.serialize({'over': 'write'});
       var response =
           await client.post("$url/todos/0", headers: headers, body: postData);
+      expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals(null));
@@ -97,6 +101,7 @@ main() {
       String postData = god.serialize({'text': 'Hello, world!'});
       await client.post("$url/todos", headers: headers, body: postData);
       var response = await client.delete("$url/todos/0");
+      expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('Hello, world!'));

From 218465a26fe374e424f5c16aa04846ca0ebf1f90 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 28 Mar 2017 20:36:54 -0400
Subject: [PATCH 112/414] 70

---
 README.md                         | 2 +-
 lib/src/http/request_context.dart | 4 ++--
 pubspec.yaml                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index afa70e62..bd34cb42 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.69](https://img.shields.io/badge/pub-1.0.0--dev.69-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.70](https://img.shields.io/badge/pub-1.0.0--dev.70-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 Core libraries for the Angel Framework.
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 805778e3..e8f291ba 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -188,7 +188,7 @@ class RequestContext extends Extensible {
   /// Retrieves the request files if it has already been parsed, or lazy-parses it before returning the files.
   Future<List<FileUploadInfo>> lazyFiles() => parse().then((b) => b.files);
 
-  /// Retrieves the request files if it has already been parsed, or lazy-parses it before returning the files.
+  /// Retrieves the original request buffer if it has already been parsed, or lazy-parses it before returning the files.
   ///
   /// This will return an empty `List` if you have not enabled `storeOriginalBuffer` on your [app] instance.
   Future<List<int>> lazyOriginalBuffer() =>
@@ -199,7 +199,7 @@ class RequestContext extends Extensible {
   /// If [forceParse] is not `true`, then [uri].query will be returned, and no parsing will be performed.
   Future<Map<String, dynamic>> lazyQuery({bool forceParse: false}) {
     if (_body == null && forceParse != true)
-      return new Future.value(uri.query);
+      return new Future.value(uri.queryParameters);
     else
       return parse().then((b) => b.query);
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 547697e1..83b150fa 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.69
+version: 1.0.0-dev.70
 description: Core libraries for the Angel framework.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 2f5935d5adcb1be58eb79d6d059cbfae5b9daf0d Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 31 Mar 2017 21:00:24 -0400
Subject: [PATCH 113/414] 71

---
 .travis.yml              |   3 +-
 .vscode/settings.json    |   3 +
 README.md                |   4 +-
 lib/src/http/http.dart   |  13 ++++
 lib/src/http/server.dart | 129 +++++++++++++++++++++++++++++----------
 pubspec.yaml             |   5 +-
 test/routing_test.dart   |   5 ++
 tool/travis.sh           |   3 +
 8 files changed, 127 insertions(+), 38 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 100644 tool/travis.sh

diff --git a/.travis.yml b/.travis.yml
index de2210c9..f5888800 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,2 @@
-language: dart
\ No newline at end of file
+language: dart
+script: ./tool/travis.sh
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..20af2f68
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index bd34cb42..939a6fd0 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # angel_framework
 
-[![pub 1.0.0-dev.70](https://img.shields.io/badge/pub-1.0.0--dev.70-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.71](https://img.shields.io/badge/pub-1.0.0--dev.71-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
-Core libraries for the Angel Framework.
+A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
 
 ```dart
 import 'package:angel_framework/angel_framework.dart';
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 197cf9f3..16715d42 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -1,6 +1,9 @@
 /// Various libraries useful for creating highly-extensible servers.
 library angel_framework.http;
 
+import 'dart:async';
+import 'dart:io';
+import 'server.dart' show ServerGenerator;
 export 'package:angel_route/angel_route.dart';
 export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'angel_base.dart';
@@ -21,3 +24,13 @@ export 'server.dart';
 export 'service.dart';
 export 'typed_service.dart';
 
+/// Boots a shared server instance. Use this if launching multiple isolates
+Future<HttpServer> startShared(InternetAddress address, int port) => HttpServer
+    .bind(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, shared: true);
+
+/// Boots a secure shared server instance. Use this if launching multiple isolates
+ServerGenerator startSharedSecure(SecurityContext securityContext) {
+  return (InternetAddress address, int port) => HttpServer.bindSecure(
+      address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, securityContext,
+      shared: true);
+}
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 53b73672..757e6e3f 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -4,6 +4,9 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
+export 'package:container/container.dart';
+import 'package:flatten/flatten.dart';
+import 'package:json_god/json_god.dart' as god;
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
@@ -12,7 +15,6 @@ import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'service.dart';
-export 'package:container/container.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
@@ -37,10 +39,14 @@ class Angel extends AngelBase {
   StreamController<Controller> _onController =
       new StreamController<Controller>.broadcast();
   final List<Angel> _children = [];
+  Router _flattened;
+  bool _isProduction;
   Angel _parent;
   ServerGenerator _serverGenerator = HttpServer.bind;
 
+  final Map _injections = {};
   final Map<dynamic, InjectionRequest> _preContained = {};
+  ResponseSerializer _serializer;
 
   /// Determines whether to allow HTTP request method overrides.
   bool allowMethodOverrides = true;
@@ -61,7 +67,15 @@ class Angel extends AngelBase {
   ///
   /// The criteria for this is the `ANGEL_ENV` environment variable being set to
   /// `'production'`.
-  bool get isProduction => Platform.environment['ANGEL_ENV'] == 'production';
+  ///
+  /// This value is memoized the first time you call it, so do not change environment
+  /// configuration at runtime!
+  bool get isProduction {
+    if (_isProduction != null)
+      return _isProduction;
+    else
+      return _isProduction = Platform.environment['ANGEL_ENV'] == 'production';
+  }
 
   /// The function used to bind this instance to an HTTP server.
   ServerGenerator get serverGenerator => _serverGenerator;
@@ -130,10 +144,22 @@ class Angel extends AngelBase {
       await configure(configurer);
     }
 
-    preprocessRoutes();
+    optimizeForProduction();
     return httpServer..listen(handleRequest);
   }
 
+  @override
+  Route addRoute(String method, String path, Object handler,
+      {List middleware: const []}) {
+    if (_flattened != null) {
+      print(
+          'WARNING: You added a route ($method $path) to the router, after it has been optimized.');
+      print('This route will be ignored, and no requests will ever reach it.');
+    }
+
+    return super.addRoute(method, path, handler, middleware: middleware ?? []);
+  }
+
   /// Loads some base dependencies into the service container.
   void bootstrapContainer() {
     if (runtimeType != Angel) container.singleton(this, as: Angel);
@@ -143,20 +169,45 @@ class Angel extends AngelBase {
     container.singleton(this);
   }
 
+  @override
+  void dumpTree(
+      {callback(String tree),
+      String header: 'Dumping route tree:',
+      String tab: '  ',
+      bool showMatchers: false}) {
+    if (isProduction) {
+      if (_flattened == null) _flattened = flatten(this);
+
+      _flattened.dumpTree(
+          callback: callback,
+          header: header?.isNotEmpty == true
+              ? header
+              : (isProduction
+                  ? 'Dumping flattened route tree:'
+                  : 'Dumping route tree:'),
+          tab: tab ?? '  ',
+          showMatchers: showMatchers == true);
+    } else {
+      super.dumpTree(
+          callback: callback,
+          header: header?.isNotEmpty == true
+              ? header
+              : (isProduction
+                  ? 'Dumping flattened route tree:'
+                  : 'Dumping route tree:'),
+          tab: tab ?? '  ',
+          showMatchers: showMatchers == true);
+    }
+  }
+
   /// Shortcut for adding a middleware to inject a key/value pair on every request.
   void inject(key, value) {
-    before.add((RequestContext req, ResponseContext res) async {
-      req.inject(key, value);
-      return true;
-    });
+    _injections[key] = value;
   }
 
   /// Shortcut for adding a middleware to inject a serialize on every request.
   void injectSerializer(ResponseSerializer serializer) {
-    before.add((RequestContext req, ResponseContext res) async {
-      res.serializer = serializer;
-      return true;
-    });
+    _serializer = serializer;
   }
 
   /// Runs some [handler]. Returns `true` if request execution should continue.
@@ -227,11 +278,14 @@ class Angel extends AngelBase {
 
   Future<RequestContext> createRequestContext(HttpRequest request) {
     _beforeProcessed.add(request);
-    return RequestContext.from(request, this);
+    return RequestContext.from(request, this).then((req) {
+      return req..injections.addAll(_injections ?? {});
+    });
   }
 
   Future<ResponseContext> createResponseContext(HttpResponse response) async =>
-      new ResponseContext(response, this);
+      new ResponseContext(response, this)
+        ..serializer = (_serializer ?? god.serialize);
 
   /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
@@ -242,7 +296,10 @@ class Angel extends AngelBase {
 
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
-      var resolved = resolveAll(requestedUrl, requestedUrl, method: req.method);
+      Router r =
+          isProduction ? (_flattened ?? (_flattened = flatten(this))) : this;
+      var resolved =
+          r.resolveAll(requestedUrl, requestedUrl, method: req.method);
 
       for (var result in resolved) req.params.addAll(result.allParams);
 
@@ -317,29 +374,35 @@ class Angel extends AngelBase {
     }
   }
 
-  /// Preprocesses all routes, and eliminates the burden of reflecting handlers
+  /// Runs several optimizations, *if* [isProduction] is `true`.
+  ///
+  /// * Preprocesses all dependency injection, and eliminates the burden of reflecting handlers
   /// at run-time.
-  void preprocessRoutes() {
-    _add(v) {
-      if (v is Function && !_preContained.containsKey(v)) {
-        _preContained[v] = preInject(v);
-      }
-    }
-
-    void _walk(Router router) {
-      if (router is Angel) {
-        router..before.forEach(_add)..after.forEach(_add);
+  /// * [flatten]s the route tree into a linear one.
+  void optimizeForProduction() {
+    if (isProduction == true) {
+      _add(v) {
+        if (v is Function && !_preContained.containsKey(v)) {
+          _preContained[v] = preInject(v);
+        }
       }
 
-      router.requestMiddleware.forEach((k, v) => _add(v));
-      router.middleware.forEach(_add);
-      router.routes
-          .where((r) => r is SymlinkRoute)
-          .map((SymlinkRoute r) => r.router)
-          .forEach(_walk);
-    }
+      void _walk(Router router) {
+        if (router is Angel) {
+          router..before.forEach(_add)..after.forEach(_add);
+        }
 
-    _walk(this);
+        router.requestMiddleware.forEach((k, v) => _add(v));
+        router.middleware.forEach(_add);
+        router.routes
+            .where((r) => r is SymlinkRoute)
+            .map((SymlinkRoute r) => r.router)
+            .forEach(_walk);
+      }
+
+      _walk(_flattened = flatten(this));
+      print('Angel is running in production mode.');
+    }
   }
 
   /// Run a function after injecting from service container.
diff --git a/pubspec.yaml b/pubspec.yaml
index 83b150fa..7c68938c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: angel_framework
-version: 1.0.0-dev.70
-description: Core libraries for the Angel framework.
+version: 1.0.0-dev.71
+description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
@@ -9,6 +9,7 @@ dependencies:
   angel_route: ^1.0.0-dev
   body_parser: ^1.0.0-dev
   container: ^0.1.2
+  flatten: ^1.0.0
   json_god: ^2.0.0-beta
   merge_map: ^1.0.0
   random_string: ^0.0.1
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 070dd23a..183ac2f6 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -31,6 +31,11 @@ main() {
     nested = new Angel(debug: debug);
     todos = new Angel(debug: debug);
 
+    // Lazy-parse in production
+    [app, nested, todos].forEach((Angel app) {
+      app.lazyParseBodies = app.isProduction;
+    });
+
     app
       ..registerMiddleware('interceptor', (req, res) async {
         res.write('Middleware');
diff --git a/tool/travis.sh b/tool/travis.sh
new file mode 100644
index 00000000..1afd39d1
--- /dev/null
+++ b/tool/travis.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+pub run test
+ANGEL_ENV=production pub run test
\ No newline at end of file

From 8fdab10b246aeca6efa2586bcb35eecce6433b88 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 31 Mar 2017 21:03:35 -0400
Subject: [PATCH 114/414] Fixed Travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f5888800..274209f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,3 @@
 language: dart
+before_script: chmod +x ./tool/travis.sh
 script: ./tool/travis.sh
\ No newline at end of file

From e254d9791d2e7c136b5ad53a18533856b7ee2146 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 31 Mar 2017 21:04:45 -0400
Subject: [PATCH 115/414] More Travis

---
 tool/travis.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tool/travis.sh b/tool/travis.sh
index 1afd39d1..bac6b671 100644
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
+set -e
 pub run test
 ANGEL_ENV=production pub run test
\ No newline at end of file

From 9683e976032b38110f75eb6dab43e514e8058c34 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 2 Apr 2017 15:14:10 -0400
Subject: [PATCH 116/414] 72!

---
 README.md                          |  2 +-
 example/json.dart                  |  1 -
 lib/src/http/response_context.dart | 14 ++++++++++++++
 lib/src/http/server.dart           | 21 +++++++++++++++++++--
 pubspec.yaml                       |  2 +-
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 939a6fd0..9179d255 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.71](https://img.shields.io/badge/pub-1.0.0--dev.71-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.72](https://img.shields.io/badge/pub-1.0.0--dev.72-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/example/json.dart b/example/json.dart
index d84278e5..a8e76a35 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 import 'package:angel_framework/angel_framework.dart';
-import 'common.dart';
 
 main() async {
   int x = 0;
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 38f17a83..d71dafc9 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -129,6 +129,14 @@ class ResponseContext extends Extensible {
     _isOpen = false;
   }
 
+  /// Re-opens a closed response. **NEVER USE THIS IN A PLUGIN**.
+  ///
+  /// To preserve your sanity, don't use it ever. This is solely for internal use.
+  void reopen() {
+    _buffer._reopen();
+    _isOpen = true;
+  }
+
   /// Sets a response header to the given value, or retrieves its value.
   @Deprecated('Please use `headers` instead.')
   header(String key, [String value]) {
@@ -312,6 +320,7 @@ class ResponseContext extends Extensible {
 abstract class _LockableBytesBuilder extends BytesBuilder {
   factory _LockableBytesBuilder() => new _LockableBytesBuilderImpl();
   void _lock();
+  void _reopen();
 }
 
 class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
@@ -326,6 +335,11 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
     _closed = true;
   }
 
+  @override
+  void _reopen() {
+    _closed = false;
+  }
+
   @override
   void add(List<int> bytes) {
     if (_closed)
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 757e6e3f..7022c76d 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -153,13 +153,24 @@ class Angel extends AngelBase {
       {List middleware: const []}) {
     if (_flattened != null) {
       print(
-          'WARNING: You added a route ($method $path) to the router, after it has been optimized.');
+          'WARNING: You added a route ($method $path) to the router, after it had been optimized.');
       print('This route will be ignored, and no requests will ever reach it.');
     }
 
     return super.addRoute(method, path, handler, middleware: middleware ?? []);
   }
 
+  @override
+  mount(Pattern path, Router router, {bool hooked: true, String namespace}) {
+    if (_flattened != null) {
+      print(
+          'WARNING: You added mounted a child router ($path) on the router, after it had been optimized.');
+      print('This route will be ignored, and no requests will ever reach it.');
+    }
+    return super
+        .mount(path, router, hooked: hooked != false, namespace: namespace);
+  }
+
   /// Loads some base dependencies into the service container.
   void bootstrapContainer() {
     if (runtimeType != Angel) container.singleton(this, as: Angel);
@@ -400,7 +411,9 @@ class Angel extends AngelBase {
             .forEach(_walk);
       }
 
-      _walk(_flattened = flatten(this));
+      if (_flattened == null) _flattened = flatten(this);
+
+      _walk(_flattened);
       print('Angel is running in production mode.');
     }
   }
@@ -438,10 +451,14 @@ class Angel extends AngelBase {
     _afterProcessed.add(request);
 
     if (!res.willCloseItself) {
+      res.reopen();
+
       for (var finalizer in responseFinalizers) {
         await finalizer(req, res);
       }
 
+      if (res.isOpen) res.end();
+
       for (var key in res.headers.keys) {
         request.response.headers.add(key, res.headers[key]);
       }
diff --git a/pubspec.yaml b/pubspec.yaml
index 7c68938c..4f865bfb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.71
+version: 1.0.0-dev.72
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 94886bca1303a307358e77d91013d38eebaa635c Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 3 Apr 2017 15:43:27 -0400
Subject: [PATCH 117/414] 73

---
 README.md                          |  2 +-
 lib/src/http/response_context.dart | 29 ++++++++++++++---------------
 pubspec.yaml                       |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 9179d255..a4476da9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.72](https://img.shields.io/badge/pub-1.0.0--dev.72-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.73](https://img.shields.io/badge/pub-1.0.0--dev.73-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index d71dafc9..bf39f553 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -34,13 +34,12 @@ class ResponseContext extends Extensible {
   final List<Cookie> cookies = [];
 
   /// Headers that will be sent to the user.
-  ///
-  /// If the response is closed, then this getter will return an immutable `Map`.
   Map<String, String> get headers {
-    if (!_isOpen)
+    /// If the response is closed, then this getter will return an immutable `Map`.
+    /*if (!_isOpen)
       return new Map<String, String>.unmodifiable(_headers);
-    else
-      return _headers;
+    else*/
+    return _headers;
   }
 
   /// Serializes response data into a String.
@@ -113,7 +112,7 @@ class ResponseContext extends Extensible {
 
   /// Sends a download as a response.
   download(File file, {String filename}) async {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
 
     headers["Content-Disposition"] =
         'attachment; filename="${filename ?? file.path}"';
@@ -151,7 +150,7 @@ class ResponseContext extends Extensible {
 
   /// Returns a JSONP response.
   void jsonp(value, {String callbackName: "callback", contentType}) {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
     write("$callbackName(${serializer(value)})");
 
     if (contentType != null) {
@@ -167,7 +166,7 @@ class ResponseContext extends Extensible {
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) async {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
     write(await app.viewGenerator(view, data));
     headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     end();
@@ -181,7 +180,7 @@ class ResponseContext extends Extensible {
   ///
   /// See [Router]#navigate for more. :)
   void redirect(url, {bool absolute: true, int code: 302}) {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
     headers[HttpHeaders.LOCATION] =
         url is String ? url : app.navigate(url, absolute: absolute);
     statusCode = code ?? 302;
@@ -207,7 +206,7 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given named [Route].
   void redirectTo(String name, [Map params, int code]) {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
     Route _findRoute(Router r) {
       for (Route route in r.routes) {
         if (route is SymlinkRoute) {
@@ -232,7 +231,7 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given [Controller] action.
   void redirectToAction(String action, [Map params, int code]) {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
     // UserController@show
     List<String> split = action.split("@");
 
@@ -262,7 +261,7 @@ class ResponseContext extends Extensible {
   /// Copies a file's contents into the response buffer.
   Future sendFile(File file,
       {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     buffer.add(await file.readAsBytes());
@@ -273,7 +272,7 @@ class ResponseContext extends Extensible {
   ///
   /// [contentType] can be either a [String], or a [ContentType].
   void serialize(value, {contentType}) {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
     var text = serializer(value);
     write(text);
 
@@ -292,7 +291,7 @@ class ResponseContext extends Extensible {
       int sleepMs: 0,
       bool resumable: true,
       Codec<List<int>, List<int>> codec}) async {
-    if (!_isOpen) throw _closed();
+    // if (!_isOpen) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     end();
@@ -332,7 +331,7 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
 
   @override
   void _lock() {
-    _closed = true;
+    // _closed = true;
   }
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
index 4f865bfb..4b2de8eb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.72
+version: 1.0.0-dev.73
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From edf1b04f9f8792688203241f536123784f099286 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 4 Apr 2017 04:35:36 -0400
Subject: [PATCH 118/414] 74

---
 README.md                        |   2 +-
 lib/src/http/hooked_service.dart | 121 +++++++++++++++++++++++++++----
 lib/src/http/server.dart         |  31 ++++++++
 pubspec.yaml                     |   2 +-
 test/hooked_test.dart            |   4 +
 5 files changed, 145 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index a4476da9..3578bd38 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.73](https://img.shields.io/badge/pub-1.0.0--dev.73-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0-dev.74](https://img.shields.io/badge/pub-1.0.0--dev.74-red.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 9cd3eb1f..dadda43d 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -11,30 +11,34 @@ import 'service.dart';
 
 /// Wraps another service in a service that broadcasts events on actions.
 class HookedService extends Service {
+  final List<StreamController<HookedServiceEvent>> _ctrl = [];
+
   /// Tbe service that is proxied by this hooked one.
   final Service inner;
 
-  HookedServiceEventDispatcher beforeIndexed =
+  final HookedServiceEventDispatcher beforeIndexed =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher beforeRead = new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher beforeCreated =
+  final HookedServiceEventDispatcher beforeRead =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher beforeModified =
+  final HookedServiceEventDispatcher beforeCreated =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher beforeUpdated =
+  final HookedServiceEventDispatcher beforeModified =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher beforeRemoved =
+  final HookedServiceEventDispatcher beforeUpdated =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher afterIndexed =
+  final HookedServiceEventDispatcher beforeRemoved =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher afterRead = new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher afterCreated =
+  final HookedServiceEventDispatcher afterIndexed =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher afterModified =
+  final HookedServiceEventDispatcher afterRead =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher afterUpdated =
+  final HookedServiceEventDispatcher afterCreated =
       new HookedServiceEventDispatcher();
-  HookedServiceEventDispatcher afterRemoved =
+  final HookedServiceEventDispatcher afterModified =
+      new HookedServiceEventDispatcher();
+  final HookedServiceEventDispatcher afterUpdated =
+      new HookedServiceEventDispatcher();
+  final HookedServiceEventDispatcher afterRemoved =
       new HookedServiceEventDispatcher();
 
   HookedService(Service this.inner) {
@@ -61,6 +65,25 @@ class HookedService extends Service {
           .fold({}, (map, key) => map..[key] = params[key]);
   }
 
+  /// Closes any open [StreamController]s on this instance. **Internal use only**.
+  Future close() async {
+    _ctrl.forEach((c) => c.close());
+    beforeIndexed._close();
+    beforeRead._close();
+    beforeCreated._close();
+    beforeModified._close();
+    beforeUpdated._close();
+    beforeRemoved._close();
+    afterIndexed._close();
+    afterRead._close();
+    afterCreated._close();
+    afterModified._close();
+    afterUpdated._close();
+    afterRemoved._close();
+
+    if (inner is HookedService) inner.close();
+  }
+
   /// Adds hooks to this instance.
   void addHooks() {
     Hooks hooks = getAnnotation(inner, Hooks);
@@ -309,6 +332,54 @@ class HookedService extends Service {
     afterRemoved.listen(listener);
   }
 
+  /// Returns a [Stream] of all events fired before every service method.
+  ///
+  /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
+  /// that events coming out of this [Stream] will see changes you make within the [Stream]
+  /// callback.
+  Stream<HookedServiceEvent> beforeAllStream() {
+    var ctrl = new StreamController<HookedServiceEvent>();
+    _ctrl.add(ctrl);
+    before(HookedServiceEvent.ALL, ctrl.add);
+    return ctrl.stream;
+  }
+
+  /// Returns a [Stream] of all events fired after every service method.
+  ///
+  /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
+  /// that events coming out of this [Stream] will see changes you make within the [Stream]
+  /// callback.
+  Stream<HookedServiceEvent> afterAllStream() {
+    var ctrl = new StreamController<HookedServiceEvent>();
+    _ctrl.add(ctrl);
+    before(HookedServiceEvent.ALL, ctrl.add);
+    return ctrl.stream;
+  }
+
+  /// Returns a [Stream] of all events fired before every service method specified.
+  ///
+  /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
+  /// that events coming out of this [Stream] will see changes you make within the [Stream]
+  /// callback.
+  Stream<HookedServiceEvent> beforeStream(Iterable<String> eventNames) {
+    var ctrl = new StreamController<HookedServiceEvent>();
+    _ctrl.add(ctrl);
+    before(eventNames, ctrl.add);
+    return ctrl.stream;
+  }
+
+  /// Returns a [Stream] of all events fired AFTER every service method specified.
+  ///
+  /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
+  /// that events coming out of this [Stream] will see changes you make within the [Stream]
+  /// callback.
+  Stream<HookedServiceEvent> afterStream(Iterable<String> eventNames) {
+    var ctrl = new StreamController<HookedServiceEvent>();
+    _ctrl.add(ctrl);
+    after(eventNames, ctrl.add);
+    return ctrl.stream;
+  }
+
   /// Runs the [listener] before [create], [modify] and [update].
   void beforeModify(HookedServiceEventListener listener) {
     beforeCreated.listen(listener);
@@ -549,6 +620,14 @@ class HookedServiceEvent {
   static const String MODIFIED = "modified";
   static const String UPDATED = "updated";
   static const String REMOVED = "removed";
+  static const List<String> ALL = const [
+    INDEXED,
+    READ,
+    CREATED,
+    MODIFIED,
+    UPDATED,
+    REMOVED
+  ];
 
   /// Use this to end processing of an event.
   void cancel([result]) {
@@ -601,7 +680,12 @@ typedef HookedServiceEventListener(HookedServiceEvent event);
 
 /// Can be listened to, but events may be canceled.
 class HookedServiceEventDispatcher {
-  List<HookedServiceEventListener> listeners = [];
+  final List<StreamController<HookedServiceEvent>> _ctrl = [];
+  final List<HookedServiceEventListener> listeners = [];
+
+  void _close() {
+    _ctrl.forEach((c) => c.close());
+  }
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
   Future<HookedServiceEvent> _emit(HookedServiceEvent event) async {
@@ -616,6 +700,17 @@ class HookedServiceEventDispatcher {
     return event;
   }
 
+  /// Returns a [Stream] containing all events fired by this dispatcher.
+  ///
+  /// *NOTE*: Callbacks on the returned [Stream] cannot be guaranteed to run before other [listeners].
+  /// Use this only if you need a read-only stream of events.
+  Stream<HookedServiceEvent> asStream() {
+    var ctrl = new StreamController<HookedServiceEvent>();
+    _ctrl.add(ctrl);
+    listen(ctrl.add);
+    return ctrl.stream;
+  }
+
   /// Registers the listener to be called whenever an event is triggered.
   void listen(HookedServiceEventListener listener) {
     listeners.add(listener);
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 7022c76d..093569e9 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -11,6 +11,7 @@ import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
 import 'fatal_error.dart';
+import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -93,6 +94,11 @@ class Angel extends AngelBase {
   /// If the server is never started, they will never be called.
   final List<AngelConfigurer> justBeforeStart = [];
 
+  /// Plug-ins to be called right before server shutdown
+  ///
+  /// If the server is never [close]d, they will never be called.
+  final List<AngelConfigurer> justBeforeStop = [];
+
   /// Always run before responses are sent.
   ///
   /// These will only not run if an [AngelFatalError] occurs,
@@ -180,6 +186,31 @@ class Angel extends AngelBase {
     container.singleton(this);
   }
 
+  /// Shuts down the server, and closes any open [StreamController]s.
+  Future<HttpServer> close() async {
+    HttpServer server;
+
+    if (httpServer != null) {
+      server = httpServer;
+      await httpServer.close(force: true);
+    }
+
+    _afterProcessed.close();
+    _beforeProcessed.close();
+    _fatalErrorStream.close();
+    _onController.close();
+
+    await Future.forEach(services.keys, (Service service) async {
+      if (service is HookedService) {
+        await service.close();
+      }
+    });
+
+    for (var plugin in justBeforeStop) await plugin(this);
+
+    return server;
+  }
+
   @override
   void dumpTree(
       {callback(String tree),
diff --git a/pubspec.yaml b/pubspec.yaml
index 4b2de8eb..f32f63ab 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.73
+version: 1.0.0-dev.74
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index e9608f4b..2371498e 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -24,6 +24,10 @@ main() {
     app.use('/books', new BookService());
     Todos = app.service("todos");
 
+    Todos.beforeAllStream().listen((e) {
+      print('Fired ${e.eventName}! Data: ${e.data}; Params: ${e.params}');
+    });
+
     app.fatalErrorStream.listen((e) => throw e.error);
 
     server = await app.startServer();

From 3e32ea0b8e1b7ce5eec953f56601cb4cb370609e Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 9 Apr 2017 22:39:19 -0400
Subject: [PATCH 119/414] 1.0.0!!!

---
 README.md    | 2 +-
 pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3578bd38..fd1cbe97 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0-dev.74](https://img.shields.io/badge/pub-1.0.0--dev.74-red.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0](https://img.shields.io/badge/pub-1.0.0-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/pubspec.yaml b/pubspec.yaml
index f32f63ab..dbe75ad5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0-dev.74
+version: 1.0.0
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 5d4d2da48b2117c1f8613b88aede98ed068dc454 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 10 Apr 2017 10:46:24 -0400
Subject: [PATCH 120/414] +1

---
 README.md                          |  2 +-
 lib/src/http/response_context.dart | 14 +++++++-------
 pubspec.yaml                       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fd1cbe97..abb1495e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0](https://img.shields.io/badge/pub-1.0.0-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.0+1](https://img.shields.io/badge/pub-1.0.0+1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index bf39f553..e666bf8a 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -305,14 +305,14 @@ class ResponseContext extends Extensible {
 
   /// Writes data to the response.
   void write(value, {Encoding encoding: UTF8}) {
-    if (!_isOpen)
+    /*if (!_isOpen)
       throw _closed();
-    else {
-      if (value is List<int>)
-        buffer.add(value);
-      else
-        buffer.add(encoding.encode(value.toString()));
-    }
+    else {*/
+    if (value is List<int>)
+      buffer.add(value);
+    else
+      buffer.add(encoding.encode(value.toString()));
+    //}
   }
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index dbe75ad5..207b8c5f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0
+version: 1.0.0+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From eb9a46f282d9f97ec7f651da5cc5b75b4cc6ebfb Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 15 Apr 2017 13:42:21 -0400
Subject: [PATCH 121/414] Fixed last batch?

---
 .idea/libraries/Dart_Packages.xml     | 108 +++++++---
 .idea/libraries/Dart_SDK.xml          |  25 +++
 .idea/runConfigurations/All_Tests.xml |   1 +
 .idea/workspace.xml                   | 289 +++++++++++++++-----------
 README.md                             |   2 +-
 lib/hooks.dart                        |  86 ++++++--
 lib/src/http/map_service.dart         |  12 +-
 lib/src/http/response_context.dart    |   6 +-
 lib/src/http/server.dart              |  78 ++++---
 pubspec.yaml                          |   2 +-
 10 files changed, 398 insertions(+), 211 deletions(-)
 create mode 100644 .idea/libraries/Dart_SDK.xml

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 11a357af..fd29c844 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,14 +5,14 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.10/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
             </list>
           </value>
         </entry>
@@ -26,21 +26,21 @@
         <entry key="async">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="barback">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+10/lib" />
             </list>
           </value>
         </entry>
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
             </list>
           </value>
         </entry>
@@ -58,10 +58,17 @@
             </list>
           </value>
         </entry>
+        <entry key="cli_util">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.0.1+2/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.13.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.0/lib" />
             </list>
           </value>
         </entry>
@@ -89,7 +96,14 @@
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.5/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="flatten">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
             </list>
           </value>
         </entry>
@@ -110,7 +124,7 @@
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
             </list>
           </value>
         </entry>
@@ -138,7 +152,7 @@
         <entry key="isolate">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
             </list>
           </value>
         </entry>
@@ -173,7 +187,7 @@
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
             </list>
           </value>
         </entry>
@@ -215,7 +229,7 @@
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.0/lib" />
             </list>
           </value>
         </entry>
@@ -226,6 +240,13 @@
             </list>
           </value>
         </entry>
+        <entry key="random_string">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="shelf">
           <value>
             <list>
@@ -264,7 +285,7 @@
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
             </list>
           </value>
         </entry>
@@ -278,14 +299,14 @@
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
             </list>
           </value>
         </entry>
@@ -296,10 +317,17 @@
             </list>
           </value>
         </entry>
+        <entry key="term_glyph">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.18+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.20+10/lib" />
             </list>
           </value>
         </entry>
@@ -331,6 +359,20 @@
             </list>
           </value>
         </entry>
+        <entry key="when">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/when-0.2.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="which">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/which-0.1.3/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="yaml">
           <value>
             <list>
@@ -341,53 +383,59 @@
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.10/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.11.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+9/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.0-dev+5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+10/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.13.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.0.1+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.2+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+9/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-0.2.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.2.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.5.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.18+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.20+10/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/when-0.2.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/which-0.1.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
     </CLASSES>
     <SOURCES />
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
new file mode 100644
index 00000000..a1c33e62
--- /dev/null
+++ b/.idea/libraries/Dart_SDK.xml
@@ -0,0 +1,25 @@
+<component name="libraryTable">
+  <library name="Dart SDK">
+    <CLASSES>
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/async" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/collection" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/convert" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/core" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/developer" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/html" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/indexed_db" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/io" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/isolate" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/js" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/js_util" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/math" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/mirrors" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/svg" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/typed_data" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/web_audio" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/web_gl" />
+      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/web_sql" />
+    </CLASSES>
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
index ac11209e..c753608c 100644
--- a/.idea/runConfigurations/All_Tests.xml
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -2,6 +2,7 @@
   <configuration default="false" name="All Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
     <option name="filePath" value="$PROJECT_DIR$/test" />
     <option name="scope" value="FOLDER" />
+    <option name="testRunnerOptions" value="-j 5" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 721e5e7e..3127f8de 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -24,24 +32,27 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#17#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="388">
+              <caret line="185" column="32" lean-forward="false" selection-start-line="185" selection-start-column="32" selection-end-line="185" selection-end-column="32" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3000">
-              <caret line="208" column="26" lean-forward="false" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
-              <folding />
+            <state relative-caret-position="179">
+              <caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+                <marker date="1492277003000" expanded="true" signature="174:3294" ph="{...}" />
+                <marker date="1492277003000" expanded="true" signature="1401:1771" ph="{...}" />
+                <marker date="1492277003000" expanded="true" signature="2900:3292" ph="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -49,8 +60,8 @@
       <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="90" column="46" lean-forward="true" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
+            <state relative-caret-position="1350">
+              <caret line="90" column="46" lean-forward="false" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
               <folding />
             </state>
           </provider>
@@ -59,39 +70,31 @@
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+            <state relative-caret-position="15">
+              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="memory_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
+      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1020">
-              <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
+            <state relative-caret-position="200">
+              <caret line="85" column="10" lean-forward="false" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1275">
-              <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/common.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-              <folding />
+            <state relative-caret-position="349">
+              <caret line="312" column="3" lean-forward="false" selection-start-line="312" selection-start-column="3" selection-end-line="312" selection-end-column="3" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -112,10 +115,8 @@
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="1215">
-              <caret line="88" column="35" lean-forward="false" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
-              <folding>
-                <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
-              </folding>
+              <caret line="88" column="30" lean-forward="false" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -139,6 +140,9 @@
       <find>BEFORE</find>
       <find>_onError</find>
       <find>_fatalErrorStream.add</find>
+      <find>throw</find>
+      <find>upa</find>
+      <find>transform</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -153,13 +157,15 @@
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -170,8 +176,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="324" />
-    <option name="y" value="70" />
+    <option name="x" value="201" />
+    <option name="y" value="65" />
     <option name="width" value="1486" />
     <option name="height" value="909" />
   </component>
@@ -193,6 +199,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -275,8 +283,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -291,13 +297,32 @@
     <property name="js.eslint.eslintPackage" value="" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
   </component>
-  <component name="RunManager" selected="Dart Test.Controller Tests">
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
     <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
       <method />
     </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
+      <node-interpreter value="project" />
+      <working-dir value="" />
+      <envs />
+      <scope-kind value="ALL" />
+      <method />
+    </configuration>
     <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
       <config-file value="" />
       <node-interpreter value="project" />
@@ -332,7 +357,7 @@
       <method />
     </configuration>
     <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
+      <command value="run" />
       <scripts />
       <node-interpreter value="project" />
       <envs />
@@ -352,11 +377,11 @@
       <method />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.All Tests" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -376,6 +401,7 @@
       <workItem from="1481390924053" duration="19000" />
       <workItem from="1483149948840" duration="930000" />
       <workItem from="1484451782119" duration="617000" />
+      <workItem from="1492276672342" duration="1434000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -423,17 +449,17 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="Controller_Tests - 2016.12.30 at 21h 15m 45s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.04.15 at 13h 18m 39s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2016.12.30 at 21h 22m 18s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.04.15 at 13h 40m 48s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="DI_Tests - 2016.12.30 at 21h 14m 42s.xml">
-      <configuration name="DI Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.04.15 at 13h 41m 00s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 14s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.04.15 at 13h 41m 54s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 45s.xml">
       <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
@@ -455,7 +481,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4231000" />
+    <option name="totallyTimeSpent" value="5665000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -467,29 +493,29 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="324" y="70" width="1486" height="909" extended-state="0" />
+    <frame x="201" y="65" width="1486" height="909" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2122867" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2122867" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -517,7 +543,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#0#17#0" expanded="true" />
+            <element signature="e#0#17#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -584,7 +610,6 @@
           <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
-            <marker date="1484408336000" expanded="true" signature="14805:14807" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -627,9 +652,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding>
-            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -662,7 +685,6 @@
           <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
-            <marker date="1484408336000" expanded="true" signature="14805:14807" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -712,9 +734,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding>
-            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -751,9 +771,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -786,16 +804,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="75">
-            <caret line="5" column="39" lean-forward="false" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1260">
@@ -816,26 +824,7 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3000">
-          <caret line="208" column="26" lean-forward="false" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2865">
-          <caret line="260" column="9" lean-forward="true" selection-start-line="260" selection-start-column="9" selection-end-line="260" selection-end-column="9" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-            <marker date="1484408336000" expanded="true" signature="14805:14807" ph="{...}" />
+            <element signature="e#0#17#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -843,7 +832,7 @@
     <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1020">
-          <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
+          <caret line="74" column="0" lean-forward="false" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -851,7 +840,7 @@
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1275">
-          <caret line="90" column="29" lean-forward="false" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+          <caret line="90" column="25" lean-forward="false" selection-start-line="90" selection-start-column="25" selection-end-line="90" selection-end-column="25" />
           <folding />
         </state>
       </provider>
@@ -877,10 +866,8 @@
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1215">
-          <caret line="88" column="35" lean-forward="false" selection-start-line="88" selection-start-column="35" selection-end-line="88" selection-end-column="35" />
-          <folding>
-            <marker date="1484185617000" expanded="true" signature="772:1296" ph="{...}" />
-          </folding>
+          <caret line="88" column="30" lean-forward="false" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -896,16 +883,76 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="90" column="46" lean-forward="true" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
+        <state relative-caret-position="1350">
+          <caret line="90" column="46" lean-forward="false" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="388">
+          <caret line="185" column="32" lean-forward="false" selection-start-line="185" selection-start-column="32" selection-end-line="185" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="179">
+          <caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+            <marker date="1492277003000" expanded="true" signature="174:3294" ph="{...}" />
+            <marker date="1492277003000" expanded="true" signature="1401:1771" ph="{...}" />
+            <marker date="1492277003000" expanded="true" signature="2900:3292" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="85" column="10" lean-forward="false" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="349">
+          <caret line="312" column="3" lean-forward="false" selection-start-line="312" selection-start-column="3" selection-end-line="312" selection-end-column="3" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="45">
+            <caret line="3" column="62" lean-forward="false" selection-start-line="3" selection-start-column="62" selection-end-line="3" selection-end-column="62" />
+            <folding>
+              <marker date="1492278100000" expanded="true" signature="428:616" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+        <state relative-caret-position="15">
+          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
           <folding />
         </state>
       </provider>
diff --git a/README.md b/README.md
index abb1495e..c605acd2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.0+1](https://img.shields.io/badge/pub-1.0.0+1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.1](https://img.shields.io/badge/pub-1.0.1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 684abc6b..71aa40d2 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -36,21 +36,75 @@ AngelConfigurer hookAllServices(callback(Service service)) {
 HookedServiceEventListener toJson() => transform(god.serializeObject);
 
 /// Mutates `e.data` or `e.result` using the given [transformer].
-HookedServiceEventListener transform(transformer(obj)) {
-  normalize(obj) {
+///
+/// You can optionally provide a [condition], which can be:
+/// * A [Providers] instance, or String, to run only on certain clients
+/// * The type [Providers], in which case the transformer will run on every client, but *not* on server-side events.
+/// * A function: if the function returns `true` (sync or async, doesn't matter),
+/// then the transformer will run. If not, the event will be skipped.
+/// * An [Iterable] of the above three.
+///
+/// A provided function must take a [HookedServiceEvent] as its only parameter.
+HookedServiceEventListener transform(transformer(obj), [condition]) {
+  Iterable cond = condition is Iterable ? condition : [condition];
+
+  _condition(HookedServiceEvent e, condition) async {
+    if (condition is Function)
+      return await condition(e);
+    else if (condition == Providers)
+      return true;
+    else {
+      if (e.params?.containsKey('provider') == true) {
+        var provider = e.params['provider'] as Providers;
+        if (condition is Providers)
+          return condition == provider;
+        else
+          return condition.toString() == provider.via;
+      } else {
+        return false;
+      }
+    }
+  }
+
+  normalize(HookedServiceEvent e, obj) async {
+    bool transform = true;
+
+    for (var c in cond) {
+      var r = await _condition(e, c);
+
+      if (r != true) {
+        transform = false;
+        break;
+      }
+    }
+
+    if (transform != true) {
+      if (obj == null)
+        return null;
+      else if (obj is Iterable)
+        return obj.toList();
+      else
+        return obj;
+    }
+
     if (obj == null)
       return null;
-    else if (obj is Iterable)
-      return obj.map(normalize).toList();
-    else
+    else if (obj is Iterable) {
+      var r = [];
+
+      for (var o in obj) {
+        r.add(await normalize(e, o));
+      }
+
+      return r;
+    } else
       return transformer(obj);
   }
 
-  return (HookedServiceEvent e) {
+  return (HookedServiceEvent e) async {
     if (e.isBefore) {
-      e.data = normalize(e.data);
-    } else if (e.isAfter)
-      e.result = normalize(e.result);
+      e.data = await normalize(e, e.data);
+    } else if (e.isAfter) e.result = await normalize(e, e.result);
   };
 }
 
@@ -77,8 +131,6 @@ HookedServiceEventListener toType(Type type) {
 /// Only applies to the client-side.
 HookedServiceEventListener remove(key, [remover(key, obj)]) {
   return (HookedServiceEvent e) async {
-    if (!e.isAfter) throw new StateError("'remove' only works on after hooks.");
-
     _remover(key, obj) {
       if (remover != null)
         return remover(key, obj);
@@ -95,7 +147,7 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
           reflect(obj).setField(new Symbol(key), null);
           return obj;
         } catch (e) {
-          throw new ArgumentError("Cannot remove key 'key' from $obj.");
+          throw new ArgumentError("Cannot remove key '$key' from $obj.");
         }
       }
     }
@@ -206,10 +258,18 @@ HookedServiceEventListener addCreatedAt({
   };
 }
 
+/// Typo: Use [addUpdatedAt] instead.
+@deprecated
+HookedServiceEventListener addUpatedAt({
+  assign(obj, String now),
+  String key,
+}) =>
+    addUpdatedAt(assign: assign, key: key);
+
 /// Serializes the current time to `e.data` or `e.result`.
 /// You can provide an [assign] function to set the property on your object, and skip reflection.///
 /// Default key: `createdAt`
-HookedServiceEventListener addUpatedAt({
+HookedServiceEventListener addUpdatedAt({
   assign(obj, String now),
   String key,
 }) {
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index d06fbf73..a4b3909c 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -52,9 +52,11 @@ class MapService extends Service {
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
+    var now = new DateTime.now();
     var result = data
       ..['id'] = items.length.toString()
-      ..['createdAt'] = new DateTime.now();
+      ..['createdAt'] = now
+      ..['updatedAt'] = now;
     items.add(result);
     return result;
   }
@@ -97,6 +99,14 @@ class MapService extends Service {
 
   @override
   Future<Map> remove(id, [Map params]) async {
+    if (id == null ||
+        id == 'null' &&
+            (allowRemoveAll == true ||
+                params?.containsKey('provider') != true)) {
+      items.clear();
+      return {};
+    }
+
     var result = await read(id, params);
 
     if (items.remove(result))
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index e666bf8a..01b2efdc 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -181,8 +181,10 @@ class ResponseContext extends Extensible {
   /// See [Router]#navigate for more. :)
   void redirect(url, {bool absolute: true, int code: 302}) {
     // if (!_isOpen) throw _closed();
-    headers[HttpHeaders.LOCATION] =
-        url is String ? url : app.navigate(url, absolute: absolute);
+    headers
+      ..[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString()
+      ..[HttpHeaders.LOCATION] =
+          url is String ? url : app.navigate(url, absolute: absolute);
     statusCode = code ?? 302;
     write('''
     <!DOCTYPE html>
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 093569e9..f32fe3a9 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -252,70 +252,64 @@ class Angel extends AngelBase {
     _serializer = serializer;
   }
 
-  /// Runs some [handler]. Returns `true` if request execution should continue.
-  Future<bool> executeHandler(
+  Future getHandlerResult(
       handler, RequestContext req, ResponseContext res) async {
     if (handler is RequestMiddleware) {
       var result = await handler(req, res);
 
-      if (result is bool)
-        return result == true;
-      else if (result is RequestHandler)
-        return await executeHandler(result, req, res);
-      else if (result != null) {
-        res.serialize(result,
-            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-                ContentType.JSON.mimeType);
-        return false;
-      } else
-        return res.isOpen;
+      if (result is RequestHandler)
+        return await getHandlerResult(result, req, res);
+      else
+        return result;
     }
 
     if (handler is RequestHandler) {
       var result = await handler(req, res);
       if (result is RequestHandler)
-        return await executeHandler(result, req, res);
-      return res.isOpen;
+        return await getHandlerResult(result, req, res);
+      else
+        return result;
     }
 
     if (handler is Future) {
       var result = await handler;
-      if (result is bool)
-        return result == true;
-      else if (result is RequestHandler)
-        return await executeHandler(result, req, res);
-      else if (result != null) {
-        res.serialize(result,
-            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-                ContentType.JSON.mimeType);
-        return false;
-      } else
-        return true;
+      if (result is RequestHandler)
+        return await getHandlerResult(result, req, res);
+      else
+        return result;
     }
 
     if (handler is Function) {
       var result = await runContained(handler, req, res);
-      if (result is bool)
-        return result == true;
-      else if (result is RequestHandler)
-        return await executeHandler(result, req, res);
-      else if (result != null) {
-        res.serialize(result,
-            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-                ContentType.JSON.mimeType);
-        return false;
-      } else
-        return true;
+      if (result is RequestHandler)
+        return await getHandlerResult(result, req, res);
+      else
+        return result;
     }
 
     if (requestMiddleware.containsKey(handler)) {
-      return await executeHandler(requestMiddleware[handler], req, res);
+      return await getHandlerResult(requestMiddleware[handler], req, res);
     }
 
-    res.serialize(handler,
-        contentType:
-            res.headers[HttpHeaders.CONTENT_TYPE] ?? ContentType.JSON.mimeType);
-    return false;
+    return handler;
+  }
+
+  /// Runs some [handler]. Returns `true` if request execution should continue.
+  Future<bool> executeHandler(
+      handler, RequestContext req, ResponseContext res) async {
+    var result = await getHandlerResult(handler, req, res);
+
+    if (result is Future) {
+      return await executeHandler(await result, req, res);
+    } else if (result is bool) {
+      return result;
+    } else if (result != null) {
+      res.serialize(result,
+          contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+              ContentType.JSON.mimeType);
+      return false;
+    } else
+      return res.isOpen;
   }
 
   Future<RequestContext> createRequestContext(HttpRequest request) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 207b8c5f..a1990838 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.0+1
+version: 1.0.1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 0c57b06cfa7d5ff8753b3ead2dfcc6484c74034e Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 24 Apr 2017 22:32:16 -0400
Subject: [PATCH 122/414] 1.0.2

---
 .idea/workspace.xml                | 221 +++++++++++++----------------
 README.md                          |   2 +-
 lib/hooks.dart                     |   4 +-
 lib/src/http/response_context.dart |  58 ++++----
 lib/src/http/server.dart           |   2 -
 pubspec.yaml                       |   2 +-
 6 files changed, 140 insertions(+), 149 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3127f8de..c7b6016a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
@@ -35,8 +31,8 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="388">
-              <caret line="185" column="32" lean-forward="false" selection-start-line="185" selection-start-column="32" selection-end-line="185" selection-end-column="32" />
+            <state relative-caret-position="84">
+              <caret line="180" column="68" lean-forward="true" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
               <folding />
             </state>
           </provider>
@@ -45,60 +41,35 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="179">
-              <caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+            <state relative-caret-position="312">
+              <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
-                <marker date="1492277003000" expanded="true" signature="174:3294" ph="{...}" />
-                <marker date="1492277003000" expanded="true" signature="1401:1771" ph="{...}" />
-                <marker date="1492277003000" expanded="true" signature="2900:3292" ph="{...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1350">
+            <state relative-caret-position="696">
               <caret line="90" column="46" lean-forward="false" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="85" column="10" lean-forward="false" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
+            <state relative-caret-position="101">
+              <caret line="238" column="69" lean-forward="true" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="349">
-              <caret line="312" column="3" lean-forward="false" selection-start-line="312" selection-start-column="3" selection-end-line="312" selection-end-column="3" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -143,7 +114,17 @@
       <find>throw</find>
       <find>upa</find>
       <find>transform</find>
+      <find>isAfter</find>
+      <find>isBefore</find>
+      <find>close</find>
+      <find>!_isOpen</find>
+      <find>end</find>
+      <find>reopen</find>
+      <find>REDIRECT</find>
     </findStrings>
+    <replaceStrings>
+      <replace>_isClosed</replace>
+    </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -160,10 +141,10 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/README.md" />
       </list>
@@ -176,10 +157,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="201" />
-    <option name="y" value="65" />
-    <option name="width" value="1486" />
-    <option name="height" value="909" />
+    <option name="x" value="155" />
+    <option name="y" value="131" />
+    <option name="width" value="1416" />
+    <option name="height" value="843" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -316,6 +297,9 @@
     <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
       <method />
     </configuration>
+    <configuration default="true" type="FlutterRunConfigurationType" factoryName="Flutter">
+      <method />
+    </configuration>
     <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
       <node-interpreter value="project" />
       <working-dir value="" />
@@ -338,6 +322,12 @@
     <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
       <method />
     </configuration>
+    <configuration default="true" type="LLVMCommandLineRunConfigurationType" factoryName="LLVM Application" show_console_on_std_err="false" show_console_on_std_out="false">
+      <option name="VMOptions" />
+      <option name="arguments" />
+      <option name="filePath" />
+      <method />
+    </configuration>
     <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
       <method />
     </configuration>
@@ -401,7 +391,8 @@
       <workItem from="1481390924053" duration="19000" />
       <workItem from="1483149948840" duration="930000" />
       <workItem from="1484451782119" duration="617000" />
-      <workItem from="1492276672342" duration="1434000" />
+      <workItem from="1492276672342" duration="1478000" />
+      <workItem from="1493086837879" duration="686000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -445,13 +436,17 @@
       <option name="project" value="LOCAL" />
       <updated>1483150975010</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="Fixed last batch?">
+      <created>1492278141283</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1492278141283</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.04.15 at 13h 18m 39s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2017.04.15 at 13h 40m 48s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -461,6 +456,9 @@
     <history-entry file="All_Tests - 2017.04.15 at 13h 41m 54s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2017.04.24 at 22h 30m 02s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 45s.xml">
       <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -481,7 +479,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5665000" />
+    <option name="totallyTimeSpent" value="6395000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -493,23 +491,23 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="201" y="65" width="1486" height="909" extended-state="0" />
+    <frame x="155" y="131" width="1416" height="843" extended-state="0" />
     <editor active="true" />
     <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32925338" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2122867" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -531,7 +529,8 @@
     <MESSAGE value="Done???" />
     <MESSAGE value="findExpose" />
     <MESSAGE value="I love stack overflows!!!" />
-    <option name="LAST_COMMIT_MESSAGE" value="I love stack overflows!!!" />
+    <MESSAGE value="Fixed last batch?" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed last batch?" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -542,9 +541,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#17#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -626,7 +622,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1275">
           <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -634,7 +629,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
           <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -701,7 +695,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1275">
           <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -709,7 +702,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
           <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -823,9 +815,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#17#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -833,7 +822,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1020">
           <caret line="74" column="0" lean-forward="false" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -841,7 +829,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1275">
           <caret line="90" column="25" lean-forward="false" selection-start-line="90" selection-start-column="25" selection-end-line="90" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -849,7 +836,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
           <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -871,6 +857,14 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -881,71 +875,39 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1350">
-          <caret line="90" column="46" lean-forward="false" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="185" column="32" lean-forward="false" selection-start-line="185" selection-start-column="32" selection-end-line="185" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
+        <state relative-caret-position="312">
+          <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
-            <marker date="1492277003000" expanded="true" signature="174:3294" ph="{...}" />
-            <marker date="1492277003000" expanded="true" signature="1401:1771" ph="{...}" />
-            <marker date="1492277003000" expanded="true" signature="2900:3292" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="85" column="10" lean-forward="false" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="349">
-          <caret line="312" column="3" lean-forward="false" selection-start-line="312" selection-start-column="3" selection-end-line="312" selection-end-column="3" />
+        <state relative-caret-position="220">
+          <caret line="477" column="31" lean-forward="false" selection-start-line="477" selection-start-column="31" selection-end-line="477" selection-end-column="31" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="45">
-            <caret line="3" column="62" lean-forward="false" selection-start-line="3" selection-start-column="62" selection-end-line="3" selection-end-column="62" />
-            <folding>
-              <marker date="1492278100000" expanded="true" signature="428:616" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="101">
+          <caret line="238" column="69" lean-forward="true" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="180" column="68" lean-forward="true" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -957,5 +919,26 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="52" lean-forward="false" selection-start-line="2" selection-start-column="52" selection-end-line="2" selection-end-column="52" />
+            <folding>
+              <marker date="1493087521000" expanded="true" signature="428:616" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="696">
+          <caret line="90" column="46" lean-forward="false" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index c605acd2..bbc09c1a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.1](https://img.shields.io/badge/pub-1.0.1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.2](https://img.shields.io/badge/pub-1.0.2-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 71aa40d2..510b6731 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -241,7 +241,7 @@ HookedServiceEventListener addCreatedAt({
       }
     }
 
-    var now = new DateTime.now().toIso8601String();
+    var now = new DateTime.now().toUtc().toIso8601String();
 
     normalize(obj) async {
       if (obj != null) {
@@ -292,7 +292,7 @@ HookedServiceEventListener addUpdatedAt({
       }
     }
 
-    var now = new DateTime.now().toIso8601String();
+    var now = new DateTime.now().toUtc().toIso8601String();
 
     normalize(obj) async {
       if (obj != null) {
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 01b2efdc..668a9805 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -22,7 +22,7 @@ typedef String ResponseSerializer(data);
 class ResponseContext extends Extensible {
   final _LockableBytesBuilder _buffer = new _LockableBytesBuilder();
   final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
-  bool _isOpen = true;
+  bool _isOpen = true, _isClosed = false;
 
   /// The [Angel] instance that is sending a response.
   Angel app;
@@ -36,10 +36,10 @@ class ResponseContext extends Extensible {
   /// Headers that will be sent to the user.
   Map<String, String> get headers {
     /// If the response is closed, then this getter will return an immutable `Map`.
-    /*if (!_isOpen)
+    if (!_isOpen)
       return new Map<String, String>.unmodifiable(_headers);
-    else*/
-    return _headers;
+    else
+      return _headers;
   }
 
   /// Serializes response data into a String.
@@ -112,7 +112,7 @@ class ResponseContext extends Extensible {
 
   /// Sends a download as a response.
   download(File file, {String filename}) async {
-    // if (!_isOpen) throw _closed();
+    if (!_isOpen) throw _closed();
 
     headers["Content-Disposition"] =
         'attachment; filename="${filename ?? file.path}"';
@@ -122,15 +122,25 @@ class ResponseContext extends Extensible {
     end();
   }
 
-  /// Prevents more data from being written to the response.
-  void end() {
+  /// Prevents more data from being written to the response, and locks it entire from further editing.
+  void close() {
     _buffer._lock();
     _isOpen = false;
+    _isClosed = true;
+  }
+
+  /// Prevents further request handlers from running on the response, except for response finalizers.
+  ///
+  /// To disable response finalizers, see [willCloseItself].
+  void end() {
+    _isOpen = false;
   }
 
   /// Re-opens a closed response. **NEVER USE THIS IN A PLUGIN**.
   ///
   /// To preserve your sanity, don't use it ever. This is solely for internal use.
+  ///
+  /// You're going to need this one day, and you'll be happy it was added.
   void reopen() {
     _buffer._reopen();
     _isOpen = true;
@@ -150,7 +160,7 @@ class ResponseContext extends Extensible {
 
   /// Returns a JSONP response.
   void jsonp(value, {String callbackName: "callback", contentType}) {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
     write("$callbackName(${serializer(value)})");
 
     if (contentType != null) {
@@ -166,7 +176,7 @@ class ResponseContext extends Extensible {
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) async {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
     write(await app.viewGenerator(view, data));
     headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     end();
@@ -180,7 +190,7 @@ class ResponseContext extends Extensible {
   ///
   /// See [Router]#navigate for more. :)
   void redirect(url, {bool absolute: true, int code: 302}) {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
     headers
       ..[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString()
       ..[HttpHeaders.LOCATION] =
@@ -208,7 +218,7 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given named [Route].
   void redirectTo(String name, [Map params, int code]) {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
     Route _findRoute(Router r) {
       for (Route route in r.routes) {
         if (route is SymlinkRoute) {
@@ -233,7 +243,7 @@ class ResponseContext extends Extensible {
 
   /// Redirects to the given [Controller] action.
   void redirectToAction(String action, [Map params, int code]) {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
     // UserController@show
     List<String> split = action.split("@");
 
@@ -263,7 +273,7 @@ class ResponseContext extends Extensible {
   /// Copies a file's contents into the response buffer.
   Future sendFile(File file,
       {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     buffer.add(await file.readAsBytes());
@@ -274,7 +284,7 @@ class ResponseContext extends Extensible {
   ///
   /// [contentType] can be either a [String], or a [ContentType].
   void serialize(value, {contentType}) {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
     var text = serializer(value);
     write(text);
 
@@ -293,13 +303,13 @@ class ResponseContext extends Extensible {
       int sleepMs: 0,
       bool resumable: true,
       Codec<List<int>, List<int>> codec}) async {
-    // if (!_isOpen) throw _closed();
+    if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     end();
     willCloseItself = true;
 
-    var stream = codec != null
+    Stream stream = codec != null
         ? file.openRead().transform(codec.encoder)
         : file.openRead();
     await stream.pipe(io);
@@ -307,14 +317,14 @@ class ResponseContext extends Extensible {
 
   /// Writes data to the response.
   void write(value, {Encoding encoding: UTF8}) {
-    /*if (!_isOpen)
+    if (_isClosed)
       throw _closed();
-    else {*/
-    if (value is List<int>)
-      buffer.add(value);
-    else
-      buffer.add(encoding.encode(value.toString()));
-    //}
+    else {
+      if (value is List<int>)
+        buffer.add(value);
+      else
+        buffer.add(encoding.encode(value.toString()));
+    }
   }
 }
 
@@ -333,7 +343,7 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
 
   @override
   void _lock() {
-    // _closed = true;
+    _closed = true;
   }
 
   @override
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index f32fe3a9..b52a2bef 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -476,8 +476,6 @@ class Angel extends AngelBase {
     _afterProcessed.add(request);
 
     if (!res.willCloseItself) {
-      res.reopen();
-
       for (var finalizer in responseFinalizers) {
         await finalizer(req, res);
       }
diff --git a/pubspec.yaml b/pubspec.yaml
index a1990838..32df2ec1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.1
+version: 1.0.2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 8187045754e6123e449e8d7387492e21db9c2adc Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 24 Apr 2017 22:44:22 -0400
Subject: [PATCH 123/414] +1

---
 .idea/workspace.xml              | 191 +++++++++++++++++++------------
 README.md                        |   2 +-
 lib/src/http/hooked_service.dart |   1 +
 lib/src/http/server.dart         |   6 +-
 lib/src/http/service.dart        |   3 +
 pubspec.yaml                     |   2 +-
 6 files changed, 124 insertions(+), 81 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c7b6016a..040d56bd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,9 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -31,8 +31,8 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="84">
-              <caret line="180" column="68" lean-forward="true" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
+            <state relative-caret-position="2580">
+              <caret line="180" column="68" lean-forward="false" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
               <folding />
             </state>
           </provider>
@@ -41,7 +41,7 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="312">
+            <state relative-caret-position="435">
               <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
@@ -50,11 +50,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="696">
-              <caret line="90" column="46" lean-forward="false" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
+            <state relative-caret-position="141">
+              <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -63,25 +73,45 @@
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="101">
-              <caret line="238" column="69" lean-forward="true" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
+            <state relative-caret-position="3525">
+              <caret line="238" column="69" lean-forward="false" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="960">
-              <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
+            <state relative-caret-position="273">
+              <caret line="201" column="0" lean-forward="true" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#38#58#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="133">
+              <caret line="43" column="25" lean-forward="true" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="67" column="16" lean-forward="true" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -121,6 +151,7 @@
       <find>end</find>
       <find>reopen</find>
       <find>REDIRECT</find>
+      <find>close(</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -136,17 +167,18 @@
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -157,7 +189,7 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="155" />
+    <option name="x" value="154" />
     <option name="y" value="131" />
     <option name="width" value="1416" />
     <option name="height" value="843" />
@@ -180,8 +212,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -264,6 +294,8 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -392,7 +424,8 @@
       <workItem from="1483149948840" duration="930000" />
       <workItem from="1484451782119" duration="617000" />
       <workItem from="1492276672342" duration="1478000" />
-      <workItem from="1493086837879" duration="686000" />
+      <workItem from="1493086837879" duration="726000" />
+      <workItem from="1493088139942" duration="108000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -443,13 +476,17 @@
       <option name="project" value="LOCAL" />
       <updated>1492278141283</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="1.0.2">
+      <created>1493087536575</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1493087536575</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.04.15 at 13h 40m 48s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2017.04.15 at 13h 41m 00s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -459,6 +496,9 @@
     <history-entry file="All_Tests - 2017.04.24 at 22h 30m 02s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2017.04.24 at 22h 32m 10s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 45s.xml">
       <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -479,7 +519,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6395000" />
+    <option name="totallyTimeSpent" value="6543000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -491,23 +531,22 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="155" y="131" width="1416" height="843" extended-state="0" />
-    <editor active="true" />
+    <frame x="154" y="131" width="1416" height="843" extended-state="0" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32680538" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -530,7 +569,8 @@
     <MESSAGE value="findExpose" />
     <MESSAGE value="I love stack overflows!!!" />
     <MESSAGE value="Fixed last batch?" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed last batch?" />
+    <MESSAGE value="1.0.2" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.2" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -804,13 +844,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -841,7 +874,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="960">
+        <state relative-caret-position="1050">
           <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -857,14 +890,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -877,7 +902,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
+        <state relative-caret-position="435">
           <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -885,36 +910,42 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="477" column="31" lean-forward="false" selection-start-line="477" selection-start-column="31" selection-end-line="477" selection-end-column="31" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="101">
-          <caret line="238" column="69" lean-forward="true" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
+        <state relative-caret-position="3525">
+          <caret line="238" column="69" lean-forward="false" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="180" column="68" lean-forward="true" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
+        <state relative-caret-position="2580">
+          <caret line="180" column="68" lean-forward="false" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+        <state relative-caret-position="141">
+          <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="67" column="16" lean-forward="true" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="43" column="25" lean-forward="true" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
           <folding />
         </state>
       </provider>
@@ -923,19 +954,29 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="30">
-            <caret line="2" column="52" lean-forward="false" selection-start-line="2" selection-start-column="52" selection-end-line="2" selection-end-column="52" />
+            <caret line="2" column="14" lean-forward="false" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
             <folding>
-              <marker date="1493087521000" expanded="true" signature="428:616" ph="{...}" />
+              <marker date="1493088244000" expanded="true" signature="432:620" ph="{...}" />
             </folding>
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="696">
-          <caret line="90" column="46" lean-forward="false" selection-start-line="90" selection-start-column="46" selection-end-line="90" selection-end-column="46" />
+        <state relative-caret-position="273">
+          <caret line="201" column="0" lean-forward="true" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
           <folding />
         </state>
       </provider>
diff --git a/README.md b/README.md
index bbc09c1a..ccd3cd30 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.2](https://img.shields.io/badge/pub-1.0.2-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.2+1](https://img.shields.io/badge/pub-1.0.2+1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index dadda43d..c4722f3a 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -66,6 +66,7 @@ class HookedService extends Service {
   }
 
   /// Closes any open [StreamController]s on this instance. **Internal use only**.
+  @override
   Future close() async {
     _ctrl.forEach((c) => c.close());
     beforeIndexed._close();
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index b52a2bef..1980106a 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -200,10 +200,8 @@ class Angel extends AngelBase {
     _fatalErrorStream.close();
     _onController.close();
 
-    await Future.forEach(services.keys, (Service service) async {
-      if (service is HookedService) {
-        await service.close();
-      }
+    await Future.forEach(services.values, (Service service) async {
+      await service.close();
     });
 
     for (var plugin in justBeforeStop) await plugin(this);
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 5cee5774..162f675b 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -40,6 +40,9 @@ class Service extends Routable {
   /// The [Angel] app powering this service.
   AngelBase app;
 
+  /// Closes this service, including any database connections or stream controllers.
+  Future close() async {}
+
   /// Retrieves all resources.
   Future index([Map params]) {
     throw new AngelHttpException.methodNotAllowed();
diff --git a/pubspec.yaml b/pubspec.yaml
index 32df2ec1..bf3df3b6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.2
+version: 1.0.2+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 8b6347a4ffbd83e862fe5a69118928864ab3d481 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 24 Apr 2017 23:19:36 -0400
Subject: [PATCH 124/414] +2

---
 .idea/workspace.xml                | 142 +++++++++++++++--------------
 README.md                          |   2 +-
 lib/src/http/response_context.dart |   2 +-
 pubspec.yaml                       |   2 +-
 4 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 040d56bd..2a139efe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,7 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -28,11 +26,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2580">
-              <caret line="180" column="68" lean-forward="false" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
+            <state relative-caret-position="112">
+              <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
               <folding />
             </state>
           </provider>
@@ -53,14 +51,14 @@
       <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="141">
+            <state relative-caret-position="795">
               <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="15">
@@ -70,6 +68,21 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="30">
+                <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+                <folding>
+                  <marker date="1493090338000" expanded="true" signature="432:620" ph="{...}" />
+                </folding>
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -83,8 +96,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="273">
-              <caret line="201" column="0" lean-forward="true" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
+            <state relative-caret-position="3015">
+              <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -95,8 +108,8 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="133">
-              <caret line="43" column="25" lean-forward="true" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+            <state relative-caret-position="525">
+              <caret line="43" column="25" lean-forward="false" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
               <folding />
             </state>
           </provider>
@@ -105,18 +118,8 @@
       <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="67" column="16" lean-forward="true" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1215">
-              <caret line="88" column="30" lean-forward="false" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
+            <state relative-caret-position="900">
+              <caret line="67" column="16" lean-forward="false" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -172,13 +175,13 @@
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       </list>
     </option>
   </component>
@@ -212,6 +215,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -294,7 +298,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -425,7 +428,8 @@
       <workItem from="1484451782119" duration="617000" />
       <workItem from="1492276672342" duration="1478000" />
       <workItem from="1493086837879" duration="726000" />
-      <workItem from="1493088139942" duration="108000" />
+      <workItem from="1493088139942" duration="140000" />
+      <workItem from="1493090308747" duration="57000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -483,7 +487,14 @@
       <option name="project" value="LOCAL" />
       <updated>1493087536575</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="+1">
+      <created>1493088262571</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1493088262571</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -519,7 +530,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6543000" />
+    <option name="totallyTimeSpent" value="6632000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -532,21 +543,22 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="154" y="131" width="1416" height="843" extended-state="0" />
+    <editor active="true" />
     <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -570,7 +582,8 @@
     <MESSAGE value="I love stack overflows!!!" />
     <MESSAGE value="Fixed last batch?" />
     <MESSAGE value="1.0.2" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.2" />
+    <MESSAGE value="+1" />
+    <option name="LAST_COMMIT_MESSAGE" value="+1" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -654,7 +667,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1260">
           <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -727,7 +739,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1260">
           <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -840,7 +851,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1260">
           <caret line="90" column="26" lean-forward="false" selection-start-line="90" selection-start-column="26" selection-end-line="90" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -918,17 +928,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2580">
-          <caret line="180" column="68" lean-forward="false" selection-start-line="180" selection-start-column="68" selection-end-line="180" selection-end-column="68" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
+        <state relative-caret-position="795">
           <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
           <folding />
         </state>
@@ -936,37 +938,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="67" column="16" lean-forward="true" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
+        <state relative-caret-position="900">
+          <caret line="67" column="16" lean-forward="false" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="43" column="25" lean-forward="true" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+        <state relative-caret-position="525">
+          <caret line="43" column="25" lean-forward="false" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="14" lean-forward="false" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
-            <folding>
-              <marker date="1493088244000" expanded="true" signature="432:620" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="201" column="0" lean-forward="true" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
+        <state relative-caret-position="3015">
+          <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
@@ -981,5 +970,26 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+            <folding>
+              <marker date="1493090338000" expanded="true" signature="432:620" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index ccd3cd30..b0c3f630 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.2+1](https://img.shields.io/badge/pub-1.0.2+1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.2+2](https://img.shields.io/badge/pub-1.0.2+2-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 668a9805..f126d06e 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -36,7 +36,7 @@ class ResponseContext extends Extensible {
   /// Headers that will be sent to the user.
   Map<String, String> get headers {
     /// If the response is closed, then this getter will return an immutable `Map`.
-    if (!_isOpen)
+    if (_isClosed)
       return new Map<String, String>.unmodifiable(_headers);
     else
       return _headers;
diff --git a/pubspec.yaml b/pubspec.yaml
index bf3df3b6..0e6f6d34 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.2+1
+version: 1.0.2+2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 93c0d9f2bb760c63aaec9bbcb94ea89f69bf38fe Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 26 Apr 2017 18:55:47 -0400
Subject: [PATCH 125/414] +3

---
 .idea/workspace.xml | 142 +++++++++++++++++++-------------------------
 README.md           |   2 +-
 lib/hooks.dart      |   5 +-
 pubspec.yaml        |   2 +-
 4 files changed, 65 insertions(+), 86 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2a139efe..cb8d00c1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -26,7 +26,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="112">
@@ -39,7 +39,7 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="435">
+            <state relative-caret-position="405">
               <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
@@ -58,36 +58,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+            <state relative-caret-position="30">
+              <caret line="2" column="59" lean-forward="true" selection-start-line="2" selection-start-column="59" selection-end-line="2" selection-end-column="59" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="30">
-                <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
-                <folding>
-                  <marker date="1493090338000" expanded="true" signature="432:620" ph="{...}" />
-                </folding>
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3525">
-              <caret line="238" column="69" lean-forward="false" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
+            <state relative-caret-position="177">
+              <caret line="169" column="56" lean-forward="true" selection-start-line="169" selection-start-column="56" selection-end-line="169" selection-end-column="56" />
               <folding />
             </state>
           </provider>
@@ -96,7 +81,7 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3015">
+            <state relative-caret-position="2790">
               <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
@@ -175,13 +160,13 @@
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -215,7 +200,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -298,6 +282,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -429,7 +414,8 @@
       <workItem from="1492276672342" duration="1478000" />
       <workItem from="1493086837879" duration="726000" />
       <workItem from="1493088139942" duration="140000" />
-      <workItem from="1493090308747" duration="57000" />
+      <workItem from="1493090308747" duration="91000" />
+      <workItem from="1493247154761" duration="121000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -494,7 +480,14 @@
       <option name="project" value="LOCAL" />
       <updated>1493088262571</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="+2">
+      <created>1493090378709</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1493090378709</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -530,7 +523,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6632000" />
+    <option name="totallyTimeSpent" value="6787000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -543,22 +536,21 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="154" y="131" width="1416" height="843" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -583,7 +575,8 @@
     <MESSAGE value="Fixed last batch?" />
     <MESSAGE value="1.0.2" />
     <MESSAGE value="+1" />
-    <option name="LAST_COMMIT_MESSAGE" value="+1" />
+    <MESSAGE value="+2" />
+    <option name="LAST_COMMIT_MESSAGE" value="+2" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -688,9 +681,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -698,7 +688,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -760,9 +749,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -777,7 +763,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -814,7 +799,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -886,9 +870,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1050">
           <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -896,7 +877,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1215">
           <caret line="88" column="30" lean-forward="false" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -912,7 +892,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
+        <state relative-caret-position="405">
           <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -920,14 +900,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3525">
-          <caret line="238" column="69" lean-forward="false" selection-start-line="238" selection-start-column="69" selection-end-line="238" selection-end-column="69" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="795">
@@ -954,7 +926,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3015">
+        <state relative-caret-position="2790">
           <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
@@ -962,27 +934,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
-            <folding>
-              <marker date="1493090338000" expanded="true" signature="432:620" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -991,5 +942,34 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="177">
+          <caret line="169" column="56" lean-forward="true" selection-start-line="169" selection-start-column="56" selection-end-line="169" selection-end-column="56" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+            <folding>
+              <marker date="1493247285000" expanded="true" signature="432:620" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="59" lean-forward="true" selection-start-line="2" selection-start-column="59" selection-end-line="2" selection-end-column="59" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index b0c3f630..0972efcf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.2+2](https://img.shields.io/badge/pub-1.0.2+2-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.2+3](https://img.shields.io/badge/pub-1.0.2+3-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 510b6731..6ab06f43 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -167,10 +167,9 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
     normalize(obj) async {
       if (obj != null) {
         if (obj is Iterable) {
-          var r = await Future.wait(obj.map(_removeAll));
-          obj = obj is List ? r.toList() : r;
+          return await Future.wait(obj.map(_removeAll));
         } else
-          obj = await _removeAll(obj);
+          return await _removeAll(obj);
       }
     }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 0e6f6d34..f6aef7a2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.2+2
+version: 1.0.2+3
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From fe1c8a93332800a5df0cf00da938098ea17d8464 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 29 Apr 2017 00:18:45 -0400
Subject: [PATCH 126/414] Fixed dates

---
 .idea/workspace.xml | 99 ++++++++++++++++++++++++++++-----------------
 README.md           |  2 +-
 lib/hooks.dart      |  8 ++--
 pubspec.yaml        |  2 +-
 4 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cb8d00c1..d46447e8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -29,7 +29,7 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="112">
+            <state relative-caret-position="195">
               <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
               <folding />
             </state>
@@ -58,21 +58,36 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="59" lean-forward="true" selection-start-line="2" selection-start-column="59" selection-end-line="2" selection-end-column="59" />
+            <state relative-caret-position="15">
+              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="30">
+                <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+                <folding>
+                  <marker date="1493439492000" expanded="true" signature="432:620" ph="{...}" />
+                </folding>
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="177">
-              <caret line="169" column="56" lean-forward="true" selection-start-line="169" selection-start-column="56" selection-end-line="169" selection-end-column="56" />
+            <state relative-caret-position="193">
+              <caret line="233" column="12" lean-forward="true" selection-start-line="233" selection-start-column="12" selection-end-line="233" selection-end-column="12" />
               <folding />
             </state>
           </provider>
@@ -165,8 +180,8 @@
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -177,10 +192,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="154" />
-    <option name="y" value="131" />
-    <option name="width" value="1416" />
-    <option name="height" value="843" />
+    <option name="x" value="161" />
+    <option name="y" value="23" />
+    <option name="width" value="1436" />
+    <option name="height" value="948" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -200,6 +215,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -282,8 +299,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -415,7 +430,8 @@
       <workItem from="1493086837879" duration="726000" />
       <workItem from="1493088139942" duration="140000" />
       <workItem from="1493090308747" duration="91000" />
-      <workItem from="1493247154761" duration="121000" />
+      <workItem from="1493247154761" duration="249000" />
+      <workItem from="1493439393087" duration="103000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -487,7 +503,14 @@
       <option name="project" value="LOCAL" />
       <updated>1493090378709</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="+3">
+      <created>1493247351000</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1493247351000</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -523,7 +546,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="6787000" />
+    <option name="totallyTimeSpent" value="7018000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -535,22 +558,23 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="154" y="131" width="1416" height="843" extended-state="0" />
+    <frame x="161" y="23" width="1436" height="948" extended-state="0" />
+    <editor active="true" />
     <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21201414" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21218638" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3259346" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -576,7 +600,8 @@
     <MESSAGE value="1.0.2" />
     <MESSAGE value="+1" />
     <MESSAGE value="+2" />
-    <option name="LAST_COMMIT_MESSAGE" value="+2" />
+    <MESSAGE value="+3" />
+    <option name="LAST_COMMIT_MESSAGE" value="+3" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -936,7 +961,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
+        <state relative-caret-position="195">
           <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
           <folding />
         </state>
@@ -944,8 +969,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="169" column="56" lean-forward="true" selection-start-line="169" selection-start-column="56" selection-end-line="169" selection-end-column="56" />
+        <state relative-caret-position="193">
+          <caret line="233" column="12" lean-forward="true" selection-start-line="233" selection-start-column="12" selection-end-line="233" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
           <folding />
         </state>
       </provider>
@@ -954,22 +987,14 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="30">
-            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+            <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
             <folding>
-              <marker date="1493247285000" expanded="true" signature="432:620" ph="{...}" />
+              <marker date="1493439492000" expanded="true" signature="432:620" ph="{...}" />
             </folding>
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="59" lean-forward="true" selection-start-line="2" selection-start-column="59" selection-end-line="2" selection-end-column="59" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 0972efcf..8ae7647e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.2+3](https://img.shields.io/badge/pub-1.0.2+3-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.2+4](https://img.shields.io/badge/pub-1.0.2+4-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 6ab06f43..3e7c7ee0 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -228,9 +228,9 @@ HookedServiceEventListener addCreatedAt({
       if (assign != null)
         return assign(obj, now);
       else if (obj is Map)
-        obj.remove(name);
+        obj[name] = now;
       else if (obj is Extensible)
-        obj..properties.remove(name);
+        obj..properties[name] = now;
       else {
         try {
           reflect(obj).setField(new Symbol(name), now);
@@ -279,9 +279,9 @@ HookedServiceEventListener addUpdatedAt({
       if (assign != null)
         return assign(obj, now);
       else if (obj is Map)
-        obj.remove(name);
+        obj[name] = now;
       else if (obj is Extensible)
-        obj..properties.remove(name);
+        obj..properties[name] = now;
       else {
         try {
           reflect(obj).setField(new Symbol(name), now);
diff --git a/pubspec.yaml b/pubspec.yaml
index f6aef7a2..6dec5e81 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.2+3
+version: 1.0.2+4
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From ae4a434477c4eb5ce64e768c0233e827407582b3 Mon Sep 17 00:00:00 2001
From: "thosakwe@gmail.com" <Dh6743tyre08>
Date: Sat, 27 May 2017 08:39:45 -0400
Subject: [PATCH 127/414] Coverage start...

---
 .idea/libraries/Dart_Packages.xml             | 240 +++++-----
 .idea/libraries/Dart_SDK.xml                  |  36 +-
 .idea/modules.xml                             |   3 +-
 .../All_Tests__for_coverage_.xml              |   6 +
 .idea/workspace.xml                           | 438 +++++++++---------
 README.md                                     |   2 +-
 lib/hooks.dart                                |  31 +-
 lib/src/http/map_service.dart                 |   2 +-
 lib/src/http/response_context.dart            |  35 +-
 pubspec.yaml                                  |   2 +-
 test/all.dart                                 |  21 +
 test/services_test.dart                       |   1 +
 test/util_test.dart                           |  21 +-
 13 files changed, 448 insertions(+), 390 deletions(-)
 create mode 100644 .idea/runConfigurations/All_Tests__for_coverage_.xml
 create mode 100644 test/all.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index fd29c844..c12960e2 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,438 +5,438 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.10/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.30.0+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="async">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="barback">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+10/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
             </list>
           </value>
         </entry>
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="boolean_selector">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="charcode">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="cli_util">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.0.1+2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="container">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="convert">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.5/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.7+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="flatten">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="front_end">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_multi_server">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_server">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="isolate">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="json_god">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="kernel">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="logging">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.1+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="merge_map">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_config">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_resolver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="plugin">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.3.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="pub_semver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="random_string">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_packages_handler">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_map_stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_span">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="string_scanner">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="term_glyph">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.20+10/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.20+13/lib" />
             </list>
           </value>
         </entry>
         <entry key="typed_data">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="utf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="when">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/when-0.2.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="which">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/which-0.1.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
             </list>
           </value>
         </entry>
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.29.10/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+10/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.0.1+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.13.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.0+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.3.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.20+10/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/when-0.2.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/which-0.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.30.0+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.7+1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.1+1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.3.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.20+13/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
     </CLASSES>
     <SOURCES />
   </library>
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index a1c33e62..51942706 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,24 +1,24 @@
 <component name="libraryTable">
   <library name="Dart SDK">
     <CLASSES>
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/async" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/collection" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/convert" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/core" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/developer" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/html" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/indexed_db" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/io" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/isolate" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/js" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/js_util" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/math" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/mirrors" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/svg" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/typed_data" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/web_audio" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/web_gl" />
-      <root url="file:///usr/local/Cellar/dart/1.23.0-dev.11.6/libexec/lib/web_sql" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/async" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/collection" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/convert" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/core" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/developer" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/html" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/indexed_db" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/io" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/isolate" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/js" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/js_util" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/math" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/mirrors" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/svg" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/typed_data" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/web_audio" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/web_gl" />
+      <root url="file://C:/Program Files/Dart/dart-sdk/lib/web_sql" />
     </CLASSES>
     <SOURCES />
   </library>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 406d4377..fe3e59d4 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/angel_framework.iml" filepath="$PROJECT_DIR$/.idea/angel_framework.iml" />
+      <module fileurl="file://C:\Users\thosa\Source\Angel\framework\.idea\angel_framework.iml" filepath="C:\Users\thosa\Source\Angel\framework\.idea\angel_framework.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/framework.iml" filepath="$PROJECT_DIR$/.idea/framework.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests__for_coverage_.xml b/.idea/runConfigurations/All_Tests__for_coverage_.xml
new file mode 100644
index 00000000..c5727acc
--- /dev/null
+++ b/.idea/runConfigurations/All_Tests__for_coverage_.xml
@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Tests (for coverage)" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/all.dart" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d46447e8..e22f2392 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,19 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__for_coverage_.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/all.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/util_test.dart" afterPath="$PROJECT_DIR$/test/util_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -17,6 +26,9 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="CoverageDataManager">
+    <SUITE FILE_PATH="coverage/framework$All_Tests__for_coverage_.coverage" NAME="All Tests (for coverage) Coverage Results" MODIFIED="1495888676193" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="DartCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" CONTEXT_FILE_PATH="$PROJECT_DIR$/test/all.dart" />
+  </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
@@ -29,8 +41,8 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
+            <state relative-caret-position="446">
+              <caret line="67" column="32" lean-forward="false" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
               <folding />
             </state>
           </provider>
@@ -39,8 +51,8 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="405">
-              <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
+            <state relative-caret-position="-585">
+              <caret line="20" column="3" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -48,20 +60,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="795">
-              <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
+            <state relative-caret-position="21">
               <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding />
             </state>
@@ -73,9 +75,9 @@
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="30">
-                <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+                <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
                 <folding>
-                  <marker date="1493439492000" expanded="true" signature="432:620" ph="{...}" />
+                  <marker date="1495888771338" expanded="true" signature="432:620" ph="{...}" />
                 </folding>
               </first_editor>
               <second_editor />
@@ -86,59 +88,56 @@
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="193">
-              <caret line="233" column="12" lean-forward="true" selection-start-line="233" selection-start-column="12" selection-end-line="233" selection-end-column="12" />
-              <folding />
+            <state relative-caret-position="547">
+              <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
+              <folding>
+                <marker date="1495888340898" expanded="true" signature="318:418" ph="{...}" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/all.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2790">
-              <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
+            <state relative-caret-position="399">
+              <caret line="19" column="27" lean-forward="false" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
               <folding>
-                <element signature="e#38#58#0" expanded="true" />
+                <element signature="e#0#44#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="720">
+              <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="525">
-              <caret line="43" column="25" lean-forward="false" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
+            <state relative-caret-position="237">
+              <caret line="84" column="13" lean-forward="true" selection-start-line="84" selection-start-column="13" selection-end-line="84" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="900">
-              <caret line="67" column="16" lean-forward="false" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#22#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Dart File" />
+      </list>
+    </option>
+  </component>
   <component name="FindInProjectRecents">
     <findStrings>
       <find>BEFORE</find>
@@ -155,6 +154,8 @@
       <find>reopen</find>
       <find>REDIRECT</find>
       <find>close(</find>
+      <find>status</find>
+      <find>createdAt</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -174,12 +175,15 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/test/util_test.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/README.md" />
       </list>
@@ -192,10 +196,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="161" />
-    <option name="y" value="23" />
-    <option name="width" value="1436" />
-    <option name="height" value="948" />
+    <option name="x" value="-9" />
+    <option name="y" value="-9" />
+    <option name="width" value="1938" />
+    <option name="height" value="1048" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -215,27 +219,27 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -245,11 +249,11 @@
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -259,11 +263,11 @@
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -277,11 +281,11 @@
           </PATH>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="angel_framework" />
+              <option name="myItemId" value="framework" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -312,6 +316,7 @@
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="js.eslint.eslintPackage" value="" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
+    <property name="settings.editor.selected.configurable" value="dart.settings" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -325,16 +330,13 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.All Tests (for coverage)">
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
     <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
       <method />
     </configuration>
-    <configuration default="true" type="FlutterRunConfigurationType" factoryName="Flutter">
-      <method />
-    </configuration>
     <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
       <node-interpreter value="project" />
       <working-dir value="" />
@@ -357,12 +359,6 @@
     <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
       <method />
     </configuration>
-    <configuration default="true" type="LLVMCommandLineRunConfigurationType" factoryName="LLVM Application" show_console_on_std_err="false" show_console_on_std_out="false">
-      <option name="VMOptions" />
-      <option name="arguments" />
-      <option name="filePath" />
-      <method />
-    </configuration>
     <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
       <method />
     </configuration>
@@ -401,12 +397,13 @@
       <recursive>false</recursive>
       <method />
     </configuration>
-    <list size="5">
+    <list size="6">
       <item index="0" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
       <item index="1" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
       <item index="2" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
       <item index="3" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
       <item index="4" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -432,6 +429,7 @@
       <workItem from="1493090308747" duration="91000" />
       <workItem from="1493247154761" duration="249000" />
       <workItem from="1493439393087" duration="103000" />
+      <workItem from="1495887910182" duration="863000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -514,9 +512,6 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.04.15 at 13h 41m 00s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2017.04.15 at 13h 41m 54s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -526,6 +521,9 @@
     <history-entry file="All_Tests - 2017.04.24 at 22h 32m 10s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2017.05.27 at 08h 29m 17s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 45s.xml">
       <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -546,7 +544,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="7018000" />
+    <option name="totallyTimeSpent" value="7881000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -558,28 +556,29 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="161" y="23" width="1436" height="948" extended-state="0" />
+    <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21201414" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30301428" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32756326" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3259346" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262317" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -608,51 +607,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3120">
-          <caret line="208" column="26" lean-forward="true" selection-start-line="208" selection-start-column="26" selection-end-line="208" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1155">
-          <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -676,7 +630,7 @@
         <state relative-caret-position="3555">
           <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#38#58#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -744,7 +698,7 @@
         <state relative-caret-position="3540">
           <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#38#58#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -849,20 +803,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1374">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="90" column="26" lean-forward="false" selection-start-line="90" selection-start-column="26" selection-end-line="90" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -877,13 +817,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="90" column="25" lean-forward="false" selection-start-line="90" selection-start-column="25" selection-end-line="90" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -891,13 +824,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1050">
-          <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1215">
@@ -905,79 +831,167 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1113">
+          <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="29" column="24" lean-forward="false" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
+        <state relative-caret-position="-585">
+          <caret line="20" column="3" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="795">
-          <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="900">
-          <caret line="67" column="16" lean-forward="false" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="43" column="25" lean-forward="false" selection-start-line="43" selection-start-column="25" selection-end-line="43" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2790">
-          <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="21" column="42" lean-forward="false" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
+        <state relative-caret-position="446">
+          <caret line="67" column="32" lean-forward="false" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="233" column="12" lean-forward="true" selection-start-line="233" selection-start-column="12" selection-end-line="233" selection-end-column="12" />
+        <state relative-caret-position="547">
+          <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
+          <folding>
+            <marker date="1495888340898" expanded="true" signature="318:418" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="19" column="27" lean-forward="false" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#44#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="158">
+          <caret line="14" column="46" lean-forward="true" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-522">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="522">
+          <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
+          <folding>
+            <element signature="e#38#58#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1467">
+          <caret line="90" column="25" lean-forward="false" selection-start-line="90" selection-start-column="25" selection-end-line="90" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/util_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="11" column="12" lean-forward="false" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#54#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="30" column="32" lean-forward="false" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="720">
+          <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="105" column="14" lean-forward="false" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-192">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="710" column="21" lean-forward="true" selection-start-line="710" selection-start-column="21" selection-end-line="710" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="215" column="0" lean-forward="true" selection-start-line="215" selection-start-column="0" selection-end-line="215" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="237">
+          <caret line="84" column="13" lean-forward="true" selection-start-line="84" selection-start-column="13" selection-end-line="84" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
+        <state relative-caret-position="21">
           <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
           <folding />
         </state>
@@ -987,9 +1001,9 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="30">
-            <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
+            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
             <folding>
-              <marker date="1493439492000" expanded="true" signature="432:620" ph="{...}" />
+              <marker date="1495888771338" expanded="true" signature="432:620" ph="{...}" />
             </folding>
           </first_editor>
           <second_editor />
diff --git a/README.md b/README.md
index 8ae7647e..94276549 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.2+4](https://img.shields.io/badge/pub-1.0.2+4-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.2+5](https://img.shields.io/badge/pub-1.0.2+5-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 3e7c7ee0..2f4a9ed6 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -215,12 +215,11 @@ HookedServiceEventListener disable([provider]) {
 
 /// Serializes the current time to `e.data` or `e.result`.
 /// You can provide an [assign] function to set the property on your object, and skip reflection.
+/// If [serialize] is `true` (default), then the set date will be a `String`. If not, a raw `DateTime` will be used.
 ///
 /// Default key: `createdAt`
-HookedServiceEventListener addCreatedAt({
-  assign(obj, String now),
-  String key,
-}) {
+HookedServiceEventListener addCreatedAt(
+    {assign(obj, String now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'createdAt';
 
   return (HookedServiceEvent e) async {
@@ -240,7 +239,8 @@ HookedServiceEventListener addCreatedAt({
       }
     }
 
-    var now = new DateTime.now().toUtc().toIso8601String();
+    var d = new DateTime.now().toUtc();
+    var now = serialize == false ? d : d.toIso8601String();
 
     normalize(obj) async {
       if (obj != null) {
@@ -252,8 +252,7 @@ HookedServiceEventListener addCreatedAt({
       }
     }
 
-    if (e.params?.containsKey('provider') == true)
-      await normalize(e.isBefore ? e.data : e.result);
+    await normalize(e.isBefore ? e.data : e.result);
   };
 }
 
@@ -266,12 +265,12 @@ HookedServiceEventListener addUpatedAt({
     addUpdatedAt(assign: assign, key: key);
 
 /// Serializes the current time to `e.data` or `e.result`.
-/// You can provide an [assign] function to set the property on your object, and skip reflection.///
-/// Default key: `createdAt`
-HookedServiceEventListener addUpdatedAt({
-  assign(obj, String now),
-  String key,
-}) {
+/// You can provide an [assign] function to set the property on your object, and skip reflection.
+/// If [serialize] is `true` (default), then the set date will be a `String`. If not, a raw `DateTime` will be used.
+///
+/// Default key: `updatedAt`
+HookedServiceEventListener addUpdatedAt(
+    {assign(obj, String now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'updatedAt';
 
   return (HookedServiceEvent e) async {
@@ -291,7 +290,8 @@ HookedServiceEventListener addUpdatedAt({
       }
     }
 
-    var now = new DateTime.now().toUtc().toIso8601String();
+    var d = new DateTime.now().toUtc();
+    var now = serialize == false ? d : d.toIso8601String();
 
     normalize(obj) async {
       if (obj != null) {
@@ -303,7 +303,6 @@ HookedServiceEventListener addUpdatedAt({
       }
     }
 
-    if (e.params?.containsKey('provider') == true)
-      await normalize(e.isBefore ? e.data : e.result);
+    await normalize(e.isBefore ? e.data : e.result);
   };
 }
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index a4b3909c..cfe62f51 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -22,7 +22,7 @@ class MapService extends Service {
 
   @override
   Future<List> index([Map params]) async {
-    if (allowRemoveAll != true || params == null || params['query'] is! Map)
+    if (allowQuery == false || params == null || params['query'] is! Map)
       return items;
     else {
       Map query = params['query'];
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index f126d06e..9c49ca43 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -11,7 +11,7 @@ import 'server.dart' show Angel;
 import 'controller.dart';
 
 final RegExp _contentType =
-    new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
+new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
@@ -22,7 +22,9 @@ typedef String ResponseSerializer(data);
 class ResponseContext extends Extensible {
   final _LockableBytesBuilder _buffer = new _LockableBytesBuilder();
   final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
-  bool _isOpen = true, _isClosed = false;
+  bool _isOpen = true,
+      _isClosed = false;
+  int _statusCode = 200;
 
   /// The [Angel] instance that is sending a response.
   Angel app;
@@ -57,7 +59,14 @@ class ResponseContext extends Extensible {
   ResponseSerializer serializer = god.serialize;
 
   /// This response's status code.
-  int statusCode = 200;
+  int get statusCode => _statusCode;
+
+  void set statusCode(int value) {
+    if (_isClosed)
+      throw _closed();
+    else
+      _statusCode = value ?? 200;
+  }
 
   /// Can we still write to this response?
   bool get isOpen => _isOpen;
@@ -115,7 +124,7 @@ class ResponseContext extends Extensible {
     if (!_isOpen) throw _closed();
 
     headers["Content-Disposition"] =
-        'attachment; filename="${filename ?? file.path}"';
+    'attachment; filename="${filename ?? file.path}"';
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     headers[HttpHeaders.CONTENT_LENGTH] = file.lengthSync().toString();
     buffer.add(await file.readAsBytes());
@@ -194,7 +203,7 @@ class ResponseContext extends Extensible {
     headers
       ..[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString()
       ..[HttpHeaders.LOCATION] =
-          url is String ? url : app.navigate(url, absolute: absolute);
+      url is String ? url : app.navigate(url, absolute: absolute);
     statusCode = code ?? 302;
     write('''
     <!DOCTYPE html>
@@ -252,7 +261,7 @@ class ResponseContext extends Extensible {
           "Controller redirects must take the form of 'Controller@action'. You gave: $action");
 
     Controller controller =
-        app.controller(split[0].replaceAll(_straySlashes, ''));
+    app.controller(split[0].replaceAll(_straySlashes, ''));
 
     if (controller == null)
       throw new Exception("Could not find a controller named '${split[0]}'");
@@ -264,7 +273,11 @@ class ResponseContext extends Extensible {
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
     final head =
-        controller.findExpose().path.toString().replaceAll(_straySlashes, '');
+    controller
+        .findExpose()
+        .path
+        .toString()
+        .replaceAll(_straySlashes, '');
     final tail = matched.makeUri(params).replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
@@ -300,9 +313,9 @@ class ResponseContext extends Extensible {
   /// You can optionally transform the file stream with a [codec].
   Future streamFile(File file,
       {int chunkSize,
-      int sleepMs: 0,
-      bool resumable: true,
-      Codec<List<int>, List<int>> codec}) async {
+        int sleepMs: 0,
+        bool resumable: true,
+        Codec<List<int>, List<int>> codec}) async {
     if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
@@ -330,7 +343,9 @@ class ResponseContext extends Extensible {
 
 abstract class _LockableBytesBuilder extends BytesBuilder {
   factory _LockableBytesBuilder() => new _LockableBytesBuilderImpl();
+
   void _lock();
+
   void _reopen();
 }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 6dec5e81..6aa20635 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.2+4
+version: 1.0.2+5
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/all.dart b/test/all.dart
new file mode 100644
index 00000000..da1c11ae
--- /dev/null
+++ b/test/all.dart
@@ -0,0 +1,21 @@
+import 'controller_test.dart' as controller;
+import 'di_test.dart' as di;
+import 'general_test.dart' as general;
+import 'hooked_test.dart' as hooked;
+import 'routing_test.dart' as routing;
+import 'serialize_test.dart' as serialize;
+import 'services_test.dart' as services;
+import 'util_test.dart' as util;
+import 'package:test/test.dart';
+
+/// For running with coverage
+main() {
+  group('controller', controller.main);
+  group('di', di.main);
+  group('general', general.main);
+  group('hooked', hooked.main);
+  group('routing', routing.main);
+  group('serialize', serialize.main);
+  group('services', services.main);
+  group('util', util.main);
+}
\ No newline at end of file
diff --git a/test/services_test.dart b/test/services_test.dart
index ee376cbf..fa402f0a 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -32,6 +32,7 @@ main() {
   });
 
   tearDown(() async {
+    await app.close();
     app = null;
     url = null;
     client.close();
diff --git a/test/util_test.dart b/test/util_test.dart
index 2d22fedd..8b112f25 100644
--- a/test/util_test.dart
+++ b/test/util_test.dart
@@ -9,24 +9,25 @@ class Foo {
 
 main() {
   group('Utilities', () {
-    Angel angel;
+    Angel app;
 
     setUp(() {
-      angel = new Angel();
+      app = new Angel();
     });
 
-    tearDown(() {
-      angel = null;
+    tearDown(() async {
+      await app.close();
+      app = null;
     });
 
     test('can use app.properties like members', () {
-      angel.properties['hello'] = 'world';
-      angel.properties['foo'] = () => 'bar';
-      angel.properties['Foo'] = new Foo('bar');
+      app.properties['hello'] = 'world';
+      app.properties['foo'] = () => 'bar';
+      app.properties['Foo'] = new Foo('bar');
 
-      expect(angel.hello, equals('world'));
-      expect(angel.foo(), equals('bar'));
-      expect(angel.Foo.name, equals('bar'));
+      expect(app.hello, equals('world'));
+      expect(app.foo(), equals('bar'));
+      expect(app.Foo.name, equals('bar'));
     });
   });
 }

From 67e9150c07ef4104036413877025a49803571384 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 6 Jun 2017 08:42:33 -0400
Subject: [PATCH 128/414] 1.0.3

---
 .idea/libraries/Dart_Packages.xml |  20 +-
 .idea/workspace.xml               | 421 ++++++++++++++++--------------
 README.md                         |   2 +-
 lib/src/http/controller.dart      |  10 +-
 lib/src/http/routable.dart        |  11 +-
 lib/src/http/server.dart          |  56 ++--
 lib/src/http/service.dart         |  71 +++--
 pubspec.yaml                      |   1 +
 test/all.dart                     |   2 +
 test/precontained_test.dart       |  24 ++
 10 files changed, 351 insertions(+), 267 deletions(-)
 create mode 100644 test/precontained_test.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index c12960e2..14dea75e 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -96,7 +96,7 @@
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.7+1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.14.0/lib" />
             </list>
           </value>
         </entry>
@@ -124,7 +124,7 @@
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
             </list>
           </value>
         </entry>
@@ -212,6 +212,13 @@
             </list>
           </value>
         </entry>
+        <entry key="mock_request">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="package_config">
           <value>
             <list>
@@ -341,7 +348,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.20+13/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.21/lib" />
             </list>
           </value>
         </entry>
@@ -396,11 +403,11 @@
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.13.7+1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.14.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
@@ -413,6 +420,7 @@
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
@@ -431,7 +439,7 @@
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.20+13/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.21/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e22f2392..80f2a018 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,19 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__for_coverage_.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/all.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/precontained_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/util_test.dart" afterPath="$PROJECT_DIR$/test/util_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -38,21 +35,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="446">
-              <caret line="67" column="32" lean-forward="false" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-585">
-              <caret line="20" column="3" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
+            <state relative-caret-position="378">
+              <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -60,24 +47,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="30">
-                <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+              <first_editor relative-caret-position="42">
+                <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
                 <folding>
-                  <marker date="1495888771338" expanded="true" signature="432:620" ph="{...}" />
+                  <marker date="1496752945216" expanded="true" signature="428:616" ph="{...}" />
                 </folding>
               </first_editor>
               <second_editor />
@@ -88,7 +65,7 @@
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="547">
+            <state relative-caret-position="5544">
               <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
               <folding>
                 <marker date="1495888340898" expanded="true" signature="318:418" ph="{...}" />
@@ -97,33 +74,73 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="19" column="27" lean-forward="false" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
-              <folding>
-                <element signature="e#0#44#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="720">
-              <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
+            <state relative-caret-position="651">
+              <caret line="39" column="86" lean-forward="false" selection-start-line="39" selection-start-column="86" selection-end-line="39" selection-end-column="86" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="237">
-              <caret line="84" column="13" lean-forward="true" selection-start-line="84" selection-start-column="13" selection-end-line="84" selection-end-column="13" />
+            <state relative-caret-position="399">
+              <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="357">
+              <caret line="17" column="22" lean-forward="false" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="313">
+              <caret line="286" column="5" lean-forward="true" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="305">
+              <caret line="125" column="45" lean-forward="false" selection-start-line="125" selection-start-column="45" selection-end-line="125" selection-end-column="45" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="485">
+              <caret line="164" column="37" lean-forward="false" selection-start-line="164" selection-start-column="37" selection-end-line="164" selection-end-column="37" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="284">
+              <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -156,10 +173,21 @@
       <find>close(</find>
       <find>status</find>
       <find>createdAt</find>
+      <find>preInj</find>
+      <find>p</find>
+      <find>printDebug</find>
+      <find>d</find>
+      <find>debug</find>
+      <find>_printDebug</find>
+      <find>use(</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
+      <replace>// _printDebug</replace>
     </replaceStrings>
+    <dirStrings>
+      <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
+    </dirStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -168,23 +196,24 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
@@ -220,7 +249,6 @@
     </navigator>
     <panes>
       <pane id="Scratches" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -303,6 +331,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -397,13 +426,19 @@
       <recursive>false</recursive>
       <method />
     </configuration>
-    <list size="6">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+    <configuration default="false" name="tests in precontained_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/precontained_test.dart" />
+      <option name="testName" value="precontained_test.dart" />
+      <method />
+    </configuration>
+    <list size="7">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -429,7 +464,10 @@
       <workItem from="1493090308747" duration="91000" />
       <workItem from="1493247154761" duration="249000" />
       <workItem from="1493439393087" duration="103000" />
-      <workItem from="1495887910182" duration="863000" />
+      <workItem from="1495887910182" duration="895000" />
+      <workItem from="1495996220490" duration="67000" />
+      <workItem from="1496058266595" duration="1116000" />
+      <workItem from="1496752349569" duration="598000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -508,43 +546,50 @@
       <option name="project" value="LOCAL" />
       <updated>1493247351000</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="Coverage start...">
+      <created>1495888785100</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1495888785100</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.04.15 at 13h 41m 54s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 54m 45s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.04.24 at 22h 30m 02s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 56m 41s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.04.24 at 22h 32m 10s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 58m 57s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.05.27 at 08h 29m 17s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 59m 07s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 01m 45s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 00m 14s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 02m 37s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 00m 43s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 03m 36s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 01m 42s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 04m 06s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 02m 39s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Hooked_Tests - 2016.12.10 at 09h 04m 28s.xml">
-      <configuration name="Hooked Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 02m 54s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Routing_Tests - 2016.12.30 at 21h 11m 10s.xml">
-      <configuration name="Routing Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_precontained_test_dart - 2017.06.06 at 08h 33m 54s.xml">
+      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="7881000" />
+    <option name="totallyTimeSpent" value="9694000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -559,25 +604,25 @@
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30301428" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22633527" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -600,23 +645,14 @@
     <MESSAGE value="+1" />
     <MESSAGE value="+2" />
     <MESSAGE value="+3" />
-    <option name="LAST_COMMIT_MESSAGE" value="+3" />
+    <MESSAGE value="Coverage start..." />
+    <option name="LAST_COMMIT_MESSAGE" value="Coverage start..." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="75">
-            <caret line="5" column="39" lean-forward="true" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2175">
@@ -629,9 +665,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3555">
           <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
-          <folding>
-            <element signature="e#38#58#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -697,9 +730,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3540">
           <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
-          <folding>
-            <element signature="e#38#58#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -824,66 +854,25 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1215">
-          <caret line="88" column="30" lean-forward="false" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1113">
           <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-585">
-          <caret line="20" column="3" lean-forward="true" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
+        <state relative-caret-position="1239">
           <caret line="67" column="32" lean-forward="false" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="547">
-          <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
-          <folding>
-            <marker date="1495888340898" expanded="true" signature="318:418" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="19" column="27" lean-forward="false" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
-          <folding>
-            <element signature="e#0#44#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/general_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="158">
           <caret line="14" column="46" lean-forward="true" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -891,19 +880,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-522">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="522">
-          <caret line="201" column="0" lean-forward="false" selection-start-line="201" selection-start-column="0" selection-end-line="201" selection-end-column="0" />
-          <folding>
-            <element signature="e#38#58#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -911,7 +887,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1467">
           <caret line="90" column="25" lean-forward="false" selection-start-line="90" selection-start-column="25" selection-end-line="90" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -919,9 +894,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="11" column="12" lean-forward="false" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#54#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -929,7 +901,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="249">
           <caret line="30" column="32" lean-forward="false" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -937,31 +908,21 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="720">
+        <state relative-caret-position="1344">
           <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="105" column="14" lean-forward="false" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-192">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -969,30 +930,90 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="249">
           <caret line="710" column="21" lean-forward="true" selection-start-line="710" selection-start-column="21" selection-end-line="710" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="651">
+          <caret line="39" column="86" lean-forward="false" selection-start-line="39" selection-start-column="86" selection-end-line="39" selection-end-column="86" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="17" column="43" lean-forward="false" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5544">
+          <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
+          <folding>
+            <marker date="1495888340898" expanded="true" signature="318:418" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="17" column="22" lean-forward="false" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="125" column="45" lean-forward="false" selection-start-line="125" selection-start-column="45" selection-end-line="125" selection-end-column="45" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="485">
+          <caret line="164" column="37" lean-forward="false" selection-start-line="164" selection-start-column="37" selection-end-line="164" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="215" column="0" lean-forward="true" selection-start-line="215" selection-start-column="0" selection-end-line="215" selection-end-column="0" />
+        <state relative-caret-position="284">
+          <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="84" column="13" lean-forward="true" selection-start-line="84" selection-start-column="13" selection-end-line="84" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        <state relative-caret-position="313">
+          <caret line="286" column="5" lean-forward="true" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
           <folding />
         </state>
       </provider>
@@ -1000,10 +1021,10 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+          <first_editor relative-caret-position="42">
+            <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
             <folding>
-              <marker date="1495888771338" expanded="true" signature="432:620" ph="{...}" />
+              <marker date="1496752945216" expanded="true" signature="428:616" ph="{...}" />
             </folding>
           </first_editor>
           <second_editor />
diff --git a/README.md b/README.md
index 94276549..c4be25d2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.2+5](https://img.shields.io/badge/pub-1.0.2+5-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.3](https://img.shields.io/badge/pub-1.0.3-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 88927505..32b5c1bd 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -143,13 +143,14 @@ RequestHandler createDynamicHandler(handler,
   injection.optional.addAll(optional ?? []);
   return handleContained(handler, injection);
 }
-
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(handler, InjectionRequest injection) {
   return (RequestContext req, ResponseContext res) async {
     List args = [];
 
     void inject(requirement) {
+      var propFromApp;
+
       if (requirement == RequestContext) {
         args.add(req);
       } else if (requirement == ResponseContext) {
@@ -161,6 +162,8 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
           args.add(req.injections[requirement]);
         else if (req.properties.containsKey(requirement))
           args.add(req.properties[requirement]);
+        else if ((propFromApp = req.app.findProperty(requirement)) != null)
+          args.add(propFromApp);
         else if (injection.optional.contains(requirement))
           args.add(null);
         else {
@@ -174,7 +177,10 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
         String key = requirement.first;
         Type type = requirement.last;
 
-        if (req.params.containsKey(key) || req.injections.containsKey(key)) {
+        if (req.params.containsKey(key) ||
+            req.injections.containsKey(key) ||
+            req.properties.containsKey(key) ||
+            req.app.properties.containsKey(key)) {
           inject(key);
         } else
           inject(type);
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 53ac7756..c01cfd61 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -124,8 +124,15 @@ class Routable extends Router {
 
     Map copiedMiddleware = new Map.from(router.requestMiddleware);
     for (String middlewareName in copiedMiddleware.keys) {
-      requestMiddleware["$middlewarePrefix$middlewareName"] =
-          copiedMiddleware[middlewareName];
+      requestMiddleware.putIfAbsent("$middlewarePrefix$middlewareName",
+          () => copiedMiddleware[middlewareName]);
+    }
+
+    // Also copy properties...
+    Map copiedProperties = new Map.from(router.properties);
+    for (String propertyName in copiedProperties.keys) {
+      properties.putIfAbsent("$middlewarePrefix$propertyName",
+          () => copiedMiddleware[propertyName]);
     }
 
     // _router.dumpTree(header: 'Mounting on "$path":');
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 1980106a..cf2ad6f8 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -49,6 +49,11 @@ class Angel extends AngelBase {
   final Map<dynamic, InjectionRequest> _preContained = {};
   ResponseSerializer _serializer;
 
+  /// A [Map] of dependency data obtained via reflection.
+  ///
+  /// You may modify this [Map] yourself if you intend to avoid reflection entirely.
+  Map<dynamic, InjectionRequest> get preContained => _preContained;
+
   /// Determines whether to allow HTTP request method overrides.
   bool allowMethodOverrides = true;
 
@@ -135,10 +140,6 @@ class Angel extends AngelBase {
     _fatalErrorStream.add(new AngelFatalError(error: e, stack: st));
   }
 
-  void _printDebug(x) {
-    if (debug) print(x);
-  }
-
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
@@ -285,8 +286,9 @@ class Angel extends AngelBase {
         return result;
     }
 
-    if (requestMiddleware.containsKey(handler)) {
-      return await getHandlerResult(requestMiddleware[handler], req, res);
+    var middleware = (req.app ?? this).findMiddleware(handler);
+    if (middleware != null) {
+      return await getHandlerResult(middleware, req, res);
     }
 
     return handler;
@@ -321,6 +323,18 @@ class Angel extends AngelBase {
       new ResponseContext(response, this)
         ..serializer = (_serializer ?? god.serialize);
 
+  /// Attempts to find a middleware by the given name within this application.
+  findMiddleware(key) {
+    if (requestMiddleware.containsKey(key)) return requestMiddleware[key];
+    return parent != null ? parent.findMiddleware(key) : null;
+  }
+
+  /// Attempts to find a property by the given name within this application.
+  findProperty(key) {
+    if (properties.containsKey(key)) return properties[key];
+    return parent != null ? parent.findProperty(key) : null;
+  }
+
   /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
     try {
@@ -347,24 +361,24 @@ class Angel extends AngelBase {
 
       var pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
 
-      _printDebug('Handler sequence on $requestedUrl: $pipeline');
+      // _printDebug('Handler sequence on $requestedUrl: $pipeline');
 
       for (var handler in pipeline) {
         try {
-          _printDebug('Executing handler: $handler');
+          // _printDebug('Executing handler: $handler');
           var result = await executeHandler(handler, req, res);
-          _printDebug('Result: $result');
+          // _printDebug('Result: $result');
 
           if (!result) {
-            _printDebug('Last executed handler: $handler');
+            // _printDebug('Last executed handler: $handler');
             break;
           } else {
-            _printDebug(
-                'Handler completed successfully, did not terminate response: $handler');
+            // _printDebug(
+            //    'Handler completed successfully, did not terminate response: $handler');
           }
         } catch (e, st) {
-          _printDebug('Caught error in handler $handler: $e');
-          _printDebug(st);
+          // _printDebug('Caught error in handler $handler: $e');
+          // _printDebug(st);
 
           if (e is AngelHttpException) {
             // Special handling for AngelHttpExceptions :)
@@ -413,8 +427,10 @@ class Angel extends AngelBase {
   /// * Preprocesses all dependency injection, and eliminates the burden of reflecting handlers
   /// at run-time.
   /// * [flatten]s the route tree into a linear one.
-  void optimizeForProduction() {
-    if (isProduction == true) {
+  ///
+  /// You may [force] the optimization to run, if you are not running in production.
+  void optimizeForProduction({bool force: false}) {
+    if (isProduction == true || force == true) {
       _add(v) {
         if (v is Function && !_preContained.containsKey(v)) {
           _preContained[v] = preInject(v);
@@ -428,10 +444,10 @@ class Angel extends AngelBase {
 
         router.requestMiddleware.forEach((k, v) => _add(v));
         router.middleware.forEach(_add);
-        router.routes
-            .where((r) => r is SymlinkRoute)
-            .map((SymlinkRoute r) => r.router)
-            .forEach(_walk);
+        router.routes.forEach((r) {
+          r.handlers.forEach(_add);
+          if (r is SymlinkRoute) _walk(r.router);
+        });
       }
 
       if (_flattened == null) _flattened = flatten(this);
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 162f675b..97565064 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -37,6 +37,13 @@ class Providers {
 ///
 /// Heavily inspired by FeathersJS. <3
 class Service extends Routable {
+  /// A [List] of keys that services should ignore, should they see them in the query.
+  static const List<String> SPECIAL_QUERY_KEYS = const [
+    r'$limit',
+    r'$sort',
+    'page'
+  ];
+
   /// The [Angel] app powering this service.
   AngelBase app;
 
@@ -99,9 +106,8 @@ class Service extends Routable {
         req.serviceParams
       ]));
     },
-        middleware: []
-          ..addAll(handlers)
-          ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(this.create, Middleware);
     post('/', (req, ResponseContext res) async {
@@ -115,30 +121,29 @@ class Service extends Routable {
       res.statusCode = 201;
       return r;
     },
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (createMiddleware == null) ? [] : createMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (createMiddleware == null) ? [] : createMiddleware.handlers));
 
     Middleware readMiddleware = getAnnotation(this.read, Middleware);
 
     get(
         '/:id',
-        (req, res) async => await this.read(
+            (req, res) async =>
+        await this.read(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
             ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (readMiddleware == null) ? [] : readMiddleware.handlers));
 
     Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async => await this.modify(
+            (req, res) async =>
+        await this.modify(
             toId(req.params['id']),
             await req.lazyBody(),
             mergeMap([
@@ -146,15 +151,14 @@ class Service extends Routable {
               restProvider,
               req.serviceParams
             ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
     Middleware updateMiddleware = getAnnotation(this.update, Middleware);
     post(
         '/:id',
-        (req, res) async => await this.update(
+            (req, res) async =>
+        await this.update(
             toId(req.params['id']),
             await req.lazyBody(),
             mergeMap([
@@ -162,13 +166,12 @@ class Service extends Routable {
               restProvider,
               req.serviceParams
             ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put(
         '/:id',
-        (req, res) async => await this.update(
+            (req, res) async =>
+        await this.update(
             toId(req.params['id']),
             await req.lazyBody(),
             mergeMap([
@@ -176,38 +179,34 @@ class Service extends Routable {
               restProvider,
               req.serviceParams
             ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
     delete(
         '/',
-        (req, res) async => await this.remove(
+            (req, res) async =>
+        await this.remove(
             null,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
             ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
-        (req, res) async => await this.remove(
+            (req, res) async =>
+        await this.remove(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
             ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
+        middleware: []..addAll(handlers)..addAll(
+            (removeMiddleware == null) ? [] : removeMiddleware.handlers));
 
     // REST compliance
     put('/', () => throw new AngelHttpException.notFound());
diff --git a/pubspec.yaml b/pubspec.yaml
index 6aa20635..2c23d8b6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,5 +15,6 @@ dependencies:
   random_string: ^0.0.1
   mime: ^0.9.3
 dev_dependencies:
+  mock_request: ^1.0.0
   http: ^0.11.3
   test: ^0.12.13
diff --git a/test/all.dart b/test/all.dart
index da1c11ae..c68df6c9 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -2,6 +2,7 @@ import 'controller_test.dart' as controller;
 import 'di_test.dart' as di;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
+import 'precontained_test.dart' as precontained;
 import 'routing_test.dart' as routing;
 import 'serialize_test.dart' as serialize;
 import 'services_test.dart' as services;
@@ -14,6 +15,7 @@ main() {
   group('di', di.main);
   group('general', general.main);
   group('hooked', hooked.main);
+  group('precontained', precontained.main);
   group('routing', routing.main);
   group('serialize', serialize.main);
   group('services', services.main);
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
new file mode 100644
index 00000000..319d1f8c
--- /dev/null
+++ b/test/precontained_test.dart
@@ -0,0 +1,24 @@
+import 'dart:convert';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+main() {
+  test('preinjects functions', () async {
+    var app = new Angel()
+      ..properties['foo'] = 'bar'
+      ..get('/foo', echoAppFoo);
+    app.optimizeForProduction(force: true);
+    print(app.preContained);
+    expect(app.preContained, contains(echoAppFoo));
+
+    var rq = new MockHttpRequest('GET', new Uri(path: '/foo'));
+    rq.close();
+    await app.handleRequest(rq);
+    var rs = rq.response;
+    var body = await rs.transform(UTF8.decoder).join();
+    expect(body, JSON.encode('bar'));
+  });
+}
+
+echoAppFoo(String foo) => foo;

From 402af338e491b2754fb23274adb798c00431447b Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 11 Jun 2017 12:54:06 -0400
Subject: [PATCH 129/414] 1.0.3

---
 .idea/workspace.xml | 91 ++++++++++++++++++++++-----------------------
 pubspec.yaml        |  2 +-
 2 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 80f2a018..c07a3b9a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/precontained_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -47,7 +39,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
@@ -87,7 +79,7 @@
       <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
+            <state relative-caret-position="336">
               <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
               <folding>
                 <element signature="e#0#22#0" expanded="true" />
@@ -96,11 +88,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="17" column="22" lean-forward="false" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
+            <state relative-caret-position="21">
+              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
               <folding />
             </state>
           </provider>
@@ -109,8 +101,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="313">
-              <caret line="286" column="5" lean-forward="true" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
+            <state relative-caret-position="5691">
+              <caret line="286" column="5" lean-forward="false" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -119,7 +111,7 @@
       <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="305">
+            <state relative-caret-position="2436">
               <caret line="125" column="45" lean-forward="false" selection-start-line="125" selection-start-column="45" selection-end-line="125" selection-end-column="45" />
               <folding />
             </state>
@@ -129,7 +121,7 @@
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="485">
+            <state relative-caret-position="3297">
               <caret line="164" column="37" lean-forward="false" selection-start-line="164" selection-start-column="37" selection-end-line="164" selection-end-column="37" />
               <folding />
             </state>
@@ -139,7 +131,7 @@
       <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="284">
+            <state relative-caret-position="315">
               <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
               <folding />
             </state>
@@ -208,13 +200,13 @@
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -248,6 +240,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
@@ -331,7 +324,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -467,7 +459,8 @@
       <workItem from="1495887910182" duration="895000" />
       <workItem from="1495996220490" duration="67000" />
       <workItem from="1496058266595" duration="1116000" />
-      <workItem from="1496752349569" duration="598000" />
+      <workItem from="1496752349569" duration="695000" />
+      <workItem from="1497200020318" duration="23000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -553,7 +546,14 @@
       <option name="project" value="LOCAL" />
       <updated>1495888785100</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="1.0.3">
+      <created>1496752953708</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1496752953708</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -589,7 +589,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9694000" />
+    <option name="totallyTimeSpent" value="9814000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -606,23 +606,23 @@
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22633527" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -646,7 +646,8 @@
     <MESSAGE value="+2" />
     <MESSAGE value="+3" />
     <MESSAGE value="Coverage start..." />
-    <option name="LAST_COMMIT_MESSAGE" value="Coverage start..." />
+    <MESSAGE value="1.0.3" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.3" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -657,7 +658,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2175">
           <caret line="153" column="25" lean-forward="false" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -722,7 +722,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2175">
           <caret line="153" column="25" lean-forward="true" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -865,7 +864,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1239">
           <caret line="67" column="32" lean-forward="false" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -915,7 +913,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1344">
           <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -970,7 +967,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
+        <state relative-caret-position="336">
           <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
           <folding>
             <element signature="e#0#22#0" expanded="true" />
@@ -978,17 +975,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="22" lean-forward="false" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="305">
+        <state relative-caret-position="2436">
           <caret line="125" column="45" lean-forward="false" selection-start-line="125" selection-start-column="45" selection-end-line="125" selection-end-column="45" />
           <folding />
         </state>
@@ -996,7 +985,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="485">
+        <state relative-caret-position="3297">
           <caret line="164" column="37" lean-forward="false" selection-start-line="164" selection-start-column="37" selection-end-line="164" selection-end-column="37" />
           <folding />
         </state>
@@ -1004,7 +993,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
+        <state relative-caret-position="315">
           <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
           <folding />
         </state>
@@ -1012,8 +1001,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="286" column="5" lean-forward="true" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
+        <state relative-caret-position="5691">
+          <caret line="286" column="5" lean-forward="false" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
           <folding />
         </state>
       </provider>
@@ -1031,5 +1020,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 2c23d8b6..9be20740 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.2+5
+version: 1.0.3
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 82ead161b3a6a34b16abb741382c12d0905b94a5 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 11 Jun 2017 12:57:36 -0400
Subject: [PATCH 130/414] +1

---
 .idea/workspace.xml      | 73 +++++++++++++++++++++++-----------------
 README.md                |  2 +-
 lib/src/http/server.dart |  7 ++--
 pubspec.yaml             |  2 +-
 4 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c07a3b9a..aaad1c17 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -30,7 +32,7 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
+            <state relative-caret-position="420">
               <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
@@ -39,14 +41,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="42">
-                <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+                <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
                 <folding>
-                  <marker date="1496752945216" expanded="true" signature="428:616" ph="{...}" />
+                  <marker date="1497200250327" expanded="true" signature="432:620" ph="{...}" />
                 </folding>
               </first_editor>
               <second_editor />
@@ -79,7 +81,7 @@
       <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
+            <state relative-caret-position="399">
               <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
               <folding>
                 <element signature="e#0#22#0" expanded="true" />
@@ -88,11 +90,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="21">
-              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding />
             </state>
           </provider>
@@ -101,8 +103,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5691">
-              <caret line="286" column="5" lean-forward="false" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
+            <state relative-caret-position="215">
+              <caret line="47" column="81" lean-forward="false" selection-start-line="47" selection-start-column="81" selection-end-line="47" selection-end-column="81" />
               <folding />
             </state>
           </provider>
@@ -172,6 +174,7 @@
       <find>debug</find>
       <find>_printDebug</find>
       <find>use(</find>
+      <find>_injec</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -205,8 +208,8 @@
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -240,7 +243,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
@@ -324,6 +326,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -460,7 +463,8 @@
       <workItem from="1495996220490" duration="67000" />
       <workItem from="1496058266595" duration="1116000" />
       <workItem from="1496752349569" duration="695000" />
-      <workItem from="1497200020318" duration="23000" />
+      <workItem from="1497200020318" duration="40000" />
+      <workItem from="1497200155899" duration="96000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -553,7 +557,14 @@
       <option name="project" value="LOCAL" />
       <updated>1496752953708</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="1.0.3">
+      <created>1497200046584</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1497200046584</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -589,7 +600,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9814000" />
+    <option name="totallyTimeSpent" value="9927000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -606,8 +617,10 @@
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22633527" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -615,11 +628,9 @@
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -940,7 +951,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
+        <state relative-caret-position="420">
           <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -967,7 +978,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
+        <state relative-caret-position="399">
           <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
           <folding>
             <element signature="e#0#22#0" expanded="true" />
@@ -1001,8 +1012,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5691">
-          <caret line="286" column="5" lean-forward="false" selection-start-line="286" selection-start-column="5" selection-end-line="286" selection-end-column="5" />
+        <state relative-caret-position="215">
+          <caret line="47" column="81" lean-forward="false" selection-start-line="47" selection-start-column="81" selection-end-line="47" selection-end-column="81" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
           <folding />
         </state>
       </provider>
@@ -1011,22 +1030,14 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="42">
-            <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
             <folding>
-              <marker date="1496752945216" expanded="true" signature="428:616" ph="{...}" />
+              <marker date="1497200250327" expanded="true" signature="432:620" ph="{...}" />
             </folding>
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index c4be25d2..99210b04 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # angel_framework
 
-[![pub 1.0.3](https://img.shields.io/badge/pub-1.0.3-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![pub 1.0.3+1](https://img.shields.io/badge/pub-1.0.3+1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index cf2ad6f8..5e2b7f14 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -45,7 +45,8 @@ class Angel extends AngelBase {
   Angel _parent;
   ServerGenerator _serverGenerator = HttpServer.bind;
 
-  final Map _injections = {};
+  /// A global Map of manual injections. You usually will not want to touch this.
+  final Map injections = {};
   final Map<dynamic, InjectionRequest> _preContained = {};
   ResponseSerializer _serializer;
 
@@ -243,7 +244,7 @@ class Angel extends AngelBase {
 
   /// Shortcut for adding a middleware to inject a key/value pair on every request.
   void inject(key, value) {
-    _injections[key] = value;
+    injections[key] = value;
   }
 
   /// Shortcut for adding a middleware to inject a serialize on every request.
@@ -315,7 +316,7 @@ class Angel extends AngelBase {
   Future<RequestContext> createRequestContext(HttpRequest request) {
     _beforeProcessed.add(request);
     return RequestContext.from(request, this).then((req) {
-      return req..injections.addAll(_injections ?? {});
+      return req..injections.addAll(injections ?? {});
     });
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 9be20740..76c3009b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.3
+version: 1.0.3+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 467dd3e125b4d4126145eb25c5648f03a1bd1551 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 18 Jun 2017 21:53:51 -0400
Subject: [PATCH 131/414] 1.0.4

---
 .idea/workspace.xml                | 400 ++++++++++++++++-------------
 README.md                          |   5 +-
 lib/src/http/metadata.dart         |   2 +
 lib/src/http/response_context.dart |  44 ++--
 lib/src/http/server.dart           |  53 ++--
 pubspec.yaml                       |   2 +-
 6 files changed, 284 insertions(+), 222 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aaad1c17..f012b5cd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,6 +4,8 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
@@ -18,7 +20,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/framework$All_Tests__for_coverage_.coverage" NAME="All Tests (for coverage) Coverage Results" MODIFIED="1495888676193" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="DartCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" CONTEXT_FILE_PATH="$PROJECT_DIR$/test/all.dart" />
+    <SUITE FILE_PATH="coverage/framework$All_Tests__for_coverage_.coverage" NAME="All Tests (for coverage) Coverage Results" MODIFIED="1497837068041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="DartCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" CONTEXT_FILE_PATH="$PROJECT_DIR$/test/all.dart" />
   </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
@@ -29,14 +31,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="21">
+              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -45,10 +45,10 @@
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="42">
-                <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+              <first_editor relative-caret-position="259">
+                <caret line="18" column="26" lean-forward="true" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
                 <folding>
-                  <marker date="1497200250327" expanded="true" signature="432:620" ph="{...}" />
+                  <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
                 </folding>
               </first_editor>
               <second_editor />
@@ -56,56 +56,24 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5544">
-              <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
-              <folding>
-                <marker date="1495888340898" expanded="true" signature="318:418" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="651">
-              <caret line="39" column="86" lean-forward="false" selection-start-line="39" selection-start-column="86" selection-end-line="39" selection-end-column="86" />
+            <state relative-caret-position="-2229">
+              <caret line="91" column="7" lean-forward="false" selection-start-line="91" selection-start-column="7" selection-end-line="91" selection-end-column="7" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
-              <folding>
-                <element signature="e#0#22#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="defs.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="21">
-              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="215">
-              <caret line="47" column="81" lean-forward="false" selection-start-line="47" selection-start-column="81" selection-end-line="47" selection-end-column="81" />
-              <folding />
+              <caret line="1" column="7" lean-forward="true" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
+              <folding>
+                <element signature="e#30#54#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -113,28 +81,65 @@
       <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2436">
-              <caret line="125" column="45" lean-forward="false" selection-start-line="125" selection-start-column="45" selection-end-line="125" selection-end-column="45" />
+            <state relative-caret-position="347">
+              <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
+              <folding>
+                <element signature="e#40#60#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_framework.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="63">
+              <caret line="3" column="7" lean-forward="true" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
+              <folding>
+                <element signature="e#81#109#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="494">
+              <caret line="312" column="39" lean-forward="true" selection-start-line="312" selection-start-column="39" selection-end-line="312" selection-end-column="39" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="354">
+              <caret line="345" column="2" lean-forward="false" selection-start-line="345" selection-start-column="2" selection-end-line="345" selection-end-column="2" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+                <marker date="1497837059798" expanded="true" signature="10472:10474" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3297">
-              <caret line="164" column="37" lean-forward="false" selection-start-line="164" selection-start-column="37" selection-end-line="164" selection-end-column="37" />
+            <state relative-caret-position="147">
+              <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
+            <state relative-caret-position="172">
+              <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
               <folding />
             </state>
           </provider>
@@ -175,6 +180,8 @@
       <find>_printDebug</find>
       <find>use(</find>
       <find>_injec</find>
+      <find>writeln</find>
+      <find>write(</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -198,16 +205,18 @@
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
+        <option value="$PROJECT_DIR$/test/general_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/README.md" />
       </list>
@@ -244,6 +253,7 @@
     </navigator>
     <panes>
       <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -326,7 +336,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -355,12 +364,26 @@
     </option>
   </component>
   <component name="RunManager" selected="Dart Command Line App.All Tests (for coverage)">
+    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
     </configuration>
     <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
       <method />
     </configuration>
+    <configuration default="true" type="FlutterRunConfigurationType" factoryName="Flutter">
+      <method />
+    </configuration>
     <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
       <node-interpreter value="project" />
       <working-dir value="" />
@@ -464,7 +487,8 @@
       <workItem from="1496058266595" duration="1116000" />
       <workItem from="1496752349569" duration="695000" />
       <workItem from="1497200020318" duration="40000" />
-      <workItem from="1497200155899" duration="96000" />
+      <workItem from="1497200155899" duration="120000" />
+      <workItem from="1497825298573" duration="1949000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -564,7 +588,14 @@
       <option name="project" value="LOCAL" />
       <updated>1497200046584</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="+1">
+      <created>1497200256280</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1497200256280</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -600,7 +631,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9927000" />
+    <option name="totallyTimeSpent" value="11900000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -615,23 +646,23 @@
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22633527" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22792174" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -653,46 +684,18 @@
     <MESSAGE value="I love stack overflows!!!" />
     <MESSAGE value="Fixed last batch?" />
     <MESSAGE value="1.0.2" />
-    <MESSAGE value="+1" />
     <MESSAGE value="+2" />
     <MESSAGE value="+3" />
     <MESSAGE value="Coverage start..." />
     <MESSAGE value="1.0.3" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.3" />
+    <MESSAGE value="+1" />
+    <option name="LAST_COMMIT_MESSAGE" value="+1" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2175">
-          <caret line="153" column="25" lean-forward="false" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3555">
-          <caret line="237" column="49" lean-forward="true" selection-start-line="237" selection-start-column="49" selection-end-line="237" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -850,20 +853,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1020">
-          <caret line="74" column="0" lean-forward="false" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1113">
@@ -871,20 +860,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1239">
-          <caret line="67" column="32" lean-forward="false" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="14" column="46" lean-forward="true" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-522">
@@ -892,13 +867,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1467">
-          <caret line="90" column="25" lean-forward="false" selection-start-line="90" selection-start-column="25" selection-end-line="90" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/util_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -934,24 +902,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="710" column="21" lean-forward="true" selection-start-line="710" selection-start-column="21" selection-end-line="710" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="651">
-          <caret line="39" column="86" lean-forward="false" selection-start-line="39" selection-start-column="86" selection-end-line="39" selection-end-column="86" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
+        <state relative-caret-position="378">
           <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -978,7 +931,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
+        <state relative-caret-position="336">
           <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
           <folding>
             <element signature="e#0#22#0" expanded="true" />
@@ -986,22 +939,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2436">
-          <caret line="125" column="45" lean-forward="false" selection-start-line="125" selection-start-column="45" selection-end-line="125" selection-end-column="45" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3297">
-          <caret line="164" column="37" lean-forward="false" selection-start-line="164" selection-start-column="37" selection-end-line="164" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -1010,10 +947,125 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="172">
+          <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2229">
+          <caret line="91" column="7" lean-forward="false" selection-start-line="91" selection-start-column="7" selection-end-line="91" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1722">
+          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+          <folding>
+            <element signature="e#31#51#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="7" lean-forward="true" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
+          <folding>
+            <element signature="e#30#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="10" column="13" lean-forward="true" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="3" column="7" lean-forward="true" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
+          <folding>
+            <element signature="e#81#109#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="347">
+          <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="215">
-          <caret line="47" column="81" lean-forward="false" selection-start-line="47" selection-start-column="81" selection-end-line="47" selection-end-column="81" />
+        <state relative-caret-position="494">
+          <caret line="312" column="39" lean-forward="true" selection-start-line="312" selection-start-column="39" selection-end-line="312" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="563">
+          <caret line="74" column="0" lean-forward="false" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="354">
+          <caret line="345" column="2" lean-forward="false" selection-start-line="345" selection-start-column="2" selection-end-line="345" selection-end-column="2" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+            <marker date="1497837059798" expanded="true" signature="10472:10474" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -1021,7 +1073,7 @@
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
-          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
           <folding />
         </state>
       </provider>
@@ -1029,10 +1081,10 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="42">
-            <caret line="2" column="56" lean-forward="false" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+          <first_editor relative-caret-position="259">
+            <caret line="18" column="26" lean-forward="true" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
             <folding>
-              <marker date="1497200250327" expanded="true" signature="432:620" ph="{...}" />
+              <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
             </folding>
           </first_editor>
           <second_editor />
diff --git a/README.md b/README.md
index 99210b04..5547bf0a 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,13 @@
 # angel_framework
 
-[![pub 1.0.3+1](https://img.shields.io/badge/pub-1.0.3+1-brightgreen.svg)](https://pub.dartlang.org/packages/angel_framework)
+[![Pub](https://img.shields.io/pub/v/angel_framework.svg)](https://pub.dartlang.org/packages/angel_framework)
 [![build status](https://travis-ci.org/angel-dart/framework.svg)](https://travis-ci.org/angel-dart/framework)
 
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
 
+This is the core of the [Angel](https://github.com/angel-dart/angel) framework.
+To build real-world applications, please see the [homepage](https://angel-dart.github.io).
+
 ```dart
 import 'package:angel_framework/angel_framework.dart';
 
diff --git a/lib/src/http/metadata.dart b/lib/src/http/metadata.dart
index 194b0306..48676510 100644
--- a/lib/src/http/metadata.dart
+++ b/lib/src/http/metadata.dart
@@ -14,6 +14,8 @@ class Hooked {
   const Hooked();
 }
 
+const Hooked hooked = const Hooked();
+
 /// Attaches hooks to a [HookedService].
 class Hooks {
   final List<HookedServiceEventListener> before;
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 9c49ca43..de4e318c 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -11,7 +11,7 @@ import 'server.dart' show Angel;
 import 'controller.dart';
 
 final RegExp _contentType =
-new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
+    new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
@@ -19,11 +19,10 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef String ResponseSerializer(data);
 
 /// A convenience wrapper around an outgoing HTTP request.
-class ResponseContext extends Extensible {
+class ResponseContext extends Extensible implements StringSink {
   final _LockableBytesBuilder _buffer = new _LockableBytesBuilder();
   final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
-  bool _isOpen = true,
-      _isClosed = false;
+  bool _isOpen = true, _isClosed = false;
   int _statusCode = 200;
 
   /// The [Angel] instance that is sending a response.
@@ -124,7 +123,7 @@ class ResponseContext extends Extensible {
     if (!_isOpen) throw _closed();
 
     headers["Content-Disposition"] =
-    'attachment; filename="${filename ?? file.path}"';
+        'attachment; filename="${filename ?? file.path}"';
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     headers[HttpHeaders.CONTENT_LENGTH] = file.lengthSync().toString();
     buffer.add(await file.readAsBytes());
@@ -203,7 +202,7 @@ class ResponseContext extends Extensible {
     headers
       ..[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString()
       ..[HttpHeaders.LOCATION] =
-      url is String ? url : app.navigate(url, absolute: absolute);
+          url is String ? url : app.navigate(url, absolute: absolute);
     statusCode = code ?? 302;
     write('''
     <!DOCTYPE html>
@@ -261,7 +260,7 @@ class ResponseContext extends Extensible {
           "Controller redirects must take the form of 'Controller@action'. You gave: $action");
 
     Controller controller =
-    app.controller(split[0].replaceAll(_straySlashes, ''));
+        app.controller(split[0].replaceAll(_straySlashes, ''));
 
     if (controller == null)
       throw new Exception("Could not find a controller named '${split[0]}'");
@@ -273,11 +272,7 @@ class ResponseContext extends Extensible {
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
     final head =
-    controller
-        .findExpose()
-        .path
-        .toString()
-        .replaceAll(_straySlashes, '');
+        controller.findExpose().path.toString().replaceAll(_straySlashes, '');
     final tail = matched.makeUri(params).replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
@@ -313,9 +308,9 @@ class ResponseContext extends Extensible {
   /// You can optionally transform the file stream with a [codec].
   Future streamFile(File file,
       {int chunkSize,
-        int sleepMs: 0,
-        bool resumable: true,
-        Codec<List<int>, List<int>> codec}) async {
+      int sleepMs: 0,
+      bool resumable: true,
+      Codec<List<int>, List<int>> codec}) async {
     if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
@@ -339,6 +334,25 @@ class ResponseContext extends Extensible {
         buffer.add(encoding.encode(value.toString()));
     }
   }
+
+  @override
+  void writeCharCode(int charCode) {
+    if (_isClosed)
+      throw _closed();
+    else
+      buffer.addByte(charCode);
+  }
+
+  @override
+  void writeln([Object obj = ""]) {
+    write(obj.toString());
+    write('\r\n');
+  }
+
+  @override
+  void writeAll(Iterable objects, [String separator = ""]) {
+    write(objects.join(separator));
+  }
 }
 
 abstract class _LockableBytesBuilder extends BytesBuilder {
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 5e2b7f14..836a40c8 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -309,6 +309,8 @@ class Angel extends AngelBase {
           contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
               ContentType.JSON.mimeType);
       return false;
+    } else if (result is Stream) {
+      return await executeHandler(await result.toList(), req, res);
     } else
       return res.isOpen;
   }
@@ -336,6 +338,22 @@ class Angel extends AngelBase {
     return parent != null ? parent.findProperty(key) : null;
   }
 
+  _handleAngelHttpException(AngelHttpException e, StackTrace st,
+      RequestContext req, ResponseContext res) async {
+    res.statusCode = e.statusCode;
+    List<String> accept = request.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
+    if (accept.isEmpty ||
+        accept.contains('*/*') ||
+        accept.contains(ContentType.JSON.mimeType) ||
+        accept.contains("application/javascript")) {
+      res.serialize(e.toMap(),
+          contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+              ContentType.JSON.mimeType);
+    } else {
+      await errorHandler(e, req, res);
+    }
+  }
+
   /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
     try {
@@ -377,42 +395,15 @@ class Angel extends AngelBase {
             // _printDebug(
             //    'Handler completed successfully, did not terminate response: $handler');
           }
-        } catch (e, st) {
-          // _printDebug('Caught error in handler $handler: $e');
-          // _printDebug(st);
-
-          if (e is AngelHttpException) {
-            // Special handling for AngelHttpExceptions :)
-            try {
-              res.statusCode = e.statusCode;
-              List<String> accept =
-                  request.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
-              if (accept.isEmpty ||
-                  accept.contains('*/*') ||
-                  accept.contains(ContentType.JSON.mimeType) ||
-                  accept.contains("application/javascript")) {
-                res.serialize(e.toMap(),
-                    contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-                        ContentType.JSON.mimeType);
-              } else {
-                await errorHandler(e, req, res);
-              }
-              // _finalizeResponse(request, res);
-            } catch (e, st) {
-              _fatalErrorStream.add(
-                  new AngelFatalError(request: request, error: e, stack: st));
-            }
-          } else {
-            _fatalErrorStream.add(
-                new AngelFatalError(request: request, error: e, stack: st));
-          }
-
-          break;
+        } on AngelHttpException catch (e, st) {
+          return await _handleAngelHttpException(e, st, req, res);
         }
       }
 
       try {
         await sendResponse(request, req, res);
+      } on AngelHttpException catch (e, st) {
+        return await _handleAngelHttpException(e, st, req, res);
       } catch (e, st) {
         _fatalErrorStream
             .add(new AngelFatalError(request: request, error: e, stack: st));
diff --git a/pubspec.yaml b/pubspec.yaml
index 76c3009b..9e8946f2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.3+1
+version: 1.0.4
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 7b031481609f9668db2a27d6a826c896577ef05d Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 20 Jun 2017 15:13:15 -0400
Subject: [PATCH 132/414] Patch

---
 .idea/workspace.xml      | 203 ++++++++++-----------------------------
 lib/src/http/server.dart |  49 +++++++---
 pubspec.yaml             |   2 +-
 3 files changed, 88 insertions(+), 166 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f012b5cd..48544501 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
@@ -31,22 +28,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="21">
-              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="259">
-                <caret line="18" column="26" lean-forward="true" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+              <first_editor relative-caret-position="378">
+                <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
                 <folding>
                   <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
                 </folding>
@@ -59,7 +56,7 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2229">
+            <state relative-caret-position="1743">
               <caret line="91" column="7" lean-forward="false" selection-start-line="91" selection-start-column="7" selection-end-line="91" selection-end-column="7" />
               <folding />
             </state>
@@ -81,7 +78,7 @@
       <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="347">
+            <state relative-caret-position="546">
               <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
               <folding>
                 <element signature="e#40#60#0" expanded="true" />
@@ -105,8 +102,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="494">
-              <caret line="312" column="39" lean-forward="true" selection-start-line="312" selection-start-column="39" selection-end-line="312" selection-end-column="39" />
+            <state relative-caret-position="605">
+              <caret line="364" column="7" lean-forward="true" selection-start-line="364" selection-start-column="7" selection-end-line="364" selection-end-column="7" />
               <folding />
             </state>
           </provider>
@@ -115,7 +112,7 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="354">
+            <state relative-caret-position="7245">
               <caret line="345" column="2" lean-forward="false" selection-start-line="345" selection-start-column="2" selection-end-line="345" selection-end-column="2" />
               <folding>
                 <element signature="e#48#68#0" expanded="true" />
@@ -128,7 +125,7 @@
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
+            <state relative-caret-position="3591">
               <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
               <folding />
             </state>
@@ -138,7 +135,7 @@
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="172">
+            <state relative-caret-position="378">
               <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
               <folding />
             </state>
@@ -182,6 +179,7 @@
       <find>_injec</find>
       <find>writeln</find>
       <find>write(</find>
+      <find>_</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -215,10 +213,10 @@
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -238,7 +236,7 @@
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
+    <navigator proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -251,92 +249,7 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="http" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-    </panes>
+    <panes />
   </component>
   <component name="PropertiesComponent">
     <property name="options.lastSelected" value="preferences.externalResources" />
@@ -488,7 +401,8 @@
       <workItem from="1496752349569" duration="695000" />
       <workItem from="1497200020318" duration="40000" />
       <workItem from="1497200155899" duration="120000" />
-      <workItem from="1497825298573" duration="1949000" />
+      <workItem from="1497825298573" duration="2603000" />
+      <workItem from="1497985699191" duration="291000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -595,7 +509,14 @@
       <option name="project" value="LOCAL" />
       <updated>1497200256280</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="1.0.4">
+      <created>1497837231709</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1497837231709</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -631,7 +552,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11900000" />
+    <option name="totallyTimeSpent" value="12845000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -644,25 +565,24 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22792174" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -689,7 +609,8 @@
     <MESSAGE value="Coverage start..." />
     <MESSAGE value="1.0.3" />
     <MESSAGE value="+1" />
-    <option name="LAST_COMMIT_MESSAGE" value="+1" />
+    <MESSAGE value="1.0.4" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.4" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -906,9 +827,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
           <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -923,9 +841,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5544">
           <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
-          <folding>
-            <marker date="1495888340898" expanded="true" signature="318:418" ph="{...}" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -933,9 +848,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
           <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -943,7 +855,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
           <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -951,7 +862,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
           <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -959,13 +869,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
+        <state relative-caret-position="378">
           <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
           <folding />
         </state>
@@ -973,7 +882,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2229">
+        <state relative-caret-position="1743">
           <caret line="91" column="7" lean-forward="false" selection-start-line="91" selection-start-column="7" selection-end-line="91" selection-end-column="7" />
           <folding />
         </state>
@@ -983,9 +892,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1722">
           <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-          <folding>
-            <element signature="e#31#51#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1003,7 +909,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1011,7 +916,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
           <caret line="10" column="13" lean-forward="true" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1027,7 +931,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
+        <state relative-caret-position="546">
           <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
           <folding>
             <element signature="e#40#60#0" expanded="true" />
@@ -1035,25 +939,16 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="494">
-          <caret line="312" column="39" lean-forward="true" selection-start-line="312" selection-start-column="39" selection-end-line="312" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="563">
           <caret line="74" column="0" lean-forward="false" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="354">
+        <state relative-caret-position="7245">
           <caret line="345" column="2" lean-forward="false" selection-start-line="345" selection-start-column="2" selection-end-line="345" selection-end-column="2" />
           <folding>
             <element signature="e#48#68#0" expanded="true" />
@@ -1064,16 +959,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
+        <state relative-caret-position="3591">
           <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+        <state relative-caret-position="605">
+          <caret line="364" column="7" lean-forward="true" selection-start-line="364" selection-start-column="7" selection-end-line="364" selection-end-column="7" />
           <folding />
         </state>
       </provider>
@@ -1081,8 +976,8 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="259">
-            <caret line="18" column="26" lean-forward="true" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+          <first_editor relative-caret-position="378">
+            <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
             <folding>
               <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
             </folding>
@@ -1091,5 +986,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 836a40c8..914bbad3 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -11,7 +11,7 @@ import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
 import 'fatal_error.dart';
-import 'hooked_service.dart';
+//import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -339,18 +339,37 @@ class Angel extends AngelBase {
   }
 
   _handleAngelHttpException(AngelHttpException e, StackTrace st,
-      RequestContext req, ResponseContext res) async {
-    res.statusCode = e.statusCode;
-    List<String> accept = request.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
-    if (accept.isEmpty ||
-        accept.contains('*/*') ||
-        accept.contains(ContentType.JSON.mimeType) ||
-        accept.contains("application/javascript")) {
-      res.serialize(e.toMap(),
-          contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-              ContentType.JSON.mimeType);
-    } else {
-      await errorHandler(e, req, res);
+      RequestContext req, ResponseContext res, HttpRequest request) async {
+    try {
+      if (req == null || res == null) {
+        _fatalErrorStream.add(new AngelFatalError(
+            request: request,
+            error: e?.error ??
+                e ??
+                new Exception('Unhandled exception while handling request.'),
+            stack: st));
+        return;
+      }
+
+      res.statusCode = e.statusCode;
+      List<String> accept = request?.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
+      if (accept.isEmpty ||
+          accept.contains('*/*') ||
+          accept.contains(ContentType.JSON.mimeType) ||
+          accept.contains("application/javascript")) {
+        res.serialize(e.toMap(),
+            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+                ContentType.JSON.mimeType);
+      } else {
+        await errorHandler(e, req, res);
+      }
+    } catch (_) {
+      _fatalErrorStream.add(new AngelFatalError(
+          request: request,
+          error: e?.error ??
+              e ??
+              new Exception('Unhandled exception while handling request.'),
+          stack: st));
     }
   }
 
@@ -396,14 +415,14 @@ class Angel extends AngelBase {
             //    'Handler completed successfully, did not terminate response: $handler');
           }
         } on AngelHttpException catch (e, st) {
-          return await _handleAngelHttpException(e, st, req, res);
+          return await _handleAngelHttpException(e, st, req, res, request);
         }
       }
 
       try {
         await sendResponse(request, req, res);
       } on AngelHttpException catch (e, st) {
-        return await _handleAngelHttpException(e, st, req, res);
+        return await _handleAngelHttpException(e, st, req, res, request);
       } catch (e, st) {
         _fatalErrorStream
             .add(new AngelFatalError(request: request, error: e, stack: st));
diff --git a/pubspec.yaml b/pubspec.yaml
index 9e8946f2..737a0339 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.4
+version: 1.0.5+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 79e4dccccdc01b98bb199aee7c14957ba1b16272 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 29 Jun 2017 18:17:42 -0400
Subject: [PATCH 133/414] Added more tests.

---
 .idea/dbnavigator.xml                  | 451 ++++++++++++++++
 .idea/workspace.xml                    | 680 ++++++++++++++-----------
 lib/src/http/angel_base.dart           |   3 +-
 lib/src/http/angel_http_exception.dart |   4 +-
 lib/src/http/anonymous_service.dart    |   2 +-
 lib/src/http/typed_service.dart        |  24 +-
 test/all.dart                          |  10 +-
 test/anonymous_service_test.dart       |  44 ++
 test/controller_test.dart              |  47 +-
 test/exception_test.dart               |  97 ++++
 test/typed_service_test.dart           |  65 +++
 test/view_generator_test.dart          |  10 +
 12 files changed, 1130 insertions(+), 307 deletions(-)
 create mode 100644 .idea/dbnavigator.xml
 create mode 100644 test/anonymous_service_test.dart
 create mode 100644 test/exception_test.dart
 create mode 100644 test/typed_service_test.dart
 create mode 100644 test/view_generator_test.dart

diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
new file mode 100644
index 00000000..11ef66c4
--- /dev/null
+++ b/.idea/dbnavigator.xml
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DBNavigator.Project.DataEditorManager">
+    <record-view-column-sorting-type value="BY_INDEX" />
+    <value-preview-text-wrapping value="true" />
+    <value-preview-pinned value="false" />
+  </component>
+  <component name="DBNavigator.Project.DataExportManager">
+    <export-instructions>
+      <create-header value="true" />
+      <quote-values-containing-separator value="true" />
+      <quote-all-values value="false" />
+      <value-separator value="" />
+      <file-name value="" />
+      <file-location value="" />
+      <scope value="GLOBAL" />
+      <destination value="FILE" />
+      <format value="EXCEL" />
+      <charset value="windows-1252" />
+    </export-instructions>
+  </component>
+  <component name="DBNavigator.Project.DatabaseBrowserManager">
+    <autoscroll-to-editor value="false" />
+    <autoscroll-from-editor value="true" />
+    <show-object-properties value="true" />
+    <loaded-nodes />
+  </component>
+  <component name="DBNavigator.Project.EditorStateManager">
+    <last-used-providers />
+  </component>
+  <component name="DBNavigator.Project.MethodExecutionManager">
+    <method-browser />
+    <execution-history>
+      <group-entries value="true" />
+      <execution-inputs />
+    </execution-history>
+    <argument-values-cache />
+  </component>
+  <component name="DBNavigator.Project.ObjectDependencyManager">
+    <last-used-dependency-type value="INCOMING" />
+  </component>
+  <component name="DBNavigator.Project.ObjectQuickFilterManager">
+    <last-used-operator value="EQUAL" />
+    <filters />
+  </component>
+  <component name="DBNavigator.Project.ScriptExecutionManager" clear-outputs="true">
+    <recently-used-interfaces />
+  </component>
+  <component name="DBNavigator.Project.Settings">
+    <connections />
+    <browser-settings>
+      <general>
+        <display-mode value="TABBED" />
+        <navigation-history-size value="100" />
+        <show-object-details value="false" />
+      </general>
+      <filters>
+        <object-type-filter>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="true" />
+          <object-type name="ROLE" enabled="true" />
+          <object-type name="PRIVILEGE" enabled="true" />
+          <object-type name="CHARSET" enabled="true" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED_VIEW" enabled="true" />
+          <object-type name="NESTED_TABLE" enabled="true" />
+          <object-type name="COLUMN" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET_TRIGGER" enabled="true" />
+          <object-type name="DATABASE_TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="true" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE_ATTRIBUTE" enabled="true" />
+          <object-type name="ARGUMENT" enabled="true" />
+          <object-type name="DIMENSION" enabled="true" />
+          <object-type name="CLUSTER" enabled="true" />
+          <object-type name="DBLINK" enabled="true" />
+        </object-type-filter>
+      </filters>
+      <sorting>
+        <object-type name="COLUMN" sorting-type="NAME" />
+        <object-type name="FUNCTION" sorting-type="NAME" />
+        <object-type name="PROCEDURE" sorting-type="NAME" />
+        <object-type name="ARGUMENT" sorting-type="POSITION" />
+      </sorting>
+      <default-editors>
+        <object-type name="VIEW" editor-type="SELECTION" />
+        <object-type name="PACKAGE" editor-type="SELECTION" />
+        <object-type name="TYPE" editor-type="SELECTION" />
+      </default-editors>
+    </browser-settings>
+    <navigation-settings>
+      <lookup-filters>
+        <lookup-objects>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="false" />
+          <object-type name="ROLE" enabled="false" />
+          <object-type name="PRIVILEGE" enabled="false" />
+          <object-type name="CHARSET" enabled="false" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED VIEW" enabled="true" />
+          <object-type name="NESTED TABLE" enabled="false" />
+          <object-type name="COLUMN" enabled="false" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET TRIGGER" enabled="true" />
+          <object-type name="DATABASE TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="false" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE ATTRIBUTE" enabled="false" />
+          <object-type name="ARGUMENT" enabled="false" />
+          <object-type name="DIMENSION" enabled="false" />
+          <object-type name="CLUSTER" enabled="false" />
+          <object-type name="DBLINK" enabled="true" />
+        </lookup-objects>
+        <force-database-load value="false" />
+        <prompt-connection-selection value="true" />
+        <prompt-schema-selection value="true" />
+      </lookup-filters>
+    </navigation-settings>
+    <dataset-grid-settings>
+      <general>
+        <enable-zooming value="true" />
+      </general>
+      <sorting>
+        <nulls-first value="true" />
+        <max-sorting-columns value="4" />
+      </sorting>
+      <tracking-columns>
+        <columnNames value="" />
+        <visible value="true" />
+        <editable value="false" />
+      </tracking-columns>
+    </dataset-grid-settings>
+    <dataset-editor-settings>
+      <text-editor-popup>
+        <active value="false" />
+        <active-if-empty value="false" />
+        <data-length-threshold value="100" />
+        <popup-delay value="1000" />
+      </text-editor-popup>
+      <values-list-popup>
+        <show-popup-button value="true" />
+        <element-count-threshold value="1000" />
+        <data-length-threshold value="250" />
+      </values-list-popup>
+      <general>
+        <fetch-block-size value="100" />
+        <fetch-timeout value="30" />
+        <trim-whitespaces value="true" />
+        <convert-empty-strings-to-null value="true" />
+        <select-content-on-cell-edit value="true" />
+        <large-value-preview-active value="true" />
+      </general>
+      <filters>
+        <prompt-filter-dialog value="true" />
+        <default-filter-type value="BASIC" />
+      </filters>
+      <qualified-text-editor text-length-threshold="300">
+        <content-types>
+          <content-type name="Text" enabled="true" />
+          <content-type name="XML" enabled="true" />
+          <content-type name="DTD" enabled="true" />
+          <content-type name="HTML" enabled="true" />
+          <content-type name="XHTML" enabled="true" />
+          <content-type name="CSS" enabled="true" />
+          <content-type name="SQL" enabled="true" />
+          <content-type name="PL/SQL" enabled="true" />
+          <content-type name="JavaScript" enabled="true" />
+          <content-type name="JSP" enabled="true" />
+          <content-type name="JSPx" enabled="true" />
+          <content-type name="ASP" enabled="true" />
+          <content-type name="YAML" enabled="true" />
+          <content-type name="Bash" enabled="true" />
+        </content-types>
+      </qualified-text-editor>
+      <record-navigation>
+        <navigation-target value="VIEWER" />
+      </record-navigation>
+    </dataset-editor-settings>
+    <code-editor-settings>
+      <general>
+        <show-object-navigation-gutter value="false" />
+        <show-spec-declaration-navigation-gutter value="true" />
+      </general>
+      <confirmations>
+        <save-changes value="false" />
+        <revert-changes value="true" />
+      </confirmations>
+    </code-editor-settings>
+    <code-completion-settings>
+      <filters>
+        <basic-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="false" />
+            <filter-element type="OBJECT" id="view" selected="false" />
+            <filter-element type="OBJECT" id="materialized view" selected="false" />
+            <filter-element type="OBJECT" id="index" selected="false" />
+            <filter-element type="OBJECT" id="constraint" selected="false" />
+            <filter-element type="OBJECT" id="trigger" selected="false" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="false" />
+            <filter-element type="OBJECT" id="procedure" selected="false" />
+            <filter-element type="OBJECT" id="function" selected="false" />
+            <filter-element type="OBJECT" id="package" selected="false" />
+            <filter-element type="OBJECT" id="type" selected="false" />
+            <filter-element type="OBJECT" id="dimension" selected="false" />
+            <filter-element type="OBJECT" id="cluster" selected="false" />
+            <filter-element type="OBJECT" id="dblink" selected="false" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </basic-filter>
+        <extended-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </extended-filter>
+      </filters>
+      <sorting enabled="true">
+        <sorting-element type="RESERVED_WORD" id="keyword" />
+        <sorting-element type="RESERVED_WORD" id="datatype" />
+        <sorting-element type="OBJECT" id="column" />
+        <sorting-element type="OBJECT" id="table" />
+        <sorting-element type="OBJECT" id="view" />
+        <sorting-element type="OBJECT" id="materialized view" />
+        <sorting-element type="OBJECT" id="index" />
+        <sorting-element type="OBJECT" id="constraint" />
+        <sorting-element type="OBJECT" id="trigger" />
+        <sorting-element type="OBJECT" id="synonym" />
+        <sorting-element type="OBJECT" id="sequence" />
+        <sorting-element type="OBJECT" id="procedure" />
+        <sorting-element type="OBJECT" id="function" />
+        <sorting-element type="OBJECT" id="package" />
+        <sorting-element type="OBJECT" id="type" />
+        <sorting-element type="OBJECT" id="dimension" />
+        <sorting-element type="OBJECT" id="cluster" />
+        <sorting-element type="OBJECT" id="dblink" />
+        <sorting-element type="OBJECT" id="schema" />
+        <sorting-element type="OBJECT" id="role" />
+        <sorting-element type="OBJECT" id="user" />
+        <sorting-element type="RESERVED_WORD" id="function" />
+        <sorting-element type="RESERVED_WORD" id="parameter" />
+      </sorting>
+      <format>
+        <enforce-code-style-case value="true" />
+      </format>
+    </code-completion-settings>
+    <execution-engine-settings>
+      <statement-execution>
+        <fetch-block-size value="100" />
+        <execution-timeout value="20" />
+        <debug-execution-timeout value="600" />
+        <focus-result value="false" />
+        <prompt-execution value="false" />
+      </statement-execution>
+      <script-execution>
+        <command-line-interfaces />
+        <execution-timeout value="300" />
+      </script-execution>
+      <method-execution>
+        <execution-timeout value="30" />
+        <debug-execution-timeout value="600" />
+        <parameter-history-size value="10" />
+      </method-execution>
+    </execution-engine-settings>
+    <operation-settings>
+      <transactions>
+        <uncommitted-changes>
+          <on-project-close value="ASK" />
+          <on-disconnect value="ASK" />
+          <on-autocommit-toggle value="ASK" />
+        </uncommitted-changes>
+        <multiple-uncommitted-changes>
+          <on-commit value="ASK" />
+          <on-rollback value="ASK" />
+        </multiple-uncommitted-changes>
+      </transactions>
+      <session-browser>
+        <disconnect-session value="ASK" />
+        <kill-session value="ASK" />
+        <reload-on-filter-change value="false" />
+      </session-browser>
+      <compiler>
+        <compile-type value="KEEP" />
+        <compile-dependencies value="ASK" />
+        <always-show-controls value="false" />
+      </compiler>
+      <debugger>
+        <debugger-type value="JDBC" />
+        <use-generic-runners value="true" />
+      </debugger>
+    </operation-settings>
+    <ddl-file-settings>
+      <extensions>
+        <mapping file-type-id="VIEW" extensions="vw" />
+        <mapping file-type-id="TRIGGER" extensions="trg" />
+        <mapping file-type-id="PROCEDURE" extensions="prc" />
+        <mapping file-type-id="FUNCTION" extensions="fnc" />
+        <mapping file-type-id="PACKAGE" extensions="pkg" />
+        <mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
+        <mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
+        <mapping file-type-id="TYPE" extensions="tpe" />
+        <mapping file-type-id="TYPE_SPEC" extensions="tps" />
+        <mapping file-type-id="TYPE_BODY" extensions="tpb" />
+      </extensions>
+      <general>
+        <lookup-ddl-files value="true" />
+        <create-ddl-files value="false" />
+        <synchronize-ddl-files value="true" />
+        <use-qualified-names value="false" />
+        <make-scripts-rerunnable value="true" />
+      </general>
+    </ddl-file-settings>
+    <general-settings>
+      <regional-settings>
+        <date-format value="MEDIUM" />
+        <number-format value="UNGROUPED" />
+        <locale value="SYSTEM_DEFAULT" />
+        <use-custom-formats value="false" />
+      </regional-settings>
+      <environment>
+        <environment-types>
+          <environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
+          <environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
+          <environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
+          <environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
+        </environment-types>
+        <visibility-settings>
+          <connection-tabs value="true" />
+          <dialog-headers value="true" />
+          <object-editor-tabs value="true" />
+          <script-editor-tabs value="false" />
+          <execution-result-tabs value="true" />
+        </visibility-settings>
+      </environment>
+    </general-settings>
+  </component>
+  <component name="DBNavigator.Project.StatementExecutionManager">
+    <execution-variables />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 48544501..e46408c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/anonymous_service_test.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/exception_test.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/typed_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -17,7 +26,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/framework$All_Tests__for_coverage_.coverage" NAME="All Tests (for coverage) Coverage Results" MODIFIED="1497837068041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="DartCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" CONTEXT_FILE_PATH="$PROJECT_DIR$/test/all.dart" />
+    <SUITE FILE_PATH="coverage/framework$All_Tests__for_coverage_.coverage" NAME="All Tests (for coverage) Coverage Results" MODIFIED="1498774624592" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="DartCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" CONTEXT_FILE_PATH="$PROJECT_DIR$/test/all.dart" />
   </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
@@ -27,122 +36,48 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="378">
-                <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
-                <folding>
-                  <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
-                </folding>
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1743">
-              <caret line="91" column="7" lean-forward="false" selection-start-line="91" selection-start-column="7" selection-end-line="91" selection-end-column="7" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="defs.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" column="7" lean-forward="true" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
-              <folding>
-                <element signature="e#30#54#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="546">
-              <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-              <folding>
-                <element signature="e#40#60#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_framework.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="3" column="7" lean-forward="true" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
-              <folding>
-                <element signature="e#81#109#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="605">
-              <caret line="364" column="7" lean-forward="true" selection-start-line="364" selection-start-column="7" selection-end-line="364" selection-end-column="7" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="7245">
-              <caret line="345" column="2" lean-forward="false" selection-start-line="345" selection-start-column="2" selection-end-line="345" selection-end-column="2" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-                <marker date="1497837059798" expanded="true" signature="10472:10474" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3591">
-              <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="378">
-              <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.37098846">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+          <file leaf-file-name="controller.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="1491">
+                  <caret line="78" column="3" lean-forward="true" selection-start-line="78" selection-start-column="3" selection-end-line="78" selection-end-column="3" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="333">
+                  <caret line="92" column="33" lean-forward="false" selection-start-line="92" selection-start-column="33" selection-end-line="92" selection-end-column="33" />
+                  <folding>
+                    <element signature="e#0#20#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="routable.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="-2212">
+                  <caret line="26" column="38" lean-forward="false" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -180,10 +115,18 @@
       <find>writeln</find>
       <find>write(</find>
       <find>_</find>
+      <find>index</find>
+      <find>typed</find>
+      <find>x</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
       <replace>// _printDebug</replace>
+      <replace>create</replace>
+      <replace>modify</replace>
+      <replace>update</replace>
+      <replace>remove</replace>
+      <replace>data</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -199,7 +142,6 @@
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
@@ -207,7 +149,6 @@
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
@@ -217,6 +158,16 @@
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+        <option value="$PROJECT_DIR$/test/exception_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
       </list>
     </option>
   </component>
@@ -236,7 +187,7 @@
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -249,7 +200,92 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="http" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scratches" />
+      <pane id="Scope" />
+    </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="options.lastSelected" value="preferences.externalResources" />
@@ -357,19 +393,44 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <configuration default="false" name="tests in anonymous_service_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
+      <option name="testName" value="anonymous_service_test.dart" />
+      <method />
+    </configuration>
+    <configuration default="false" name="tests in exception_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/exception_test.dart" />
+      <option name="testName" value="exception_test.dart" />
+      <method />
+    </configuration>
+    <configuration default="false" name="tests in typed_service_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
+      <option name="testName" value="typed_service_test.dart" />
+      <method />
+    </configuration>
+    <configuration default="false" name="default view generator in view_generator_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/view_generator_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="default view generator" />
+      <method />
+    </configuration>
     <configuration default="false" name="tests in precontained_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/precontained_test.dart" />
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="7">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+    <list size="11">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -402,7 +463,8 @@
       <workItem from="1497200020318" duration="40000" />
       <workItem from="1497200155899" duration="120000" />
       <workItem from="1497825298573" duration="2603000" />
-      <workItem from="1497985699191" duration="291000" />
+      <workItem from="1497985699191" duration="902000" />
+      <workItem from="1498770817945" duration="3831000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -516,43 +578,50 @@
       <option name="project" value="LOCAL" />
       <updated>1497837231709</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="Patch">
+      <created>1497985995955</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1497985995955</updated>
+    </task>
+    <option name="localTasksCounter" value="18" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 54m 45s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2017.06.29 at 18h 07m 41s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 56m 41s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2017.06.29 at 18h 08m 58s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 58m 57s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2017.06.29 at 18h 10m 24s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 07h 59m 07s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2017.06.29 at 18h 11m 22s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 00m 14s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2017.06.29 at 18h 15m 29s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 00m 43s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 01m 34s.xml">
+      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 01m 42s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 01m 46s.xml">
+      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 02m 39s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 02m 10s.xml">
+      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.05.29 at 08h 02m 54s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 04m 19s.xml">
+      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_precontained_test_dart - 2017.06.06 at 08h 33m 54s.xml">
-      <configuration name="tests in precontained_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 05m 00s.xml">
+      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12845000" />
+    <option name="totallyTimeSpent" value="17287000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -565,26 +634,29 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22792174" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28425822" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1760973" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -610,70 +682,14 @@
     <MESSAGE value="1.0.3" />
     <MESSAGE value="+1" />
     <MESSAGE value="1.0.4" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.4" />
+    <MESSAGE value="Patch" />
+    <option name="LAST_COMMIT_MESSAGE" value="Patch" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="49" column="5" lean-forward="false" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2175">
-          <caret line="153" column="25" lean-forward="true" selection-start-line="153" selection-start-column="25" selection-end-line="153" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3540">
-          <caret line="236" column="27" lean-forward="false" selection-start-line="236" selection-start-column="27" selection-end-line="236" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="94" column="26" lean-forward="false" selection-start-line="94" selection-start-column="26" selection-end-line="94" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1275">
@@ -774,13 +790,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1113">
-          <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-522">
@@ -795,13 +804,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="30" column="32" lean-forward="false" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -809,20 +811,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1344">
-          <caret line="70" column="2" lean-forward="false" selection-start-line="70" selection-start-column="2" selection-end-line="70" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-192">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
@@ -830,13 +818,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="17" column="43" lean-forward="false" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5544">
@@ -880,14 +861,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1743">
-          <caret line="91" column="7" lean-forward="false" selection-start-line="91" selection-start-column="7" selection-end-line="91" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1722">
@@ -898,9 +871,9 @@
     <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
-          <caret line="1" column="7" lean-forward="true" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
+          <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
           <folding>
-            <element signature="e#30#54#0" expanded="true" />
+            <element signature="e#30#54#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -922,19 +895,9 @@
     <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
-          <caret line="3" column="7" lean-forward="true" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
+          <caret line="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
           <folding>
-            <element signature="e#81#109#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
+            <element signature="e#81#109#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -948,7 +911,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7245">
+        <state relative-caret-position="7077">
           <caret line="345" column="2" lean-forward="false" selection-start-line="345" selection-start-column="2" selection-end-line="345" selection-end-column="2" />
           <folding>
             <element signature="e#48#68#0" expanded="true" />
@@ -957,17 +920,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3591">
-          <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="605">
+        <state relative-caret-position="7329">
           <caret line="364" column="7" lean-forward="true" selection-start-line="364" selection-start-column="7" selection-end-line="364" selection-end-column="7" />
           <folding />
         </state>
@@ -976,8 +931,8 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="378">
-            <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+          <first_editor relative-caret-position="84">
+            <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
             <folding>
               <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
             </folding>
@@ -986,10 +941,155 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="38" lean-forward="true" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/io/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="284">
+          <caret line="36" column="19" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="60" column="31" lean-forward="true" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/anonymous_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-171">
+          <caret line="9" column="2" lean-forward="false" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="2" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+            <marker date="1498772578410" expanded="true" signature="211:537" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="28" column="9" lean-forward="true" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        <state relative-caret-position="210">
+          <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="307">
+          <caret line="67" column="18" lean-forward="false" selection-start-line="67" selection-start-column="18" selection-end-line="67" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="27" column="45" lean-forward="false" selection-start-line="27" selection-start-column="45" selection-end-line="27" selection-end-column="45" />
+          <folding>
+            <element signature="e#0#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="15" column="29" lean-forward="false" selection-start-line="15" selection-start-column="29" selection-end-line="20" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1491">
+          <caret line="78" column="3" lean-forward="true" selection-start-line="78" selection-start-column="3" selection-end-line="78" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="333">
+          <caret line="92" column="33" lean-forward="false" selection-start-line="92" selection-start-column="33" selection-end-line="92" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2212">
+          <caret line="26" column="38" lean-forward="false" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
           <folding />
         </state>
       </provider>
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 60b4124c..2c869965 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -28,6 +28,5 @@ class AngelBase extends Routable {
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
-  ViewGenerator viewGenerator = (String view,
-      [Map data]) async => "No view engine has been configured yet.";
+  ViewGenerator viewGenerator = (String view, [Map data]) async => "No view engine has been configured yet.";
 }
\ No newline at end of file
diff --git a/lib/src/http/angel_http_exception.dart b/lib/src/http/angel_http_exception.dart
index 54cb14a0..781b5643 100644
--- a/lib/src/http/angel_http_exception.dart
+++ b/lib/src/http/angel_http_exception.dart
@@ -32,7 +32,7 @@ class AngelHttpException implements Exception {
   Map toJson() {
     return {
       'isError': true,
-      'statusCode': statusCode,
+      'status_code': statusCode,
       'message': message,
       'errors': errors
     };
@@ -47,7 +47,7 @@ class AngelHttpException implements Exception {
 
   factory AngelHttpException.fromMap(Map data) {
     return new AngelHttpException(null,
-        statusCode: data['statusCode'],
+        statusCode: data['status_code'] ?? data['statusCode'],
         message: data['message'],
         errors: data['errors']);
   }
diff --git a/lib/src/http/anonymous_service.dart b/lib/src/http/anonymous_service.dart
index dbe927eb..9e578be1 100644
--- a/lib/src/http/anonymous_service.dart
+++ b/lib/src/http/anonymous_service.dart
@@ -8,7 +8,7 @@ class AnonymousService extends Service {
   Function _index, _read, _create, _modify, _update, _remove;
 
   AnonymousService(
-      {Future<List> index([Map params]),
+      {Future index([Map params]),
       Future read(id, [Map params]),
       Future create(data, [Map params]),
       Future modify(id, data, [Map params]),
diff --git a/lib/src/http/typed_service.dart b/lib/src/http/typed_service.dart
index eb883119..9ee37834 100644
--- a/lib/src/http/typed_service.dart
+++ b/lib/src/http/typed_service.dart
@@ -15,7 +15,7 @@ class TypedService<T> extends Service {
 
   deserialize(x) {
     // print('DESERIALIZE: $x (${x.runtimeType})');
-    if (x == dynamic || x == Object || x is T)
+    if (x is Type || x is T)
       return x;
     else if (x is Iterable)
       return x.map(deserialize).toList();
@@ -23,7 +23,11 @@ class TypedService<T> extends Service {
       Map data = x.keys.fold({}, (map, key) {
         var value = x[key];
 
-        if ((key == 'createdAt' || key == 'updatedAt') && value is String) {
+        if ((key == 'createdAt' ||
+                key == 'updatedAt' ||
+                key == 'created_at' ||
+                key == 'updated_at') &&
+            value is String) {
           return map..[key] = DateTime.parse(value);
         } else {
           return map..[key] = value;
@@ -32,16 +36,16 @@ class TypedService<T> extends Service {
 
       Model result = god.deserializeDatum(data, outputType: T);
 
-      if (x['createdAt'] is String) {
-        result.createdAt = DateTime.parse(x['createdAt']);
-      } else if (x['createdAt'] is DateTime) {
-        result.createdAt = x['createdAt'];
+      if (data['createdAt'] is DateTime) {
+        result.createdAt = data['createdAt'];
+      } else if (data['created_at'] is DateTime) {
+        result.createdAt = data['created_at'];
       }
 
-      if (x['updatedAt'] is String) {
-        result.updatedAt = DateTime.parse(x['updatedAt']);
-      } else if (x['updatedAt'] is DateTime) {
-        result.updatedAt = x['updatedAt'];
+      if (data['updatedAt'] is DateTime) {
+        result.updatedAt = data['updatedAt'];
+      } else if (data['updated_at'] is DateTime) {
+        result.updatedAt = data['updated_at'];
       }
 
       // print('x: $x\nresult: $result');
diff --git a/test/all.dart b/test/all.dart
index c68df6c9..a4910443 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -1,23 +1,31 @@
+import 'anonymous_service_test.dart' as anonymous_service;
 import 'controller_test.dart' as controller;
 import 'di_test.dart' as di;
+import 'exception_test.dart' as exception;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
 import 'precontained_test.dart' as precontained;
 import 'routing_test.dart' as routing;
 import 'serialize_test.dart' as serialize;
 import 'services_test.dart' as services;
+import 'typed_service_test.dart' as typed_service;
 import 'util_test.dart' as util;
+import 'view_generator_test.dart' as view_generator;
 import 'package:test/test.dart';
 
 /// For running with coverage
 main() {
+  group('anonymous service', anonymous_service.main);
   group('controller', controller.main);
   group('di', di.main);
+  group('exception', exception.main);
   group('general', general.main);
   group('hooked', hooked.main);
   group('precontained', precontained.main);
   group('routing', routing.main);
   group('serialize', serialize.main);
   group('services', services.main);
+  group('typed_service', typed_service.main);
   group('util', util.main);
-}
\ No newline at end of file
+  group('view generator', view_generator.main);
+}
diff --git a/test/anonymous_service_test.dart b/test/anonymous_service_test.dart
new file mode 100644
index 00000000..7df3601b
--- /dev/null
+++ b/test/anonymous_service_test.dart
@@ -0,0 +1,44 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:test/test.dart';
+
+main() {
+  test('custom methods', () async {
+    var svc = new AnonymousService(
+        index: ([p]) async => 'index',
+        read: (id, [p]) async => 'read',
+        create: (data, [p]) async => 'create',
+        modify: (id, data, [p]) async => 'modify',
+        update: (id, data, [p]) async => 'update',
+        remove: (id, [p]) async => 'remove');
+    expect(await svc.index(), 'index');
+    expect(await svc.read(null), 'read');
+    expect(await svc.create(null), 'create');
+    expect(await svc.modify(null, null), 'modify');
+    expect(await svc.update(null, null), 'update');
+    expect(await svc.remove(null), 'remove');
+  });
+
+  test('defaults to throwing', () async {
+    try {
+      var svc = new AnonymousService();
+      await svc.read(1);
+      throw 'Should have thrown 405!';
+    } on AngelHttpException {
+      // print('Ok!');
+    }
+    try {
+      var svc = new AnonymousService();
+      await svc.modify(2, null);
+      throw 'Should have thrown 405!';
+    } on AngelHttpException {
+      // print('Ok!');
+    }
+    try {
+      var svc = new AnonymousService();
+      await svc.update(3, null);
+      throw 'Should have thrown 405!';
+    } on AngelHttpException {
+      // print('Ok!');
+    }
+  });
+}
diff --git a/test/controller_test.dart b/test/controller_test.dart
index c023ff38..e56000ae 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
+import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 import 'common.dart';
 
@@ -25,8 +26,19 @@ class TodoController extends Controller {
   }
 }
 
+class NoExposeController extends Controller {
+
+}
+
+@Expose('/named', as: 'foo')
+class NamedController extends Controller {
+  @Expose('/optional/:arg?', allowNull: const ['arg'])
+  optional() => 2;
+}
+
 main() {
   Angel app;
+  TodoController ctrl;
   HttpServer server;
   http.Client client = new http.Client();
   String url;
@@ -39,7 +51,7 @@ main() {
         "/redirect",
         (req, ResponseContext res) async =>
             res.redirectToAction("TodoController@foo", {"foo": "world"}));
-    await app.configure(new TodoController());
+    await app.configure(ctrl = new TodoController());
 
     print(app.controllers);
     app.dumpTree();
@@ -54,6 +66,39 @@ main() {
     url = null;
   });
 
+  test('basic', () {
+    expect(ctrl.app, app);
+  });
+
+  test('require expose', () async {
+    try {
+      var app = new Angel();
+      await app.configure(new NoExposeController());
+      throw 'Should require @Expose';
+    } on Exception {
+      // :)
+    }
+  });
+
+  test('create dynamic handler', () async {
+    var app = new Angel();
+    app.get('/foo', createDynamicHandler(({String bar}) {
+      return 2;
+    }, optional: [
+      'bar'
+    ]));
+    var rq = new MockHttpRequest('GET', new Uri(path: 'foo'));
+    await app.handleRequest(rq);
+    var body = await rq.response.transform(UTF8.decoder).join();
+    expect(JSON.decode(body), 2);
+  });
+
+  test('optional name', () async {
+    var app = new Angel();
+    await app.configure(new NamedController());
+    expect(app.controllers['foo'], new isInstanceOf<NamedController>());
+  });
+
   test("middleware", () async {
     var rgx = new RegExp("^Hello, world!");
     var response = await client.get("$url/todos/0");
diff --git a/test/exception_test.dart b/test/exception_test.dart
new file mode 100644
index 00000000..f1db47ff
--- /dev/null
+++ b/test/exception_test.dart
@@ -0,0 +1,97 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:matcher/matcher.dart';
+import 'package:test/test.dart';
+
+main() {
+  test('named constructors', () {
+    expect(new AngelHttpException.badRequest(),
+        isException(HttpStatus.BAD_REQUEST, '400 Bad Request'));
+    expect(new AngelHttpException.BadRequest(),
+        isException(HttpStatus.BAD_REQUEST, '400 Bad Request'));
+    expect(new AngelHttpException.notAuthenticated(),
+        isException(HttpStatus.UNAUTHORIZED, '401 Not Authenticated'));
+    expect(new AngelHttpException.NotAuthenticated(),
+        isException(HttpStatus.UNAUTHORIZED, '401 Not Authenticated'));
+    expect(new AngelHttpException.paymentRequired(),
+        isException(HttpStatus.PAYMENT_REQUIRED, '402 Payment Required'));
+    expect(new AngelHttpException.PaymentRequired(),
+        isException(HttpStatus.PAYMENT_REQUIRED, '402 Payment Required'));
+    expect(new AngelHttpException.forbidden(),
+        isException(HttpStatus.FORBIDDEN, '403 Forbidden'));
+    expect(new AngelHttpException.Forbidden(),
+        isException(HttpStatus.FORBIDDEN, '403 Forbidden'));
+    expect(new AngelHttpException.notFound(),
+        isException(HttpStatus.NOT_FOUND, '404 Not Found'));
+    expect(new AngelHttpException.NotFound(),
+        isException(HttpStatus.NOT_FOUND, '404 Not Found'));
+    expect(new AngelHttpException.methodNotAllowed(),
+        isException(HttpStatus.METHOD_NOT_ALLOWED, '405 Method Not Allowed'));
+    expect(new AngelHttpException.MethodNotAllowed(),
+        isException(HttpStatus.METHOD_NOT_ALLOWED, '405 Method Not Allowed'));
+    expect(new AngelHttpException.notAcceptable(),
+        isException(HttpStatus.NOT_ACCEPTABLE, '406 Not Acceptable'));
+    expect(new AngelHttpException.NotAcceptable(),
+        isException(HttpStatus.NOT_ACCEPTABLE, '406 Not Acceptable'));
+    expect(new AngelHttpException.methodTimeout(),
+        isException(HttpStatus.REQUEST_TIMEOUT, '408 Timeout'));
+    expect(new AngelHttpException.MethodTimeout(),
+        isException(HttpStatus.REQUEST_TIMEOUT, '408 Timeout'));
+    expect(new AngelHttpException.conflict(),
+        isException(HttpStatus.CONFLICT, '409 Conflict'));
+    expect(new AngelHttpException.Conflict(),
+        isException(HttpStatus.CONFLICT, '409 Conflict'));
+    expect(new AngelHttpException.notProcessable(),
+        isException(422, '422 Not Processable'));
+    expect(new AngelHttpException.NotProcessable(),
+        isException(422, '422 Not Processable'));
+    expect(new AngelHttpException.notImplemented(),
+        isException(HttpStatus.NOT_IMPLEMENTED, '501 Not Implemented'));
+    expect(new AngelHttpException.NotImplemented(),
+        isException(HttpStatus.NOT_IMPLEMENTED, '501 Not Implemented'));
+    expect(new AngelHttpException.unavailable(),
+        isException(HttpStatus.SERVICE_UNAVAILABLE, '503 Unavailable'));
+    expect(new AngelHttpException.Unavailable(),
+        isException(HttpStatus.SERVICE_UNAVAILABLE, '503 Unavailable'));
+  });
+
+  test('fromMap', () {
+    expect(new AngelHttpException.fromMap({'status_code': -1, 'message': 'ok'}),
+        isException(-1, 'ok'));
+  });
+
+  test('toMap = toJson', () {
+    var exc = new AngelHttpException.badRequest();
+    expect(exc.toMap(), exc.toJson());
+    var json = JSON.encode(exc.toJson());
+    var exc2 = new AngelHttpException.fromJson(json);
+    expect(exc2.toJson(), exc.toJson());
+  });
+
+  test('toString', () {
+    expect(
+        new AngelHttpException(null, statusCode: 420, message: 'Blaze It')
+            .toString(),
+        '420: Blaze It');
+  });
+}
+
+Matcher isException(int statusCode, String message) =>
+    new _IsException(statusCode, message);
+
+class _IsException extends Matcher {
+  final int statusCode;
+  final String message;
+
+  _IsException(this.statusCode, this.message);
+
+  @override
+  Description describe(Description description) =>
+      description.add('has status code $statusCode and message "$message"');
+
+  @override
+  bool matches(AngelHttpException item, Map matchState) {
+    return item.statusCode == statusCode && item.message == message;
+  }
+}
diff --git a/test/typed_service_test.dart b/test/typed_service_test.dart
new file mode 100644
index 00000000..f084de04
--- /dev/null
+++ b/test/typed_service_test.dart
@@ -0,0 +1,65 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/common.dart';
+import 'package:test/test.dart';
+
+main() {
+  var svc = new TypedService<Todo>(new MapService());
+
+  test('force model', () {
+    expect(() => new TypedService<String>(null), throwsException);
+  });
+
+  test('serialize', () {
+    expect(svc.serialize({'foo': 'bar'}), {'foo': 'bar'});
+    expect(
+        svc.serialize([
+          {'foo': 'bar'}
+        ]),
+        [
+          {'foo': 'bar'}
+        ]);
+    expect(() => svc.serialize(2), throwsArgumentError);
+    var now = new DateTime.now();
+    var t =
+        new Todo(text: 'a', completed: false, createdAt: now, updatedAt: now);
+    var m = svc.serialize(t);
+    print(m);
+    expect(m, {
+      'id': null,
+      'createdAt': now.toIso8601String(),
+      'updatedAt': now.toIso8601String(),
+      'text': 'a',
+      'completed': false
+    });
+  });
+
+  test('deserialize date', () {
+    var now = new DateTime.now();
+    var m = svc.deserialize({
+      'createdAt': now.toIso8601String(),
+      'updatedAt': now.toIso8601String()
+    });
+    expect(m, new isInstanceOf<Todo>());
+    var t = m as Todo;
+    expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
+  });
+
+  test('deserialize date w/ underscore', () {
+    var now = new DateTime.now();
+    var m = svc.deserialize({
+      'created_at': now.toIso8601String(),
+      'updated_at': now.toIso8601String()
+    });
+    expect(m, new isInstanceOf<Todo>());
+    var t = m as Todo;
+    expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
+  });
+}
+
+class Todo extends Model {
+  String text;
+  bool completed;
+  @override
+  DateTime createdAt, updatedAt;
+  Todo({this.text, this.completed, this.createdAt, this.updatedAt});
+}
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
new file mode 100644
index 00000000..680536dc
--- /dev/null
+++ b/test/view_generator_test.dart
@@ -0,0 +1,10 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:test/test.dart';
+
+main() {
+  test('default view generator', () async {
+    var app = new Angel();
+    var view = await app.viewGenerator('foo', {'bar': 'baz'});
+    expect(view, contains('No view engine'));
+  });
+}
\ No newline at end of file

From 58ec66f4543af801f3851b03a198eb062d2c3c0a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 30 Jun 2017 09:49:45 -0400
Subject: [PATCH 134/414] Still adding more tests, fixed exception-handling
 bug.

---
 .idea/workspace.xml              | 330 ++++++++++++++-----------------
 lib/src/http/hooked_service.dart |   3 +-
 lib/src/http/server.dart         | 115 +++++------
 test/all.dart                    |   2 +
 test/server_test.dart            | 242 +++++++++++++++++++++++
 5 files changed, 451 insertions(+), 241 deletions(-)
 create mode 100644 test/server_test.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e46408c2..dacafc1f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/anonymous_service_test.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/exception_test.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/server_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/typed_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,7 +19,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/framework$All_Tests__for_coverage_.coverage" NAME="All Tests (for coverage) Coverage Results" MODIFIED="1498774624592" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="DartCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" CONTEXT_FILE_PATH="$PROJECT_DIR$/test/all.dart" />
+    <SUITE FILE_PATH="coverage/framework$All_Tests__for_coverage_.coverage" NAME="All Tests (for coverage) Coverage Results" MODIFIED="1498830529713" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="DartCoverageRunner" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" CONTEXT_FILE_PATH="$PROJECT_DIR$/test/all.dart" />
   </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
@@ -36,15 +29,17 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.37098846">
+    <splitter split-orientation="horizontal" split-proportion="0.41406664">
       <split-first>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file leaf-file-name="controller.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+          <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1491">
-                  <caret line="78" column="3" lean-forward="true" selection-start-line="78" selection-start-column="3" selection-end-line="78" selection-end-column="3" />
-                  <folding />
+                <state relative-caret-position="-3416">
+                  <caret line="486" column="37" lean-forward="true" selection-start-line="486" selection-start-column="37" selection-end-line="486" selection-end-column="37" />
+                  <folding>
+                    <element signature="e#38#58#0" expanded="true" />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -53,11 +48,11 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/test/server_test.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="333">
-                  <caret line="92" column="33" lean-forward="false" selection-start-line="92" selection-start-column="33" selection-end-line="92" selection-end-column="33" />
+                <state relative-caret-position="246">
+                  <caret line="187" column="53" lean-forward="true" selection-start-line="187" selection-start-column="53" selection-end-line="187" selection-end-column="53" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -65,16 +60,6 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="routable.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-2212">
-                  <caret line="26" column="38" lean-forward="false" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -88,16 +73,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>BEFORE</find>
-      <find>_onError</find>
-      <find>_fatalErrorStream.add</find>
-      <find>throw</find>
-      <find>upa</find>
-      <find>transform</find>
-      <find>isAfter</find>
-      <find>isBefore</find>
-      <find>close</find>
-      <find>!_isOpen</find>
       <find>end</find>
       <find>reopen</find>
       <find>REDIRECT</find>
@@ -118,6 +93,16 @@
       <find>index</find>
       <find>typed</find>
       <find>x</find>
+      <find>_afterP</find>
+      <find>_beforeP</find>
+      <find>optim</find>
+      <find>??=</find>
+      <find>dump</find>
+      <find>void li</find>
+      <find>_onError</find>
+      <find>Unhandled exc</find>
+      <find>handleAn</find>
+      <find>Tom Fo</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -143,7 +128,6 @@
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
@@ -156,7 +140,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
@@ -165,9 +148,12 @@
         <option value="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
       </list>
     </option>
   </component>
@@ -393,6 +379,11 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <configuration default="false" name="tests in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
+      <option name="testName" value="server_test.dart" />
+      <method />
+    </configuration>
     <configuration default="false" name="tests in anonymous_service_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
       <option name="testName" value="anonymous_service_test.dart" />
@@ -419,18 +410,19 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="11">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+    <list size="12">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -464,7 +456,8 @@
       <workItem from="1497200155899" duration="120000" />
       <workItem from="1497825298573" duration="2603000" />
       <workItem from="1497985699191" duration="902000" />
-      <workItem from="1498770817945" duration="3831000" />
+      <workItem from="1498770817945" duration="3845000" />
+      <workItem from="1498826328044" duration="4240000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -585,43 +578,50 @@
       <option name="project" value="LOCAL" />
       <updated>1497985995955</updated>
     </task>
-    <option name="localTasksCounter" value="18" />
+    <task id="LOCAL-00018" summary="Added more tests.">
+      <created>1498774662381</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1498774662382</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="Controller_Tests - 2017.06.29 at 18h 07m 41s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 41m 06s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2017.06.29 at 18h 08m 58s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 41m 28s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2017.06.29 at 18h 10m 24s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 44m 00s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2017.06.29 at 18h 11m 22s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 45m 33s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2017.06.29 at 18h 15m 29s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 46m 44s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 01m 34s.xml">
-      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 46m 53s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 01m 46s.xml">
-      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 47m 15s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 02m 10s.xml">
-      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 47m 30s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 04m 19s.xml">
-      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 47m 46s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_typed_service_test_dart - 2017.06.29 at 18h 05m 00s.xml">
-      <configuration name="tests in typed_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 48m 07s.xml">
+      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17287000" />
+    <option name="totallyTimeSpent" value="21541000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -638,25 +638,25 @@
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28425822" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1760973" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1760973" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -683,27 +683,14 @@
     <MESSAGE value="+1" />
     <MESSAGE value="1.0.4" />
     <MESSAGE value="Patch" />
-    <option name="LAST_COMMIT_MESSAGE" value="Patch" />
+    <MESSAGE value="Added more tests." />
+    <option name="LAST_COMMIT_MESSAGE" value="Added more tests." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="90" column="29" lean-forward="true" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -736,7 +723,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -857,14 +843,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
           <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1722">
-          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
         </state>
       </provider>
     </entry>
@@ -872,9 +850,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
           <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
-          <folding>
-            <element signature="e#30#54#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -896,9 +871,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
           <caret line="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
-          <folding>
-            <element signature="e#81#109#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -909,33 +881,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7077">
-          <caret line="345" column="2" lean-forward="false" selection-start-line="345" selection-start-column="2" selection-end-line="345" selection-end-column="2" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-            <marker date="1497837059798" expanded="true" signature="10472:10474" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7329">
-          <caret line="364" column="7" lean-forward="true" selection-start-line="364" selection-start-column="7" selection-end-line="364" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="84">
             <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-            <folding>
-              <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
-            </folding>
           </first_editor>
           <second_editor />
         </state>
@@ -945,9 +895,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
           <caret line="6" column="38" lean-forward="true" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -963,9 +910,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="60" column="31" lean-forward="true" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -981,10 +925,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-171">
           <caret line="9" column="2" lean-forward="false" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="2" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-            <marker date="1498772578410" expanded="true" signature="211:537" ph="{...}" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -992,7 +932,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1001,7 +940,7 @@
         <state relative-caret-position="249">
           <caret line="28" column="9" lean-forward="true" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
           <folding>
-            <element signature="e#0#54#0" expanded="true" />
+            <element signature="e#0#54#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1010,7 +949,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1018,7 +956,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="307">
           <caret line="67" column="18" lean-forward="false" selection-start-line="67" selection-start-column="18" selection-end-line="67" selection-end-column="18" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1026,17 +963,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
           <caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="27" column="45" lean-forward="false" selection-start-line="27" selection-start-column="45" selection-end-line="27" selection-end-column="45" />
-          <folding>
-            <element signature="e#0#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1044,9 +970,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
           <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1054,7 +977,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="84">
           <caret line="15" column="29" lean-forward="false" selection-start-line="15" selection-start-column="29" selection-end-line="20" selection-end-column="32" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1062,35 +984,89 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
           <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1785">
+          <caret line="92" column="33" lean-forward="false" selection-start-line="92" selection-start-column="33" selection-end-line="92" selection-end-column="33" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1491">
-          <caret line="78" column="3" lean-forward="true" selection-start-line="78" selection-start-column="3" selection-end-line="78" selection-end-column="3" />
+        <state relative-caret-position="231">
+          <caret line="88" column="30" lean-forward="true" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="333">
-          <caret line="92" column="33" lean-forward="false" selection-start-line="92" selection-start-column="33" selection-end-line="92" selection-end-column="33" />
+        <state relative-caret-position="462">
+          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="83" column="24" lean-forward="false" selection-start-line="83" selection-start-column="24" selection-end-line="83" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="458">
+          <caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="295" column="25" lean-forward="false" selection-start-line="295" selection-start-column="25" selection-end-line="295" selection-end-column="25" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+            <marker date="1497837059798" expanded="true" signature="10472:10474" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/serialize.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="245">
+          <caret line="40" column="27" lean-forward="false" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="246">
+          <caret line="187" column="53" lean-forward="true" selection-start-line="187" selection-start-column="53" selection-end-line="187" selection-end-column="53" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2212">
-          <caret line="26" column="38" lean-forward="false" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-          <folding />
+        <state relative-caret-position="-3416">
+          <caret line="486" column="37" lean-forward="true" selection-start-line="486" selection-start-column="37" selection-end-line="486" selection-end-column="37" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index c4722f3a..2e2cc77c 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -81,8 +81,7 @@ class HookedService extends Service {
     afterModified._close();
     afterUpdated._close();
     afterRemoved._close();
-
-    if (inner is HookedService) inner.close();
+    await inner.close();
   }
 
   /// Adds hooks to this instance.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 914bbad3..45f29706 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -136,11 +136,6 @@ class Angel extends AngelBase {
   /// The native HttpServer running this instancce.
   HttpServer httpServer;
 
-  /// Handles a server error.
-  _onError(e, [StackTrace st]) {
-    _fatalErrorStream.add(new AngelFatalError(error: e, stack: st));
-  }
-
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
@@ -254,37 +249,32 @@ class Angel extends AngelBase {
 
   Future getHandlerResult(
       handler, RequestContext req, ResponseContext res) async {
-    if (handler is RequestMiddleware) {
+    /*if (handler is RequestMiddleware) {
       var result = await handler(req, res);
 
       if (result is RequestHandler)
         return await getHandlerResult(result, req, res);
       else
         return result;
-    }
+    }*/
 
     if (handler is RequestHandler) {
       var result = await handler(req, res);
-      if (result is RequestHandler)
-        return await getHandlerResult(result, req, res);
-      else
-        return result;
+      return await getHandlerResult(result, req, res);
     }
 
     if (handler is Future) {
       var result = await handler;
-      if (result is RequestHandler)
-        return await getHandlerResult(result, req, res);
-      else
-        return result;
+      return await getHandlerResult(result, req, res);
     }
 
     if (handler is Function) {
       var result = await runContained(handler, req, res);
-      if (result is RequestHandler)
-        return await getHandlerResult(result, req, res);
-      else
-        return result;
+      return await getHandlerResult(result, req, res);
+    }
+
+    if (handler is Stream) {
+      return await getHandlerResult(await handler.toList(), req, res);
     }
 
     var middleware = (req.app ?? this).findMiddleware(handler);
@@ -300,17 +290,13 @@ class Angel extends AngelBase {
       handler, RequestContext req, ResponseContext res) async {
     var result = await getHandlerResult(handler, req, res);
 
-    if (result is Future) {
-      return await executeHandler(await result, req, res);
-    } else if (result is bool) {
+    if (result is bool) {
       return result;
     } else if (result != null) {
       res.serialize(result,
           contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
               ContentType.JSON.mimeType);
       return false;
-    } else if (result is Stream) {
-      return await executeHandler(await result.toList(), req, res);
     } else
       return res.isOpen;
   }
@@ -338,39 +324,36 @@ class Angel extends AngelBase {
     return parent != null ? parent.findProperty(key) : null;
   }
 
-  _handleAngelHttpException(AngelHttpException e, StackTrace st,
-      RequestContext req, ResponseContext res, HttpRequest request) async {
-    try {
-      if (req == null || res == null) {
-        _fatalErrorStream.add(new AngelFatalError(
-            request: request,
-            error: e?.error ??
-                e ??
-                new Exception('Unhandled exception while handling request.'),
-            stack: st));
-        return;
-      }
-
-      res.statusCode = e.statusCode;
-      List<String> accept = request?.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
-      if (accept.isEmpty ||
-          accept.contains('*/*') ||
-          accept.contains(ContentType.JSON.mimeType) ||
-          accept.contains("application/javascript")) {
-        res.serialize(e.toMap(),
-            contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-                ContentType.JSON.mimeType);
-      } else {
-        await errorHandler(e, req, res);
-      }
-    } catch (_) {
+  handleAngelHttpException(AngelHttpException e, StackTrace st,
+      RequestContext req, ResponseContext res, HttpRequest request,
+      {bool ignoreFinalizers: false}) async {
+    if (req == null || res == null) {
       _fatalErrorStream.add(new AngelFatalError(
           request: request,
           error: e?.error ??
               e ??
-              new Exception('Unhandled exception while handling request.'),
+              new Exception(
+                  'handleAngelHttpException was called on a null request or response context.'),
           stack: st));
+      return;
     }
+
+    res.statusCode = e.statusCode;
+    List<String> accept = request?.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
+    if (accept.isEmpty ||
+        accept.contains('*/*') ||
+        accept.contains(ContentType.JSON.mimeType) ||
+        accept.contains("application/javascript")) {
+      res.serialize(e.toMap(),
+          contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
+              ContentType.JSON.mimeType);
+    } else {
+      await errorHandler(e, req, res);
+    }
+
+    res.end();
+    await sendResponse(request, req, res,
+        ignoreFinalizers: ignoreFinalizers == true);
   }
 
   /// Handles a single request.
@@ -415,17 +398,15 @@ class Angel extends AngelBase {
             //    'Handler completed successfully, did not terminate response: $handler');
           }
         } on AngelHttpException catch (e, st) {
-          return await _handleAngelHttpException(e, st, req, res, request);
+          return await handleAngelHttpException(e, st, req, res, request);
         }
       }
 
       try {
         await sendResponse(request, req, res);
       } on AngelHttpException catch (e, st) {
-        return await _handleAngelHttpException(e, st, req, res, request);
-      } catch (e, st) {
-        _fatalErrorStream
-            .add(new AngelFatalError(request: request, error: e, stack: st));
+        return await handleAngelHttpException(e, st, req, res, request,
+            ignoreFinalizers: true);
       }
     } catch (e, st) {
       _fatalErrorStream
@@ -442,6 +423,7 @@ class Angel extends AngelBase {
   /// You may [force] the optimization to run, if you are not running in production.
   void optimizeForProduction({bool force: false}) {
     if (isProduction == true || force == true) {
+      _isProduction = true;
       _add(v) {
         if (v is Function && !_preContained.containsKey(v)) {
           _preContained[v] = preInject(v);
@@ -497,12 +479,15 @@ class Angel extends AngelBase {
 
   /// Sends a response.
   Future sendResponse(
-      HttpRequest request, RequestContext req, ResponseContext res) async {
+      HttpRequest request, RequestContext req, ResponseContext res,
+      {bool ignoreFinalizers: false}) async {
     _afterProcessed.add(request);
 
     if (!res.willCloseItself) {
-      for (var finalizer in responseFinalizers) {
-        await finalizer(req, res);
+      if (ignoreFinalizers != true) {
+        for (var finalizer in responseFinalizers) {
+          await finalizer(req, res);
+        }
       }
 
       if (res.isOpen) res.end();
@@ -532,10 +517,16 @@ class Angel extends AngelBase {
   }
 
   /// Starts the server, wrapped in a [runZoned] call.
-  void listen({InternetAddress address, int port: 3000}) {
+  Future<HttpServer> listen({InternetAddress address, int port: 3000}) {
+    var c = new Completer<HttpServer>();
     runZoned(() async {
-      await startServer(address, port);
-    }, onError: _onError);
+      await startServer(address, port)
+          .then(c.complete)
+          .catchError(c.completeError);
+    }, onError: (e, st) {
+      _fatalErrorStream.add(new AngelFatalError(error: e, stack: st));
+    });
+    return c.future;
   }
 
   /// Mounts the child on this router.
diff --git a/test/all.dart b/test/all.dart
index a4910443..d2f04e15 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -7,6 +7,7 @@ import 'hooked_test.dart' as hooked;
 import 'precontained_test.dart' as precontained;
 import 'routing_test.dart' as routing;
 import 'serialize_test.dart' as serialize;
+import 'server_test.dart' as server;
 import 'services_test.dart' as services;
 import 'typed_service_test.dart' as typed_service;
 import 'util_test.dart' as util;
@@ -24,6 +25,7 @@ main() {
   group('precontained', precontained.main);
   group('routing', routing.main);
   group('serialize', serialize.main);
+  group('server', server.main);
   group('services', services.main);
   group('typed_service', typed_service.main);
   group('util', util.main);
diff --git a/test/server_test.dart b/test/server_test.dart
new file mode 100644
index 00000000..dcef3d52
--- /dev/null
+++ b/test/server_test.dart
@@ -0,0 +1,242 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:matcher/matcher.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+final Uri $foo = Uri.parse('http://localhost:3000/foo');
+
+/// Additional tests to improve coverage of server.dart
+main() {
+  group('streams fired', () {
+    test('before+after processed are fired', () async {
+      var app = new Angel();
+      var before = app.beforeProcessed.first;
+      var after = app.afterProcessed.first;
+      var rq = new MockHttpRequest('GET', $foo);
+      rq.close();
+      await app.handleRequest(rq);
+      app.close();
+      expect(await before, rq);
+      expect(await after, rq);
+    });
+
+    test('oncontroller fired', () async {
+      var app = new Angel();
+      var ctrl = new FooController();
+      var f = app.onController.first;
+      await app.configure(ctrl);
+      expect(await f, ctrl);
+    });
+  });
+
+  group('scoping', () {
+    var parent = new Angel()..properties['two'] = 2;
+    var child = new Angel();
+    parent.use('/child', child);
+
+    test('sets children', () {
+      expect(parent.children, contains(child));
+    });
+
+    test('sets parent', () {
+      expect(child.parent, parent);
+    });
+
+    test('properties can climb up hierarchy', () {
+      expect(child.findProperty('two'), 2);
+    });
+  });
+
+  test('custom server generator', () {
+    var app = new Angel.custom(HttpServer.bind);
+    expect(app.serverGenerator, HttpServer.bind);
+  });
+
+  test('default error handler', () async {
+    var app = new Angel();
+    var rq = new MockHttpRequest('GET', $foo);
+    rq.close();
+    var rs = rq.response;
+    var req = await app.createRequestContext(rq);
+    var res = await app.createResponseContext(rs);
+    var e = new AngelHttpException(null,
+        statusCode: 321, message: 'Hello', errors: ['foo', 'bar']);
+    await app.errorHandler(e, req, res);
+    await app.sendResponse(rq, req, res);
+    expect(rs.headers.value(HttpHeaders.CONTENT_TYPE),
+        ContentType.HTML.toString());
+    expect(rs.statusCode, e.statusCode);
+    var body = await rs.transform(UTF8.decoder).join();
+    expect(body, contains('<title>${e.message}</title>'));
+    expect(body, contains('<li>foo</li>'));
+    expect(body, contains('<li>bar</li>'));
+  });
+
+  test('plug-ins run on startup', () async {
+    var app = new Angel();
+    app.justBeforeStart.add((app) async {
+      app.properties['two'] = 2;
+    });
+    await app.startServer();
+    expect(app.properties['two'], 2);
+    await app.close();
+  });
+
+  test('warning when adding routes to flattened router', () {
+    var app = new Angel()..optimizeForProduction(force: true);
+    app.dumpTree();
+    app.get('/', () => 2);
+    app.mount('/foo', new Router()..get('/', 3));
+  });
+
+  test('services close on close call', () async {
+    var app = new Angel();
+    var svc = new CustomCloseService();
+    expect(svc.value, 2);
+    app.use('/', svc);
+    await app.close();
+    expect(svc.value, 3);
+  });
+
+  test('global injection added to injection map', () {
+    var app = new Angel()..inject('a', 'b');
+    expect(app.injections['a'], 'b');
+  });
+
+  test('global injected serializer', () async {
+    var app = new Angel()..injectSerializer((_) => 'x');
+    app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
+    var rq = new MockHttpRequest('GET', $foo)..close();
+    await app.handleRequest(rq);
+    var body = await rq.response.transform(UTF8.decoder).join();
+    expect(body, 'x');
+  });
+
+  group('handler results', () {
+    var app = new Angel();
+    RequestContext req;
+    ResponseContext res;
+
+    setUp(() async {
+      var rq = new MockHttpRequest('GET', $foo)..close();
+      req = await app.createRequestContext(rq);
+      res = await app.createResponseContext(rq.response);
+    });
+
+    group('getHandlerResult', () {
+      test('return request handler', () async {
+        var handler = (req, res) => (req, res) async {
+              return 2;
+            };
+        var r = await app.getHandlerResult(handler, req, res);
+        expect(r, 2);
+      });
+
+      test('return future', () async {
+        var handler = new Future.value(2);
+        expect(await app.getHandlerResult(handler, req, res), 2);
+      });
+    });
+
+    group('executeHandler', () {
+      test('return Stream', () async {
+        var handler = (req, res) => new Stream.fromIterable([2, 3]);
+        expect(await app.executeHandler(handler, req, res), isFalse);
+      });
+
+      test('end response', () async {
+        var handler = (req, res) => res.end();
+        expect(await app.executeHandler(handler, req, res), isFalse);
+      });
+    });
+  });
+
+  group('handleAngelHttpException', () {
+    Angel app;
+
+    setUp(() async {
+      app = new Angel();
+      await app.listen(address: InternetAddress.LOOPBACK_IP_V4, port: 0);
+      app.fatalErrorStream.listen((e) {
+        print('FATAL: ${e.error}');
+        print(e.stack);
+      });
+    });
+
+    tearDown(() => app.close());
+
+    test('null req/res', () async {
+      app.handleAngelHttpException(null, null, null, null, null);
+      var empty = app.fatalErrorStream.isEmpty;
+      await app.close();
+      expect(await empty, isFalse);
+    });
+
+    test('null req/res, valid error', () async {
+      app.handleAngelHttpException(
+          new AngelHttpException(new StateError('')), null, null, null, null);
+      var empty = app.fatalErrorStream.isEmpty;
+      await app.close();
+      expect(await empty, isFalse);
+    });
+
+    test('null req/res, http error', () async {
+      app.handleAngelHttpException(
+          new AngelHttpException.forbidden(), null, null, null, null);
+      var empty = app.fatalErrorStream.isEmpty;
+      await app.close();
+      expect(await empty, isFalse);
+    });
+
+    test('can send json', () async {
+      app.get('/wtf', () => throw new AngelHttpException.forbidden());
+      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'));
+      rq.close();
+      await app.handleRequest(rq);
+      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(
+          rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
+    });
+
+    test('can throw in finalizer', () async {
+      app.responseFinalizers
+          .add((req, res) => throw new AngelHttpException.forbidden());
+      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'));
+      rq.close();
+      await app.handleRequest(rq);
+      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(
+          rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
+    });
+
+    test('can send html', () async {
+      app.get('/wtf2', () => throw new AngelHttpException.forbidden());
+      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
+      rq.headers.set(HttpHeaders.ACCEPT, ContentType.HTML.toString());
+      rq.close();
+      await app.handleRequest(rq);
+      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(
+          rq.response.headers.contentType.mimeType, ContentType.HTML.mimeType);
+    });
+  });
+}
+
+class CustomCloseService extends Service {
+  int value = 2;
+
+  @override
+  Future close() {
+    value = 3;
+    return super.close();
+  }
+}
+
+@Expose('/foo')
+class FooController extends Controller {
+  @Expose('/bar')
+  bar() async => 'baz';
+}

From 4f85174fbe4beb3d3087058f062ca6359cb3f139 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 30 Jun 2017 09:55:56 -0400
Subject: [PATCH 135/414] Updated Travis script

---
 .idea/workspace.xml | 165 ++++++++++++++++++--------------------------
 tool/travis.sh      |   4 +-
 2 files changed, 71 insertions(+), 98 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dacafc1f..12ac212b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/server_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tool/travis.sh" afterPath="$PROJECT_DIR$/tool/travis.sh" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -35,7 +32,7 @@
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-3416">
+                <state relative-caret-position="-2987">
                   <caret line="486" column="37" lean-forward="true" selection-start-line="486" selection-start-column="37" selection-end-line="486" selection-end-column="37" />
                   <folding>
                     <element signature="e#38#58#0" expanded="true" />
@@ -48,11 +45,11 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="true">
+          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/test/server_test.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="246">
-                  <caret line="187" column="53" lean-forward="true" selection-start-line="187" selection-start-column="53" selection-end-line="187" selection-end-column="53" />
+                <state relative-caret-position="181">
+                  <caret line="216" column="36" lean-forward="true" selection-start-line="216" selection-start-column="36" selection-end-line="216" selection-end-column="36" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -60,6 +57,26 @@
               </provider>
             </entry>
           </file>
+          <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/.travis.yml">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="0">
+                  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="travis.sh" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="63">
+                  <caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -154,6 +171,7 @@
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/tool/travis.sh" />
       </list>
     </option>
   </component>
@@ -209,61 +227,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="http" />
+              <option name="myItemId" value="tool" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -457,7 +421,7 @@
       <workItem from="1497825298573" duration="2603000" />
       <workItem from="1497985699191" duration="902000" />
       <workItem from="1498770817945" duration="3845000" />
-      <workItem from="1498826328044" duration="4240000" />
+      <workItem from="1498826328044" duration="4619000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -585,7 +549,14 @@
       <option name="project" value="LOCAL" />
       <updated>1498774662382</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="Still adding more tests, fixed exception-handling bug.">
+      <created>1498830585557</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1498830585557</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -621,7 +592,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="21541000" />
+    <option name="totallyTimeSpent" value="21920000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -634,7 +605,6 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -642,10 +612,10 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1760973" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1760973" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -684,27 +654,14 @@
     <MESSAGE value="1.0.4" />
     <MESSAGE value="Patch" />
     <MESSAGE value="Added more tests." />
-    <option name="LAST_COMMIT_MESSAGE" value="Added more tests." />
+    <MESSAGE value="Still adding more tests, fixed exception-handling bug." />
+    <option name="LAST_COMMIT_MESSAGE" value="Still adding more tests, fixed exception-handling bug." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -1050,19 +1007,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="187" column="53" lean-forward="true" selection-start-line="187" selection-start-column="53" selection-end-line="187" selection-end-column="53" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3416">
+        <state relative-caret-position="-2987">
           <caret line="486" column="37" lean-forward="true" selection-start-line="486" selection-start-column="37" selection-end-line="486" selection-end-column="37" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
@@ -1070,5 +1017,31 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="181">
+          <caret line="216" column="36" lean-forward="true" selection-start-line="216" selection-start-column="36" selection-end-line="216" selection-end-column="36" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/tool/travis.sh b/tool/travis.sh
index bac6b671..97b10766 100644
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
-pub run test
-ANGEL_ENV=production pub run test
\ No newline at end of file
+dart test/all.dart
+ANGEL_ENV=production dart test/all.dart
\ No newline at end of file

From 06c015d34755d2cf63b01f715bf2ced812859116 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Fri, 30 Jun 2017 17:23:31 -0400
Subject: [PATCH 136/414] 1.0.6

---
 .../All_Tests__PRODUCTION_.xml                |   9 +
 ...tests_in_server_test_dart__PRODUCTION_.xml |   9 +
 .idea/workspace.xml                           | 214 +++++++++++-------
 pubspec.yaml                                  |   2 +-
 test/server_test.dart                         |   8 +-
 5 files changed, 158 insertions(+), 84 deletions(-)
 create mode 100644 .idea/runConfigurations/All_Tests__PRODUCTION_.xml
 create mode 100644 .idea/runConfigurations/tests_in_server_test_dart__PRODUCTION_.xml

diff --git a/.idea/runConfigurations/All_Tests__PRODUCTION_.xml b/.idea/runConfigurations/All_Tests__PRODUCTION_.xml
new file mode 100644
index 00000000..09ab904c
--- /dev/null
+++ b/.idea/runConfigurations/All_Tests__PRODUCTION_.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Tests (PRODUCTION)" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true">
+    <option name="envs">
+      <entry key="ANGEL_ENV" value="production" />
+    </option>
+    <option name="filePath" value="$PROJECT_DIR$/test/all.dart" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/tests_in_server_test_dart__PRODUCTION_.xml b/.idea/runConfigurations/tests_in_server_test_dart__PRODUCTION_.xml
new file mode 100644
index 00000000..06ec9c23
--- /dev/null
+++ b/.idea/runConfigurations/tests_in_server_test_dart__PRODUCTION_.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tests in server_test.dart (PRODUCTION)" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="envs">
+      <entry key="ANGEL_ENV" value="production" />
+    </option>
+    <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 12ac212b..fbe5efa5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/tests_in_server_test_dart__PRODUCTION_.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tool/travis.sh" afterPath="$PROJECT_DIR$/tool/travis.sh" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,17 +29,15 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.41406664">
+    <splitter split-orientation="horizontal" split-proportion="0.30733642">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-2987">
-                  <caret line="486" column="37" lean-forward="true" selection-start-line="486" selection-start-column="37" selection-end-line="486" selection-end-column="37" />
-                  <folding>
-                    <element signature="e#38#58#0" expanded="true" />
-                  </folding>
+                <state relative-caret-position="273">
+                  <caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
+                  <folding />
                 </state>
               </provider>
             </entry>
@@ -45,11 +46,11 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/test/server_test.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="181">
-                  <caret line="216" column="36" lean-forward="true" selection-start-line="216" selection-start-column="36" selection-end-line="216" selection-end-column="36" />
+                <state relative-caret-position="225">
+                  <caret line="118" column="26" lean-forward="true" selection-start-line="118" selection-start-column="26" selection-end-line="118" selection-end-column="26" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -57,21 +58,11 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/.travis.yml">
+          <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/pubspec.yaml">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="0">
-                  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="travis.sh" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="63">
-                  <caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
+                <state relative-caret-position="168">
+                  <caret line="8" column="25" lean-forward="true" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
                   <folding />
                 </state>
               </provider>
@@ -157,7 +148,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
@@ -170,8 +160,9 @@
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
       </list>
     </option>
   </component>
@@ -231,6 +222,60 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="http" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="Scratches" />
@@ -262,7 +307,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.All Tests (for coverage)">
+  <component name="RunManager" selected="Dart Command Line App.All Tests (PRODUCTION)">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -374,7 +419,7 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="12">
+    <list size="14">
       <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
       <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
       <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
@@ -387,6 +432,8 @@
       <item index="9" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
       <item index="10" class="java.lang.String" itemvalue="Dart Test.All Tests" />
       <item index="11" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -421,7 +468,7 @@
       <workItem from="1497825298573" duration="2603000" />
       <workItem from="1497985699191" duration="902000" />
       <workItem from="1498770817945" duration="3845000" />
-      <workItem from="1498826328044" duration="4619000" />
+      <workItem from="1498826328044" duration="5449000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -556,19 +603,17 @@
       <option name="project" value="LOCAL" />
       <updated>1498830585557</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="Updated Travis script">
+      <created>1498830956916</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1498830956916</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 41m 06s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 41m 28s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 44m 00s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 45m 33s.xml">
       <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -590,9 +635,18 @@
     <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 48m 07s.xml">
       <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="tests_in_server_test_dart_(PRODUCTION) - 2017.06.30 at 17h 21m 22s.xml">
+      <configuration name="tests in server_test.dart (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_server_test_dart_(PRODUCTION) - 2017.06.30 at 17h 22m 07s.xml">
+      <configuration name="tests in server_test.dart (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_server_test_dart_(PRODUCTION) - 2017.06.30 at 17h 22m 28s.xml">
+      <configuration name="tests in server_test.dart (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="21920000" />
+    <option name="totallyTimeSpent" value="22750000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -605,23 +659,24 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1760973" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19989423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -655,7 +710,8 @@
     <MESSAGE value="Patch" />
     <MESSAGE value="Added more tests." />
     <MESSAGE value="Still adding more tests, fixed exception-handling bug." />
-    <option name="LAST_COMMIT_MESSAGE" value="Still adding more tests, fixed exception-handling bug." />
+    <MESSAGE value="Updated Travis script" />
+    <option name="LAST_COMMIT_MESSAGE" value="Updated Travis script" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -680,6 +736,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -902,13 +959,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="307">
@@ -954,14 +1004,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="88" column="30" lean-forward="true" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="462">
@@ -1007,23 +1049,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2987">
-          <caret line="486" column="37" lean-forward="true" selection-start-line="486" selection-start-column="37" selection-end-line="486" selection-end-column="37" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="216" column="36" lean-forward="true" selection-start-line="216" selection-start-column="36" selection-end-line="216" selection-end-column="36" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="63">
+          <caret line="3" column="39" lean-forward="true" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1035,13 +1065,39 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
+        <state relative-caret-position="231">
+          <caret line="88" column="30" lean-forward="true" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" column="25" lean-forward="true" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="118" column="26" lean-forward="true" selection-start-line="118" selection-start-column="26" selection-end-line="118" selection-end-column="26" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 737a0339..d1a319cd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.5+1
+version: 1.0.6
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/server_test.dart b/test/server_test.dart
index dcef3d52..411c9d96 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -117,6 +117,8 @@ main() {
 
   group('handler results', () {
     var app = new Angel();
+    app.responseFinalizers
+        .add((req, res) => throw new AngelHttpException.forbidden());
     RequestContext req;
     ResponseContext res;
 
@@ -159,6 +161,8 @@ main() {
 
     setUp(() async {
       app = new Angel();
+      app.get('/wtf', () => throw new AngelHttpException.forbidden());
+      app.get('/wtf2', () => throw new AngelHttpException.forbidden());
       await app.listen(address: InternetAddress.LOOPBACK_IP_V4, port: 0);
       app.fatalErrorStream.listen((e) {
         print('FATAL: ${e.error}');
@@ -192,7 +196,6 @@ main() {
     });
 
     test('can send json', () async {
-      app.get('/wtf', () => throw new AngelHttpException.forbidden());
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'));
       rq.close();
       await app.handleRequest(rq);
@@ -202,8 +205,6 @@ main() {
     });
 
     test('can throw in finalizer', () async {
-      app.responseFinalizers
-          .add((req, res) => throw new AngelHttpException.forbidden());
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'));
       rq.close();
       await app.handleRequest(rq);
@@ -213,7 +214,6 @@ main() {
     });
 
     test('can send html', () async {
-      app.get('/wtf2', () => throw new AngelHttpException.forbidden());
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
       rq.headers.set(HttpHeaders.ACCEPT, ContentType.HTML.toString());
       rq.close();

From 6d66efb67cf8e667d6e936fed8afa3c92915cf2a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sat, 1 Jul 2017 21:56:23 -0400
Subject: [PATCH 137/414] Add stackTrace

---
 .idea/workspace.xml      | 136 ++++++++++++++-------------------------
 lib/src/http/server.dart |   2 +
 pubspec.yaml             |   2 +-
 3 files changed, 51 insertions(+), 89 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fbe5efa5..9a09eed0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/tests_in_server_test_dart__PRODUCTION_.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -29,48 +27,18 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.30733642">
-      <split-first>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-          <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="273">
-                  <caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf>
-          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="225">
-                  <caret line="118" column="26" lean-forward="true" selection-start-line="118" selection-start-column="26" selection-end-line="118" selection-end-column="26" />
-                  <folding>
-                    <element signature="e#0#20#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="168">
-                  <caret line="8" column="25" lean-forward="true" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="21">
+              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -81,7 +49,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>end</find>
       <find>reopen</find>
       <find>REDIRECT</find>
       <find>close(</find>
@@ -111,6 +78,7 @@
       <find>Unhandled exc</find>
       <find>handleAn</find>
       <find>Tom Fo</find>
+      <find>handleRequest(</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -159,10 +127,10 @@
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -468,7 +436,8 @@
       <workItem from="1497825298573" duration="2603000" />
       <workItem from="1497985699191" duration="902000" />
       <workItem from="1498770817945" duration="3845000" />
-      <workItem from="1498826328044" duration="5449000" />
+      <workItem from="1498826328044" duration="5519000" />
+      <workItem from="1498960523007" duration="52000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -610,7 +579,14 @@
       <option name="project" value="LOCAL" />
       <updated>1498830956916</updated>
     </task>
-    <option name="localTasksCounter" value="21" />
+    <task id="LOCAL-00021" summary="1.0.6">
+      <created>1498857811360</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1498857811360</updated>
+    </task>
+    <option name="localTasksCounter" value="22" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -646,7 +622,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="22750000" />
+    <option name="totallyTimeSpent" value="22872000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -661,25 +637,25 @@
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19989423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19989423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -711,7 +687,8 @@
     <MESSAGE value="Added more tests." />
     <MESSAGE value="Still adding more tests, fixed exception-handling bug." />
     <MESSAGE value="Updated Travis script" />
-    <option name="LAST_COMMIT_MESSAGE" value="Updated Travis script" />
+    <MESSAGE value="1.0.6" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.6" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -916,7 +893,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="284">
           <caret line="36" column="19" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -953,9 +929,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="249">
           <caret line="28" column="9" lean-forward="true" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#54#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -998,9 +971,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1785">
           <caret line="92" column="33" lean-forward="false" selection-start-line="92" selection-start-column="33" selection-end-line="92" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#20#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1008,9 +978,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="462">
           <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1018,7 +985,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
           <caret line="83" column="24" lean-forward="false" selection-start-line="83" selection-start-column="24" selection-end-line="83" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1034,10 +1000,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
           <caret line="295" column="25" lean-forward="false" selection-start-line="295" selection-start-column="25" selection-end-line="295" selection-end-column="25" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-            <marker date="1497837059798" expanded="true" signature="10472:10474" ph="{...}" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1045,7 +1007,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
           <caret line="40" column="27" lean-forward="false" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1053,7 +1014,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
           <caret line="3" column="39" lean-forward="true" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1061,7 +1021,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1069,23 +1028,16 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="88" column="30" lean-forward="true" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="31" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="13" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="8" column="25" lean-forward="true" selection-start-line="8" selection-start-column="25" selection-end-line="8" selection-end-column="25" />
-          <folding />
+        <state relative-caret-position="164">
+          <caret line="394" column="18" lean-forward="true" selection-start-line="394" selection-start-column="18" selection-end-line="394" selection-end-column="18" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1099,5 +1051,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 45f29706..6322b3e2 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -398,6 +398,7 @@ class Angel extends AngelBase {
             //    'Handler completed successfully, did not terminate response: $handler');
           }
         } on AngelHttpException catch (e, st) {
+          e.stackTrace ??= st;
           return await handleAngelHttpException(e, st, req, res, request);
         }
       }
@@ -405,6 +406,7 @@ class Angel extends AngelBase {
       try {
         await sendResponse(request, req, res);
       } on AngelHttpException catch (e, st) {
+        e.stackTrace ??= st;
         return await handleAngelHttpException(e, st, req, res, request,
             ignoreFinalizers: true);
       }
diff --git a/pubspec.yaml b/pubspec.yaml
index d1a319cd..ceae67ed 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.6
+version: 1.0.6+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 9d24d37b56ffffc8ca97ef5c8134e54cca083585 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 9 Jul 2017 12:50:46 -0400
Subject: [PATCH 138/414] 1.0.6+2

---
 .../All_Tests__PRODUCTION_2.xml               |  11 +
 .idea/workspace.xml                           | 249 ++++++++++++------
 lib/hooks.dart                                |   5 +-
 lib/src/http/request_context.dart             |  29 +-
 lib/src/http/service.dart                     |   3 +-
 pubspec.yaml                                  |   2 +-
 test/hooked_test.dart                         |  18 ++
 7 files changed, 221 insertions(+), 96 deletions(-)
 create mode 100644 .idea/runConfigurations/All_Tests__PRODUCTION_2.xml

diff --git a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml b/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
new file mode 100644
index 00000000..732a10e5
--- /dev/null
+++ b/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Tests (PRODUCTION)" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="envs">
+      <entry key="ANGEL_ENV" value="production" />
+    </option>
+    <option name="filePath" value="$PROJECT_DIR$/test" />
+    <option name="scope" value="FOLDER" />
+    <option name="testRunnerOptions" value="-j 5" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9a09eed0..8b7d24a9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -38,6 +42,56 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="693">
+              <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="475">
+              <caret line="208" column="42" lean-forward="false" selection-start-line="208" selection-start-column="42" selection-end-line="208" selection-end-column="42" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="588">
+              <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1543">
+              <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="403">
+              <caret line="135" column="30" lean-forward="true" selection-start-line="135" selection-start-column="30" selection-end-line="135" selection-end-column="30" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -49,8 +103,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>reopen</find>
-      <find>REDIRECT</find>
       <find>close(</find>
       <find>status</find>
       <find>createdAt</find>
@@ -79,6 +131,8 @@
       <find>handleAn</find>
       <find>Tom Fo</find>
       <find>handleRequest(</find>
+      <find>transform(</find>
+      <find>grab(</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -101,14 +155,11 @@
       <list>
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/test/common.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
@@ -130,6 +181,10 @@
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
@@ -164,6 +219,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -190,6 +246,20 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="framework" />
@@ -246,7 +316,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -275,7 +344,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.All Tests (PRODUCTION)">
+  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -356,6 +425,12 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <configuration default="false" name="contains provider in before and after in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="contains provider in before and after" />
+      <method />
+    </configuration>
     <configuration default="false" name="tests in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
       <option name="testName" value="server_test.dart" />
@@ -387,21 +462,23 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="14">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+    <list size="16">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -437,7 +514,9 @@
       <workItem from="1497985699191" duration="902000" />
       <workItem from="1498770817945" duration="3845000" />
       <workItem from="1498826328044" duration="5519000" />
-      <workItem from="1498960523007" duration="52000" />
+      <workItem from="1498960523007" duration="89000" />
+      <workItem from="1499604258765" duration="188000" />
+      <workItem from="1499618669602" duration="372000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -586,24 +665,31 @@
       <option name="project" value="LOCAL" />
       <updated>1498857811360</updated>
     </task>
-    <option name="localTasksCounter" value="22" />
+    <task id="LOCAL-00022" summary="Add stackTrace">
+      <created>1498960583872</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1498960583872</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 45m 33s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.07.09 at 12h 50m 14s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 46m 44s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.07.09 at 12h 50m 36s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 46m 53s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="contains_provider_in_before_and_after_in_hooked_test_dart - 2017.07.09 at 12h 48m 44s.xml">
+      <configuration name="contains provider in before and after in hooked_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 47m 15s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="contains_provider_in_before_and_after_in_hooked_test_dart - 2017.07.09 at 12h 49m 18s.xml">
+      <configuration name="contains provider in before and after in hooked_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 47m 30s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="contains_provider_in_before_and_after_in_hooked_test_dart - 2017.07.09 at 12h 49m 28s.xml">
+      <configuration name="contains provider in before and after in hooked_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 47m 46s.xml">
       <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
@@ -622,7 +708,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="22872000" />
+    <option name="totallyTimeSpent" value="23469000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -639,21 +725,21 @@
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19989423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -688,7 +774,8 @@
     <MESSAGE value="Still adding more tests, fixed exception-handling bug." />
     <MESSAGE value="Updated Travis script" />
     <MESSAGE value="1.0.6" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.6" />
+    <MESSAGE value="Add stackTrace" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add stackTrace" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -795,13 +882,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5544">
-          <caret line="267" column="95" lean-forward="false" selection-start-line="267" selection-start-column="95" selection-end-line="267" selection-end-column="95" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -809,13 +889,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
@@ -830,13 +903,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="23" column="9" lean-forward="false" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -907,7 +973,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
           <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -932,13 +997,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="67" column="18" lean-forward="false" selection-start-line="67" selection-start-column="18" selection-end-line="67" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
@@ -981,18 +1039,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="83" column="24" lean-forward="false" selection-start-line="83" selection-start-column="24" selection-end-line="83" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="458">
           <caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1036,7 +1086,7 @@
         <state relative-caret-position="164">
           <caret line="394" column="18" lean-forward="true" selection-start-line="394" selection-start-column="18" selection-end-line="394" selection-end-column="18" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#38#58#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1045,9 +1095,46 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="118" column="26" lean-forward="true" selection-start-line="118" selection-start-column="26" selection-end-line="118" selection-end-column="26" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="693">
+          <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="208" column="42" lean-forward="false" selection-start-line="208" selection-start-column="42" selection-end-line="208" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="588">
+          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1543">
+          <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="403">
+          <caret line="135" column="30" lean-forward="true" selection-start-line="135" selection-start-column="30" selection-end-line="135" selection-end-column="30" />
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 2f4a9ed6..19eca064 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -33,7 +33,9 @@ AngelConfigurer hookAllServices(callback(Service service)) {
 }
 
 /// Transforms `e.data` or `e.result` into JSON-friendly data, i.e. a Map. Runs on Iterables as well.
-HookedServiceEventListener toJson() => transform(god.serializeObject);
+///
+/// The [condition] is optional, and is passed to [transform].
+HookedServiceEventListener toJson([condition]) => transform(god.serializeObject, condition);
 
 /// Mutates `e.data` or `e.result` using the given [transformer].
 ///
@@ -47,6 +49,7 @@ HookedServiceEventListener toJson() => transform(god.serializeObject);
 /// A provided function must take a [HookedServiceEvent] as its only parameter.
 HookedServiceEventListener transform(transformer(obj), [condition]) {
   Iterable cond = condition is Iterable ? condition : [condition];
+  if (condition == null) cond = [];
 
   _condition(HookedServiceEvent e, condition) async {
     if (condition is Function)
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index e8f291ba..34f31106 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -52,7 +52,7 @@ class RequestContext extends Extensible {
   ///
   /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
   /// then an error will be thrown.
-  /// 
+  ///
   /// **If you are writing a plug-in, use [lazyBody] instead.**
   Map get body {
     if (_body == null)
@@ -68,7 +68,7 @@ class RequestContext extends Extensible {
   ///
   /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
   /// then an error will be thrown.
-  /// 
+  ///
   /// **If you are writing a plug-in, use [lazyFiles] instead.**
   List<FileUploadInfo> get files {
     if (_body == null)
@@ -81,7 +81,7 @@ class RequestContext extends Extensible {
   ///
   /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
   /// then an error will be thrown.
-  /// 
+  ///
   /// **If you are writing a plug-in, use [lazyOriginalBuffer] instead.**
   List<int> get originalBuffer {
     if (_body == null)
@@ -100,8 +100,8 @@ class RequestContext extends Extensible {
   ///
   /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
   /// then [uri].query will be returned.
-  /// 
-  /// **If you are writing a plug-in, consider using [lazyQuery] instead.** 
+  ///
+  /// **If you are writing a plug-in, consider using [lazyQuery] instead.**
   Map get query {
     if (_body == null)
       return uri.queryParameters;
@@ -167,14 +167,19 @@ class RequestContext extends Extensible {
       return injections[key];
     else if (properties.containsKey(key))
       return properties[key];
-    else if (key is Type) {
-      try {
-        return app.container.make(key);
-      } catch (e) {
+    else {
+      var prop = app?.findProperty(key);
+      if (prop != null)
+        return prop;
+      else if (key is Type) {
+        try {
+          return app.container.make(key);
+        } catch (e) {
+          return null;
+        }
+      } else
         return null;
-      }
-    } else
-      return null;
+    }
   }
 
   /// Shorthand to add to [injections].
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 97565064..9a27d3f4 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -41,7 +41,8 @@ class Service extends Routable {
   static const List<String> SPECIAL_QUERY_KEYS = const [
     r'$limit',
     r'$sort',
-    'page'
+    'page',
+    'token'
   ];
 
   /// The [Angel] app powering this service.
diff --git a/pubspec.yaml b/pubspec.yaml
index ceae67ed..852bea8d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.6+1
+version: 1.0.6+2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 2371498e..d574b2ac 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -117,4 +117,22 @@ main() {
     expect(result, isNotEmpty);
     expect(result[0], equals({'foo': 'bar'}));
   });
+
+  test('contains provider in before and after', () async {
+    var svc = new HookedService(new AnonymousService(index: ([p]) async => []));
+
+    ensureProviderIsPresent(HookedServiceEvent e) {
+      var type = e.isBefore ? 'before' : 'after';
+      print('Params to $type ${e.eventName}: ${e.params}');
+      expect(e.params, isMap);
+      expect(e.params.keys, contains('provider'));
+      expect(e.params['provider'], const isInstanceOf<Providers>());
+    }
+
+    svc
+      ..beforeAll(ensureProviderIsPresent)
+      ..afterAll(ensureProviderIsPresent);
+
+    await svc.index({'provider': const Providers('testing')});
+  });
 }

From 62dc3172398b67b64a732f91f05c5a888353a6f7 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 10 Jul 2017 19:08:05 -0400
Subject: [PATCH 139/414] Added RequestContext.accepts

---
 .idea/runConfigurations/All_Tests.xml |   2 +-
 .idea/workspace.xml                   | 366 ++++++++++++++++----------
 CHANGELOG.md                          |   3 +
 lib/src/http/request_context.dart     |  32 +++
 lib/src/http/server.dart              |  10 +-
 pubspec.yaml                          |   2 +-
 test/accepts_test.dart                |  58 ++++
 test/all.dart                         |   2 +
 8 files changed, 325 insertions(+), 150 deletions(-)
 create mode 100644 CHANGELOG.md
 create mode 100644 test/accepts_test.dart

diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml
index c753608c..dcd3564d 100644
--- a/.idea/runConfigurations/All_Tests.xml
+++ b/.idea/runConfigurations/All_Tests.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="All Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
     <option name="filePath" value="$PROJECT_DIR$/test" />
     <option name="scope" value="FOLDER" />
-    <option name="testRunnerOptions" value="-j 5" />
+    <option name="testRunnerOptions" value="-j 4" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8b7d24a9..7fda60b9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Added RequestContext.accepts">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/accepts_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,20 +33,48 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="21">
-              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="84">
+                <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+                <folding>
+                  <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
+                </folding>
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="42">
+                <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="693">
+            <state relative-caret-position="508">
               <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
               <folding />
             </state>
@@ -55,8 +84,40 @@
       <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="475">
-              <caret line="208" column="42" lean-forward="false" selection-start-line="208" selection-start-column="42" selection-end-line="208" selection-end-column="42" />
+            <state relative-caret-position="147">
+              <caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="21" column="20" lean-forward="true" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="536">
+              <caret line="326" column="38" lean-forward="false" selection-start-line="326" selection-start-column="38" selection-end-line="326" selection-end-column="38" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="183">
+              <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
               <folding />
             </state>
           </provider>
@@ -65,27 +126,17 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="588">
+            <state relative-caret-position="508">
               <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1543">
-              <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="403">
+            <state relative-caret-position="2730">
               <caret line="135" column="30" lean-forward="true" selection-start-line="135" selection-start-column="30" selection-end-line="135" selection-end-column="30" />
               <folding />
             </state>
@@ -176,16 +227,18 @@
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -219,7 +272,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -316,6 +368,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -344,7 +397,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -425,6 +478,11 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <configuration default="false" name="tests in accepts_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/accepts_test.dart" />
+      <option name="testName" value="accepts_test.dart" />
+      <method />
+    </configuration>
     <configuration default="false" name="contains provider in before and after in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -462,23 +520,24 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="16">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+    <list size="17">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
       <item index="12" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
       <item index="13" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
       <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
       <item index="15" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.All Tests" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -516,7 +575,8 @@
       <workItem from="1498826328044" duration="5519000" />
       <workItem from="1498960523007" duration="89000" />
       <workItem from="1499604258765" duration="188000" />
-      <workItem from="1499618669602" duration="372000" />
+      <workItem from="1499618669602" duration="520000" />
+      <workItem from="1499726708949" duration="1371000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -672,27 +732,34 @@
       <option name="project" value="LOCAL" />
       <updated>1498960583872</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="1.0.6+2">
+      <created>1499619046675</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1499619046675</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.07.09 at 12h 50m 14s.xml">
+    <history-entry file="All_Tests - 2017.07.10 at 19h 03m 21s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.07.09 at 12h 50m 36s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.07.10 at 19h 05m 29s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="contains_provider_in_before_and_after_in_hooked_test_dart - 2017.07.09 at 12h 48m 44s.xml">
-      <configuration name="contains provider in before and after in hooked_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.07.10 at 19h 06m 26s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="contains_provider_in_before_and_after_in_hooked_test_dart - 2017.07.09 at 12h 49m 18s.xml">
-      <configuration name="contains provider in before and after in hooked_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 18h 56m 24s.xml">
+      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="contains_provider_in_before_and_after_in_hooked_test_dart - 2017.07.09 at 12h 49m 28s.xml">
-      <configuration name="contains provider in before and after in hooked_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 19h 00m 00s.xml">
+      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 47m 46s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 19h 01m 20s.xml">
+      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 48m 07s.xml">
       <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
@@ -708,7 +775,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="23469000" />
+    <option name="totallyTimeSpent" value="24988000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -721,13 +788,14 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
-    <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19989423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -736,14 +804,12 @@
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -775,35 +841,15 @@
     <MESSAGE value="Updated Travis script" />
     <MESSAGE value="1.0.6" />
     <MESSAGE value="Add stackTrace" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add stackTrace" />
+    <MESSAGE value="1.0.6+2" />
+    <MESSAGE value="Added RequestContext.accepts" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added RequestContext.accepts" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="14" column="23" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="34" lean-forward="true" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="799">
@@ -938,16 +984,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="84">
-            <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
@@ -1032,13 +1068,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="22" column="33" lean-forward="true" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="458">
@@ -1081,50 +1110,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="394" column="18" lean-forward="true" selection-start-line="394" selection-start-column="18" selection-end-line="394" selection-end-column="18" />
-          <folding>
-            <element signature="e#38#58#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="118" column="26" lean-forward="true" selection-start-line="118" selection-start-column="26" selection-end-line="118" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="208" column="42" lean-forward="false" selection-start-line="208" selection-start-column="42" selection-end-line="208" selection-end-column="42" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="588">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1543">
+        <state relative-caret-position="1071">
           <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" />
           <folding />
         </state>
@@ -1132,19 +1120,111 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
+        <state relative-caret-position="2730">
           <caret line="135" column="30" lean-forward="true" selection-start-line="135" selection-start-column="30" selection-end-line="135" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.21/lib/src/frontend/expect_async.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="536">
+          <caret line="266" column="22" lean-forward="false" selection-start-line="266" selection-start-column="22" selection-end-line="266" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="508">
+          <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="508">
+          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="21" column="20" lean-forward="true" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="536">
+          <caret line="326" column="38" lean-forward="false" selection-start-line="326" selection-start-column="38" selection-end-line="326" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
-          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="84">
+            <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+            <folding>
+              <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="42">
+            <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..f55f08bc
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,3 @@
+# 1.0.7
+Added an `accepts` method to `RequestContext`. It's now a lot easier to tell which content types the
+user accepts via the `Accept` header.
\ No newline at end of file
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 34f31106..73dcbd5e 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -8,6 +8,8 @@ import 'server.dart' show Angel;
 
 /// A convenience wrapper around an incoming HTTP request.
 class RequestContext extends Extensible {
+  String _acceptHeaderCache;
+  bool _acceptsAllCache;
   BodyParseResult _body;
   ContentType _contentType;
   HttpRequest _io;
@@ -187,6 +189,36 @@ class RequestContext extends Extensible {
     injections[type] = value;
   }
 
+  /// Returns `true` if the client's `Accept` header indicates that the given [contentType] is considered a valid response.
+  ///
+  /// You cannot provide a `null` [contentType].
+  /// If the `Accept` header's value is `*/*`, this method will always return `true`.
+  ///
+  /// [contentType] can be either of the following:
+  /// * A [ContentType], in which case the `Accept` header will be compared against its `mimeType` property.
+  /// * Any other Dart value, in which case the `Accept` header will be compared against the result of a `toString()` call.
+  bool accepts(contentType) {
+    var contentTypeString = contentType is ContentType
+        ? contentType.mimeType
+        : contentType?.toString();
+
+    if (contentTypeString == null)
+      throw new ArgumentError(
+          'RequestContext.accepts expects the `contentType` parameter to NOT be null.');
+
+    _acceptHeaderCache ??= headers.value(HttpHeaders.ACCEPT);
+
+    if (_acceptHeaderCache == null)
+      return false;
+    else if (_acceptHeaderCache.contains('*/*'))
+      return true;
+    else
+      return _acceptHeaderCache.contains(contentTypeString);
+  }
+
+  /// Returns as `true` if the client's `Accept` header indicates that it will accept any response content type.
+  bool get acceptsAll => _acceptsAllCache ??= accepts('*/*');
+
   /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the body.
   Future<Map> lazyBody() => parse().then((b) => b.body);
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 6322b3e2..357e3eaa 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -324,6 +324,7 @@ class Angel extends AngelBase {
     return parent != null ? parent.findProperty(key) : null;
   }
 
+  /// Handles an [AngelHttpException].
   handleAngelHttpException(AngelHttpException e, StackTrace st,
       RequestContext req, ResponseContext res, HttpRequest request,
       {bool ignoreFinalizers: false}) async {
@@ -339,11 +340,10 @@ class Angel extends AngelBase {
     }
 
     res.statusCode = e.statusCode;
-    List<String> accept = request?.headers[HttpHeaders.ACCEPT] ?? ['*/*'];
-    if (accept.isEmpty ||
-        accept.contains('*/*') ||
-        accept.contains(ContentType.JSON.mimeType) ||
-        accept.contains("application/javascript")) {
+    if (req.headers.value(HttpHeaders.ACCEPT) == null ||
+        req.acceptsAll ||
+        req.accepts(ContentType.JSON) ||
+        req.accepts('application/javascript')) {
       res.serialize(e.toMap(),
           contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
               ContentType.JSON.mimeType);
diff --git a/pubspec.yaml b/pubspec.yaml
index 852bea8d..eb465f9f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.6+2
+version: 1.0.7
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
new file mode 100644
index 00000000..adaf7c5b
--- /dev/null
+++ b/test/accepts_test.dart
@@ -0,0 +1,58 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+final Uri ENDPOINT = Uri.parse('http://example.com/accept');
+
+main() {
+  test('no content type', () async {
+    var req = await acceptContentTypes();
+    expect(req.acceptsAll, isFalse);
+    expect(req.accepts(ContentType.JSON), isFalse);
+    expect(req.accepts('application/json'), isFalse);
+    expect(req.accepts(ContentType.HTML), isFalse);
+    expect(req.accepts('text/html'), isFalse);
+  });
+
+  test('wildcard', () async {
+    var req = await acceptContentTypes(['*/*']);
+    expect(req.acceptsAll, isTrue);
+    expect(req.accepts(ContentType.JSON), isTrue);
+    expect(req.accepts('application/json'), isTrue);
+    expect(req.accepts(ContentType.HTML), isTrue);
+    expect(req.accepts('text/html'), isTrue);
+  });
+
+  test('specific type', () async  {
+    var req = await acceptContentTypes(['text/html']);
+    expect(req.acceptsAll, isFalse);
+    expect(req.accepts(ContentType.JSON), isFalse);
+    expect(req.accepts('application/json'), isFalse);
+    expect(req.accepts(ContentType.HTML), isTrue);
+    expect(req.accepts('text/html'), isTrue);
+  });
+
+  group('disallow null', () {
+    RequestContext req;
+
+    setUp(() async {
+      req = await acceptContentTypes();
+    });
+
+    test('throws error', () {
+      expect(() => req.accepts(null), throwsArgumentError);
+    });
+  });
+}
+
+Future<RequestContext> acceptContentTypes(
+    [Iterable<String> contentTypes = const []]) {
+  var headerString = contentTypes.isEmpty ? null : contentTypes.join(',');
+  var rq = new MockHttpRequest('GET', ENDPOINT);
+  rq.headers.set(HttpHeaders.ACCEPT, headerString);
+  rq.close();
+  var app = new Angel();
+  return app.createRequestContext(rq);
+}
diff --git a/test/all.dart b/test/all.dart
index d2f04e15..7cdfd9e4 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -1,3 +1,4 @@
+import 'accepts_test.dart' as accepts;
 import 'anonymous_service_test.dart' as anonymous_service;
 import 'controller_test.dart' as controller;
 import 'di_test.dart' as di;
@@ -16,6 +17,7 @@ import 'package:test/test.dart';
 
 /// For running with coverage
 main() {
+  group('accepts', accepts.main);
   group('anonymous service', anonymous_service.main);
   group('controller', controller.main);
   group('di', di.main);

From 15fc38d22a14e0c5d651da325786bd363fa50f8a Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 11 Jul 2017 16:48:19 -0400
Subject: [PATCH 140/414] Swapped to angel_model

---
 .idea/libraries/Dart_Packages.xml             |   8 +
 .../All_Tests__PRODUCTION_2.xml               |   2 +-
 .idea/workspace.xml                           | 166 +++++++++---------
 CHANGELOG.md                                  |   3 +
 lib/common.dart                               |   9 +-
 pubspec.yaml                                  |   3 +-
 6 files changed, 94 insertions(+), 97 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 14dea75e..06615469 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -9,6 +9,13 @@
             </list>
           </value>
         </entry>
+        <entry key="angel_model">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="angel_route">
           <value>
             <list>
@@ -391,6 +398,7 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.30.0+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
diff --git a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml b/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
index 732a10e5..27a10c9c 100644
--- a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
+++ b/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
@@ -5,7 +5,7 @@
     </option>
     <option name="filePath" value="$PROJECT_DIR$/test" />
     <option name="scope" value="FOLDER" />
-    <option name="testRunnerOptions" value="-j 5" />
+    <option name="testRunnerOptions" value="-j 4" />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7fda60b9..62ab06e1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Added RequestContext.accepts">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/accepts_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/common.dart" afterPath="$PROJECT_DIR$/lib/common.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -37,7 +35,17 @@
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="21">
-              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/common.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="46" lean-forward="false" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
               <folding />
             </state>
           </provider>
@@ -48,7 +56,7 @@
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="84">
-                <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+                <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
                 <folding>
                   <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
                 </folding>
@@ -62,8 +70,8 @@
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="42">
-                <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
+              <first_editor relative-caret-position="21">
+                <caret line="1" column="90" lean-forward="false" selection-start-line="1" selection-start-column="90" selection-end-line="1" selection-end-column="90" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -74,7 +82,7 @@
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="508">
+            <state relative-caret-position="693">
               <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
               <folding />
             </state>
@@ -85,28 +93,16 @@
         <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="147">
-              <caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+              <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="21" column="20" lean-forward="true" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="536">
+            <state relative-caret-position="6531">
               <caret line="326" column="38" lean-forward="false" selection-start-line="326" selection-start-column="38" selection-end-line="326" selection-end-column="38" />
               <folding />
             </state>
@@ -116,7 +112,7 @@
       <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="183">
+            <state relative-caret-position="4011">
               <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
               <folding />
             </state>
@@ -126,18 +122,8 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="508">
-              <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2730">
-              <caret line="135" column="30" lean-forward="true" selection-start-line="135" selection-start-column="30" selection-end-line="135" selection-end-column="30" />
+            <state relative-caret-position="714">
+              <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
               <folding />
             </state>
           </provider>
@@ -237,6 +223,7 @@
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/common.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
@@ -536,8 +523,8 @@
       <item index="12" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
       <item index="13" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
       <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -576,7 +563,8 @@
       <workItem from="1498960523007" duration="89000" />
       <workItem from="1499604258765" duration="188000" />
       <workItem from="1499618669602" duration="520000" />
-      <workItem from="1499726708949" duration="1371000" />
+      <workItem from="1499726708949" duration="2021000" />
+      <workItem from="1499805699713" duration="390000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -739,19 +727,29 @@
       <option name="project" value="LOCAL" />
       <updated>1499619046675</updated>
     </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="Added RequestContext.accepts">
+      <created>1499728085186</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1499728085186</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.07.10 at 19h 03m 21s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2017.07.10 at 19h 05m 29s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2017.07.10 at 19h 06m 26s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2017.07.11 at 16h 47m 13s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.07.10 at 19h 08m 21s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.07.11 at 16h 47m 06s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 18h 56m 24s.xml">
       <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -761,9 +759,6 @@
     <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 19h 01m 20s.xml">
       <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart - 2017.06.30 at 09h 48m 07s.xml">
-      <configuration name="tests in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="tests_in_server_test_dart_(PRODUCTION) - 2017.06.30 at 17h 21m 22s.xml">
       <configuration name="tests in server_test.dart (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -775,7 +770,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="24988000" />
+    <option name="totallyTimeSpent" value="26028000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -788,17 +783,17 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19989423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -810,6 +805,7 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -914,13 +910,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
@@ -1114,7 +1103,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1071">
           <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1130,7 +1118,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="536">
           <caret line="266" column="22" lean-forward="false" selection-start-line="266" selection-start-column="22" selection-end-line="266" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1138,15 +1125,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
           <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#38#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="508">
+        <state relative-caret-position="693">
           <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
           <folding />
         </state>
@@ -1154,16 +1138,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="508">
-          <caret line="42" column="13" lean-forward="true" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+        <state relative-caret-position="714">
+          <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="21" column="20" lean-forward="true" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
+        <state relative-caret-position="441">
+          <caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1173,14 +1157,14 @@
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
-          <caret line="11" column="11" lean-forward="true" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
+          <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
+        <state relative-caret-position="4011">
           <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
           <folding />
         </state>
@@ -1188,25 +1172,17 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="536">
+        <state relative-caret-position="6531">
           <caret line="326" column="38" lean-forward="false" selection-start-line="326" selection-start-column="38" selection-end-line="326" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="84">
-            <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+            <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
             <folding>
               <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
             </folding>
@@ -1215,11 +1191,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="46" lean-forward="false" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="42">
-            <caret line="2" column="37" lean-forward="false" selection-start-line="2" selection-start-column="37" selection-end-line="2" selection-end-column="37" />
+          <first_editor relative-caret-position="21">
+            <caret line="1" column="90" lean-forward="false" selection-start-line="1" selection-start-column="90" selection-end-line="1" selection-end-column="90" />
             <folding />
           </first_editor>
           <second_editor />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f55f08bc..b4ee3959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.7+1
+Moved the `Model` class into `package:angel_model`. No functionality was added or removed.
+
 # 1.0.7
 Added an `accepts` method to `RequestContext`. It's now a lot easier to tell which content types the
 user accepts via the `Accept` header.
\ No newline at end of file
diff --git a/lib/common.dart b/lib/common.dart
index c07e0596..33b1bc80 100644
--- a/lib/common.dart
+++ b/lib/common.dart
@@ -1,8 +1 @@
-/// Represents arbitrary data, with an associated ID and timestamps.
-class Model {
-  String id;
-  DateTime createdAt;
-  DateTime updatedAt;
-
-  Model({this.id, this.createdAt, this.updatedAt});
-}
\ No newline at end of file
+export 'package:angel_model/angel_model.dart';
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index eb465f9f..7f3e4c7e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,12 @@
 name: angel_framework
-version: 1.0.7
+version: 1.0.7+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
   sdk: ">=1.19.0"
 dependencies:
+  angel_model: ^1.0.0
   angel_route: ^1.0.0-dev
   body_parser: ^1.0.0-dev
   container: ^0.1.2

From 3d12297316496ed32f8ba7dabda4deedde6e5bc5 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Sun, 23 Jul 2017 11:41:12 -0400
Subject: [PATCH 141/414] 1.0.7+2

---
 .idea/workspace.xml                | 113 ++++++++++++++++-------------
 CHANGELOG.md                       |   3 +
 lib/src/http/response_context.dart |   5 +-
 pubspec.yaml                       |   2 +-
 4 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62ab06e1..0aa163ff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/common.dart" afterPath="$PROJECT_DIR$/lib/common.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -66,12 +64,12 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="21">
-                <caret line="1" column="90" lean-forward="false" selection-start-line="1" selection-start-column="90" selection-end-line="1" selection-end-column="90" />
+                <caret line="1" column="89" lean-forward="false" selection-start-line="1" selection-start-column="89" selection-end-line="1" selection-end-column="89" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -79,11 +77,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="693">
-              <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
+            <state relative-caret-position="131">
+              <caret line="162" column="27" lean-forward="true" selection-start-line="162" selection-start-column="27" selection-end-line="162" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
               <folding />
             </state>
           </provider>
@@ -140,7 +148,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>close(</find>
       <find>status</find>
       <find>createdAt</find>
       <find>preInj</find>
@@ -170,6 +177,7 @@
       <find>handleRequest(</find>
       <find>transform(</find>
       <find>grab(</find>
+      <find>json(</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -202,7 +210,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
@@ -226,6 +233,7 @@
         <option value="$PROJECT_DIR$/lib/common.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       </list>
     </option>
   </component>
@@ -259,6 +267,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -355,8 +365,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -564,7 +572,9 @@
       <workItem from="1499604258765" duration="188000" />
       <workItem from="1499618669602" duration="520000" />
       <workItem from="1499726708949" duration="2021000" />
-      <workItem from="1499805699713" duration="390000" />
+      <workItem from="1499805699713" duration="409000" />
+      <workItem from="1499967777286" duration="36000" />
+      <workItem from="1500824399224" duration="67000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -734,14 +744,21 @@
       <option name="project" value="LOCAL" />
       <updated>1499728085186</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="Swapped to angel_model">
+      <created>1499806099923</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1499806099923</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.07.10 at 19h 06m 26s.xml">
+    <history-entry file="All_Tests - 2017.07.11 at 16h 47m 13s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.07.11 at 16h 47m 13s.xml">
+    <history-entry file="All_Tests - 2017.07.23 at 11h 41m 04s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="All_Tests_(PRODUCTION) - 2017.07.10 at 19h 08m 21s.xml">
@@ -770,7 +787,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26028000" />
+    <option name="totallyTimeSpent" value="26150000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -790,10 +807,10 @@
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -805,7 +822,7 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -839,7 +856,8 @@
     <MESSAGE value="Add stackTrace" />
     <MESSAGE value="1.0.6+2" />
     <MESSAGE value="Added RequestContext.accepts" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added RequestContext.accepts" />
+    <MESSAGE value="Swapped to angel_model" />
+    <option name="LAST_COMMIT_MESSAGE" value="Swapped to angel_model" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -924,13 +942,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="17" lean-forward="true" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -1057,20 +1068,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="458">
-          <caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="295" column="25" lean-forward="false" selection-start-line="295" selection-start-column="25" selection-end-line="295" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/serialize.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
@@ -1110,7 +1107,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2730">
           <caret line="135" column="30" lean-forward="true" selection-start-line="135" selection-start-column="30" selection-end-line="135" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1132,7 +1128,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="693">
           <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1148,9 +1143,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="441">
           <caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1199,6 +1191,21 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="77" column="4" lean-forward="false" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -1211,12 +1218,20 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="21">
-            <caret line="1" column="90" lean-forward="false" selection-start-line="1" selection-start-column="90" selection-end-line="1" selection-end-column="90" />
+            <caret line="1" column="89" lean-forward="false" selection-start-line="1" selection-start-column="89" selection-end-line="1" selection-end-column="89" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="162" column="27" lean-forward="true" selection-start-line="162" selection-start-column="27" selection-end-line="162" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4ee3959..d6719ced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.7+2
+Changed `ResponseContext.serialize`. The `contentType` is now set *before* serialization.
+
 # 1.0.7+1
 Moved the `Model` class into `package:angel_model`. No functionality was added or removed.
 
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index de4e318c..9ce80e0b 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -293,13 +293,14 @@ class ResponseContext extends Extensible implements StringSink {
   /// [contentType] can be either a [String], or a [ContentType].
   void serialize(value, {contentType}) {
     if (_isClosed) throw _closed();
-    var text = serializer(value);
-    write(text);
 
     if (contentType is String)
       headers[HttpHeaders.CONTENT_TYPE] = contentType;
     else if (contentType is ContentType) this.contentType = contentType;
 
+    var text = serializer(value);
+    write(text);
+
     end();
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 7f3e4c7e..267e1702 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.7+1
+version: 1.0.7+2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From f6695080b815eb3b84f9d5175207b4140bbde524 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 3 Aug 2017 12:40:21 -0400
Subject: [PATCH 142/414] Working on 1.0.8, including performance tuning

---
 .idea/libraries/Dart_Packages.xml             |   4 +-
 .../runConfigurations/performance__hello.xml  |   8 +
 .idea/workspace.xml                           | 830 +++++++++---------
 CHANGELOG.md                                  |  17 +
 analysis_options.yaml                         |   2 +
 lib/hooks.dart                                |   6 -
 lib/src/extensible.dart                       |   3 -
 lib/src/fast_name_from_symbol.dart            |   6 +
 lib/src/http/angel_base.dart                  |  24 +-
 lib/src/http/controller.dart                  |  16 +-
 lib/src/http/hooked_service.dart              | 142 +--
 lib/src/http/request_context.dart             |  62 +-
 lib/src/http/response_context.dart            |  36 +-
 lib/src/http/routable.dart                    |  20 +-
 lib/src/http/server.dart                      | 141 +--
 lib/src/http/service.dart                     |  96 +-
 lib/src/safe_stream_controller.dart           | 123 +++
 performance/hello/main.dart                   |  27 +
 pubspec.yaml                                  |   5 +-
 test/exception_test.dart                      |  27 +-
 test/routing_test.dart                        |   4 +-
 test/services_test.dart                       |  15 +-
 22 files changed, 995 insertions(+), 619 deletions(-)
 create mode 100644 .idea/runConfigurations/performance__hello.xml
 create mode 100644 analysis_options.yaml
 delete mode 100644 lib/src/extensible.dart
 create mode 100644 lib/src/fast_name_from_symbol.dart
 create mode 100644 lib/src/safe_stream_controller.dart
 create mode 100644 performance/hello/main.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 06615469..264fd455 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -19,7 +19,7 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
             </list>
           </value>
         </entry>
@@ -399,7 +399,7 @@
     <CLASSES>
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.30.0+2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
diff --git a/.idea/runConfigurations/performance__hello.xml b/.idea/runConfigurations/performance__hello.xml
new file mode 100644
index 00000000..910062a6
--- /dev/null
+++ b/.idea/runConfigurations/performance__hello.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="performance::hello" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true">
+    <option name="checkedMode" value="false" />
+    <option name="filePath" value="$PROJECT_DIR$/performance/hello/main.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0aa163ff..b7eb8194 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,28 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/analysis_options.yaml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/extensible.dart" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/exception_test.dart" afterPath="$PROJECT_DIR$/test/exception_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -29,70 +47,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/common.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="46" lean-forward="false" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="84">
-                <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-                <folding>
-                  <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
-                </folding>
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="21">
-                <caret line="1" column="89" lean-forward="false" selection-start-line="1" selection-start-column="89" selection-end-line="1" selection-end-column="89" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="162" column="27" lean-forward="true" selection-start-line="162" selection-start-column="27" selection-end-line="162" selection-end-column="27" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
-              <folding />
+            <state relative-caret-position="147">
+              <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
+              <folding>
+                <element signature="e#75#92#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -100,38 +62,20 @@
       <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
-              <folding />
+            <state relative-caret-position="-5090">
+              <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+              <folding>
+                <element signature="e#47#67#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6531">
-              <caret line="326" column="38" lean-forward="false" selection-start-line="326" selection-start-column="38" selection-end-line="326" selection-end-column="38" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4011">
-              <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="714">
-              <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
+            <state relative-caret-position="-5379">
+              <caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
               <folding />
             </state>
           </provider>
@@ -148,36 +92,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>status</find>
-      <find>createdAt</find>
-      <find>preInj</find>
-      <find>p</find>
-      <find>printDebug</find>
-      <find>d</find>
-      <find>debug</find>
-      <find>_printDebug</find>
-      <find>use(</find>
-      <find>_injec</find>
-      <find>writeln</find>
-      <find>write(</find>
-      <find>_</find>
-      <find>index</find>
-      <find>typed</find>
-      <find>x</find>
-      <find>_afterP</find>
-      <find>_beforeP</find>
-      <find>optim</find>
-      <find>??=</find>
       <find>dump</find>
       <find>void li</find>
       <find>_onError</find>
       <find>Unhandled exc</find>
       <find>handleAn</find>
       <find>Tom Fo</find>
-      <find>handleRequest(</find>
       <find>transform(</find>
       <find>grab(</find>
       <find>json(</find>
+      <find>cons</find>
+      <find>const</find>
+      <find>call</find>
+      <find>use(</find>
+      <find>value</find>
+      <find>whenI</find>
+      <find>before</find>
+      <find>afterProcessed</find>
+      <find>onco</find>
+      <find>StreamC</find>
+      <find>onCo</find>
+      <find>fatalErrorStream</find>
+      <find>handleReq</find>
+      <find>handleRequest(</find>
+      <find>_Lockabl</find>
+      <find>takeBy</find>
+      <find>from</find>
+      <find>createR</find>
+      <find>sendRes</find>
+      <find>replaceAll</find>
+      <find>noSuch</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -187,9 +131,14 @@
       <replace>update</replace>
       <replace>remove</replace>
       <replace>data</replace>
+      <replace>event</replace>
+      <replace>after</replace>
+      <replace>fatalErrorStream</replace>
+      <replace>onController</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
+      <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -203,37 +152,43 @@
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/test/util_test.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
-        <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
+        <option value="$PROJECT_DIR$/lib/common.dart" />
+        <option value="$PROJECT_DIR$/analysis_options.yaml" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/exception_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/lib/common.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/util_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+        <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
       </list>
     </option>
   </component>
@@ -267,8 +222,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -291,21 +244,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="tool" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
+              <option name="myItemId" value="performance" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
+              <option name="myItemId" value="hello" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -363,15 +306,31 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="example" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="options.lastSelected" value="preferences.externalResources" />
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../Electron" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../route" />
     <property name="nodejs_interpreter_path" value="C:/Program Files (x86)/nodejs/node" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="dart.analysis.tool.window.force.activate" value="false" />
@@ -379,6 +338,7 @@
     <property name="js.eslint.eslintPackage" value="" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
     <property name="settings.editor.selected.configurable" value="dart.settings" />
+    <property name="restartRequiresConfirmation" value="false" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -392,7 +352,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.performance::hello">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -435,6 +395,12 @@
     <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
       <method />
     </configuration>
+    <configuration default="true" type="LLVMCommandLineRunConfigurationType" factoryName="LLVM Application" show_console_on_std_err="false" show_console_on_std_out="false">
+      <option name="VMOptions" />
+      <option name="arguments" />
+      <option name="filePath" />
+      <method />
+    </configuration>
     <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
       <method />
     </configuration>
@@ -473,6 +439,25 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <configuration default="false" name="can create data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="can create data" />
+      <method />
+    </configuration>
+    <configuration default="false" name="can delete data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="can delete data" />
+      <method />
+    </configuration>
+    <configuration default="false" name="can use app.properties like members in util_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/util_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="can use app.properties like members" />
+      <option name="testRunnerOptions" value="-j 4" />
+      <method />
+    </configuration>
     <configuration default="false" name="tests in accepts_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/accepts_test.dart" />
       <option name="testName" value="accepts_test.dart" />
@@ -515,24 +500,28 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="17">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+    <list size="21">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -574,7 +563,8 @@
       <workItem from="1499726708949" duration="2021000" />
       <workItem from="1499805699713" duration="409000" />
       <workItem from="1499967777286" duration="36000" />
-      <workItem from="1500824399224" duration="67000" />
+      <workItem from="1500824399224" duration="86000" />
+      <workItem from="1501768538452" duration="9813000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -751,43 +741,50 @@
       <option name="project" value="LOCAL" />
       <updated>1499806099923</updated>
     </task>
-    <option name="localTasksCounter" value="26" />
+    <task id="LOCAL-00026" summary="1.0.7+2">
+      <created>1500824472581</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1500824472581</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.07.11 at 16h 47m 13s.xml">
+    <history-entry file="All_Tests - 2017.08.03 at 12h 28m 12s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.07.23 at 11h 41m 04s.xml">
+    <history-entry file="All_Tests - 2017.08.03 at 12h 28m 30s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.07.10 at 19h 08m 21s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.08.03 at 12h 29m 18s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.07.11 at 16h 47m 06s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.08.03 at 12h 29m 49s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 18h 56m 24s.xml">
-      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.08.03 at 12h 30m 12s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 19h 00m 00s.xml">
-      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.08.03 at 12h 32m 21s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_accepts_test_dart - 2017.07.10 at 19h 01m 20s.xml">
-      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.08.03 at 12h 32m 35s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart_(PRODUCTION) - 2017.06.30 at 17h 21m 22s.xml">
-      <configuration name="tests in server_test.dart (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.08.03 at 12h 33m 22s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart_(PRODUCTION) - 2017.06.30 at 17h 22m 07s.xml">
-      <configuration name="tests in server_test.dart (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_use_app_properties_like_members_in_util_test_dart - 2017.08.03 at 12h 32m 58s.xml">
+      <configuration name="can use app.properties like members in util_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_server_test_dart_(PRODUCTION) - 2017.06.30 at 17h 22m 28s.xml">
-      <configuration name="tests in server_test.dart (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_use_app_properties_like_members_in_util_test_dart - 2017.08.03 at 12h 33m 10s.xml">
+      <configuration name="can use app.properties like members in util_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26150000" />
+    <option name="totallyTimeSpent" value="35982000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -802,28 +799,28 @@
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19989423" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -857,119 +854,14 @@
     <MESSAGE value="1.0.6+2" />
     <MESSAGE value="Added RequestContext.accepts" />
     <MESSAGE value="Swapped to angel_model" />
-    <option name="LAST_COMMIT_MESSAGE" value="Swapped to angel_model" />
+    <MESSAGE value="1.0.7+2" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.7+2" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="799">
-          <caret line="47" column="39" lean-forward="false" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="34" lean-forward="false" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server_shelved.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="17" lean-forward="false" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-522">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/util_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="11" column="12" lean-forward="false" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="11" column="6" lean-forward="false" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="10" column="13" lean-forward="true" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="63">
@@ -998,13 +890,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="60" column="31" lean-forward="true" selection-start-line="60" selection-start-column="31" selection-end-line="60" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="231">
@@ -1033,13 +918,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
@@ -1047,13 +925,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="15" column="29" lean-forward="false" selection-start-line="15" selection-start-column="29" selection-end-line="20" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -1061,13 +932,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1785">
-          <caret line="92" column="33" lean-forward="false" selection-start-line="92" selection-start-column="33" selection-end-line="92" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/serialize.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
@@ -1089,20 +953,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="88" column="30" lean-forward="true" selection-start-line="88" selection-start-column="30" selection-end-line="88" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1071">
-          <caret line="58" column="6" lean-forward="false" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2730">
@@ -1124,21 +974,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="36" column="62" lean-forward="false" selection-start-line="36" selection-start-column="62" selection-end-line="36" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="714">
-          <caret line="42" column="13" lean-forward="false" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="441">
@@ -1146,14 +981,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4011">
@@ -1162,27 +989,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6531">
-          <caret line="326" column="38" lean-forward="false" selection-start-line="326" selection-start-column="38" selection-end-line="326" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="84">
-            <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-            <folding>
-              <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1191,13 +997,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="77" column="4" lean-forward="false" selection-start-line="77" selection-start-column="4" selection-end-line="77" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -1206,10 +1005,203 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib/src/parse_body.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="17" column="24" lean-forward="false" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="48" column="23" lean-forward="false" selection-start-line="48" selection-start-column="23" selection-end-line="48" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/async/stream_controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="683">
+          <caret line="139" column="71" lean-forward="true" selection-start-line="139" selection-start-column="71" selection-end-line="139" selection-end-column="71" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/safe_stream_controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="10" column="23" lean-forward="true" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="97">
+          <caret line="77" column="20" lean-forward="true" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="643">
+          <caret line="70" column="23" lean-forward="false" selection-start-line="70" selection-start-column="23" selection-end-line="70" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
-          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3137">
+          <caret line="67" column="2" lean-forward="false" selection-start-line="67" selection-start-column="2" selection-end-line="67" selection-end-column="2" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/io/bytes_builder.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="305">
+          <caret line="22" column="15" lean-forward="true" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/typed_data/typed_data.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="599">
+          <caret line="774" column="19" lean-forward="false" selection-start-line="774" selection-start-column="19" selection-end-line="774" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="42">
+            <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="109" />
+            <folding>
+              <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="230" column="24" lean-forward="false" selection-start-line="230" selection-start-column="24" selection-end-line="230" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="192" column="20" lean-forward="false" selection-start-line="192" selection-start-column="20" selection-end-line="192" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/core/string.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="295" column="0" lean-forward="true" selection-start-line="295" selection-start-column="0" selection-end-line="295" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/extensible.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="3" column="8" lean-forward="false" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="189">
+          <caret line="39" column="35" lean-forward="true" selection-start-line="39" selection-start-column="35" selection-end-line="39" selection-end-column="35" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="735">
+          <caret line="35" column="25" lean-forward="false" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="106" column="5" lean-forward="true" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
           <folding />
         </state>
       </provider>
@@ -1217,18 +1209,72 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="21">
-            <caret line="1" column="89" lean-forward="false" selection-start-line="1" selection-start-column="89" selection-end-line="1" selection-end-column="89" />
+          <first_editor relative-caret-position="315">
+            <caret line="15" column="38" lean-forward="false" selection-start-line="15" selection-start-column="38" selection-end-line="15" selection-end-column="38" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/util_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="277">
+          <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="31" lean-forward="false" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="475">
+          <caret line="142" column="39" lean-forward="false" selection-start-line="142" selection-start-column="39" selection-end-line="142" selection-end-column="39" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5090">
+          <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="162" column="27" lean-forward="true" selection-start-line="162" selection-start-column="27" selection-end-line="162" selection-end-column="27" />
+        <state relative-caret-position="-5379">
+          <caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
           <folding />
         </state>
       </provider>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6719ced..db0ebd82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# 1.0.8
+* Changed `req.query` to use a modifiable Map if the body has not parsed. Resolves
+[#157](https://github.com/angel-dart/framework/issues/157).
+* Changed all constants to `camelCase`, and deprecated their `CONSTANT_CASE` counterparts. Resolves
+[#155](https://github.com/angel-dart/framework/issues/155).
+* Resolved [#156](https://github.com/angel-dart/framework/issues/156) by adding a `graphql` provider.
+* Added an `analysis-options.yaml` enabling strong mode. Preparing for Dart 2.0.
+* Added a dependency on `package:meta`, resolving [#154](https://github.com/angel-dart/framework/issues/154),
+and added corresponding annotations to make extending Angel easier.
+* Resolved [#158](https://github.com/angel-dart/framework/issues/158) by using proper `StreamController`
+patterns, to prevent memory leaks.
+* Route handler sequences are now cached in a Map, so repeat requests will be resolved faster.
+* A message is no longer printed in production mode.
+* Removed the inheritance on `Extensible` in many classes, and removed it from `angel_route`.
+Now, only `Angel` and `RequestContext` have `@proxy` annotations.
+* Deprecated passing `debug` to Angel.
+
 # 1.0.7+2
 Changed `ResponseContext.serialize`. The `contentType` is now set *before* serialization.
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
new file mode 100644
index 00000000..518eb901
--- /dev/null
+++ b/analysis_options.yaml
@@ -0,0 +1,2 @@
+analyzer:
+  strong-mode: true
\ No newline at end of file
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 19eca064..4e165c47 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -143,8 +143,6 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
         return obj.where((k) => !key);
       else if (obj is Map)
         return obj..remove(key);
-      else if (obj is Extensible)
-        return obj..properties.remove(key);
       else {
         try {
           reflect(obj).setField(new Symbol(key), null);
@@ -231,8 +229,6 @@ HookedServiceEventListener addCreatedAt(
         return assign(obj, now);
       else if (obj is Map)
         obj[name] = now;
-      else if (obj is Extensible)
-        obj..properties[name] = now;
       else {
         try {
           reflect(obj).setField(new Symbol(name), now);
@@ -282,8 +278,6 @@ HookedServiceEventListener addUpdatedAt(
         return assign(obj, now);
       else if (obj is Map)
         obj[name] = now;
-      else if (obj is Extensible)
-        obj..properties[name] = now;
       else {
         try {
           reflect(obj).setField(new Symbol(name), now);
diff --git a/lib/src/extensible.dart b/lib/src/extensible.dart
deleted file mode 100644
index 45ad12d4..00000000
--- a/lib/src/extensible.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-library angel_framework.extensible;
-
-export 'package:angel_route/src/extensible.dart';
\ No newline at end of file
diff --git a/lib/src/fast_name_from_symbol.dart b/lib/src/fast_name_from_symbol.dart
new file mode 100644
index 00000000..1460117d
--- /dev/null
+++ b/lib/src/fast_name_from_symbol.dart
@@ -0,0 +1,6 @@
+String fastNameFromSymbol(Symbol s) {
+  String str = s.toString();
+  int open = str.indexOf('"');
+  int close = str.lastIndexOf('"');
+  return str.substring(open + 1, close);
+}
\ No newline at end of file
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 2c869965..297f1356 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -2,17 +2,19 @@ library angel_framework.http.angel_base;
 
 import 'dart:async';
 import 'package:container/container.dart';
+import '../fast_name_from_symbol.dart';
 import 'routable.dart';
 
 /// A function that asynchronously generates a view from the given path and data.
 typedef Future<String> ViewGenerator(String path, [Map data]);
 
 /// Base class for Angel servers. Do not bother extending this.
+@proxy
 class AngelBase extends Routable {
-  AngelBase({bool debug: false}):super(debug: debug);
-
   Container _container = new Container();
 
+  final Map properties = {};
+
   /// When set to true, the request body will not be parsed
   /// automatically. You can call `req.parse()` manually,
   /// or use `lazyBody()`.
@@ -29,4 +31,22 @@ class AngelBase extends Routable {
   ///
   /// Called by [ResponseContext]@`render`.
   ViewGenerator viewGenerator = (String view, [Map data]) async => "No view engine has been configured yet.";
+
+  operator [](key) => properties[key];
+  operator []=(key, value) => properties[key] = value;
+
+  noSuchMethod(Invocation invocation) {
+    if (invocation.memberName != null) {
+      String name = fastNameFromSymbol(invocation.memberName);
+
+      if (invocation.isMethod) {
+        return Function.apply(properties[name], invocation.positionalArguments,
+            invocation.namedArguments);
+      } else if (invocation.isGetter) {
+        return properties[name];
+      }
+    }
+
+    return super.noSuchMethod(invocation);
+  }
 }
\ No newline at end of file
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 32b5c1bd..beb760dd 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -3,6 +3,7 @@ library angel_framework.http.controller;
 import 'dart:async';
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
+import 'package:meta/meta.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -18,13 +19,20 @@ import 'server.dart' show Angel, preInject;
 /// and memory use.
 class InjectionRequest {
   /// Optional, typed data that can be passed to a DI-enabled method.
-  Map<String, Type> named = {};
+  final Map<String, Type> named;
 
   /// A list of the arguments required for a DI-enabled method to run.
-  final List required = [];
+  final List required;
 
   /// A list of the arguments that can be null in a DI-enabled method.
-  final List<String> optional = [];
+  final List<String> optional;
+
+  const InjectionRequest.constant({this.named, this.required, this.optional});
+
+  InjectionRequest()
+      : named = {},
+        required = [],
+        optional = [];
 }
 
 /// Supports grouping routes with shared functionality.
@@ -47,6 +55,7 @@ class Controller {
 
   Controller({this.debug: false, this.injectSingleton: true});
 
+  @mustCallSuper
   Future call(Angel app) async {
     _app = app;
 
@@ -143,6 +152,7 @@ RequestHandler createDynamicHandler(handler,
   injection.optional.addAll(optional ?? []);
   return handleContained(handler, injection);
 }
+
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(handler, InjectionRequest injection) {
   return (RequestContext req, ResponseContext res) async {
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 2e2cc77c..3e3fa0d5 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -108,27 +108,27 @@ class HookedService extends Service {
 
     applyListeners(inner.index, beforeIndexed);
     applyListeners(inner.read, beforeRead);
-    applyListeners(inner.created, beforeCreated);
+    applyListeners(inner.create, beforeCreated);
     applyListeners(inner.modify, beforeModified);
-    applyListeners(inner.updated, beforeUpdated);
-    applyListeners(inner.removed, beforeRemoved);
+    applyListeners(inner.update, beforeUpdated);
+    applyListeners(inner.remove, beforeRemoved);
     applyListeners(inner.index, afterIndexed, true);
     applyListeners(inner.read, afterRead, true);
-    applyListeners(inner.created, afterCreated, true);
+    applyListeners(inner.create, afterCreated, true);
     applyListeners(inner.modify, afterModified, true);
-    applyListeners(inner.updated, afterUpdated, true);
-    applyListeners(inner.removed, afterRemoved, true);
+    applyListeners(inner.update, afterUpdated, true);
+    applyListeners(inner.remove, afterRemoved, true);
   }
 
   /// Adds routes to this instance.
   @override
   void addRoutes() {
     // Set up our routes. We still need to copy middleware from inner service
-    Map restProvider = {'provider': Providers.REST};
+    Map restProvider = {'provider': Providers.rest};
 
     // Add global middleware if declared on the instance itself
     Middleware before = getAnnotation(inner, Middleware);
-    final handlers = [
+    List handlers = [
       (RequestContext req, ResponseContext res) async {
         req.serviceParams
           ..['__requestctx'] = req
@@ -270,17 +270,17 @@ class HookedService extends Service {
       Iterable<String> eventNames, HookedServiceEventListener listener) {
     eventNames.map((name) {
       switch (name) {
-        case HookedServiceEvent.INDEXED:
+        case HookedServiceEvent.indexed:
           return beforeIndexed;
-        case HookedServiceEvent.READ:
+        case HookedServiceEvent.read:
           return beforeRead;
-        case HookedServiceEvent.CREATED:
+        case HookedServiceEvent.created:
           return beforeCreated;
-        case HookedServiceEvent.MODIFIED:
+        case HookedServiceEvent.modified:
           return beforeModified;
-        case HookedServiceEvent.UPDATED:
+        case HookedServiceEvent.updated:
           return beforeUpdated;
-        case HookedServiceEvent.REMOVED:
+        case HookedServiceEvent.removed:
           return beforeRemoved;
         default:
           throw new ArgumentError('Invalid service method: ${name}');
@@ -293,17 +293,17 @@ class HookedService extends Service {
   void after(Iterable<String> eventNames, HookedServiceEventListener listener) {
     eventNames.map((name) {
       switch (name) {
-        case HookedServiceEvent.INDEXED:
+        case HookedServiceEvent.indexed:
           return afterIndexed;
-        case HookedServiceEvent.READ:
+        case HookedServiceEvent.read:
           return afterRead;
-        case HookedServiceEvent.CREATED:
+        case HookedServiceEvent.created:
           return afterCreated;
-        case HookedServiceEvent.MODIFIED:
+        case HookedServiceEvent.modified:
           return afterModified;
-        case HookedServiceEvent.UPDATED:
+        case HookedServiceEvent.updated:
           return afterUpdated;
-        case HookedServiceEvent.REMOVED:
+        case HookedServiceEvent.removed:
           return afterRemoved;
         default:
           throw new ArgumentError('Invalid service method: ${name}');
@@ -340,7 +340,7 @@ class HookedService extends Service {
   Stream<HookedServiceEvent> beforeAllStream() {
     var ctrl = new StreamController<HookedServiceEvent>();
     _ctrl.add(ctrl);
-    before(HookedServiceEvent.ALL, ctrl.add);
+    before(HookedServiceEvent.all, ctrl.add);
     return ctrl.stream;
   }
 
@@ -352,7 +352,7 @@ class HookedService extends Service {
   Stream<HookedServiceEvent> afterAllStream() {
     var ctrl = new StreamController<HookedServiceEvent>();
     _ctrl.add(ctrl);
-    before(HookedServiceEvent.ALL, ctrl.add);
+    before(HookedServiceEvent.all, ctrl.add);
     return ctrl.stream;
   }
 
@@ -392,12 +392,12 @@ class HookedService extends Service {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeIndexed._emit(
         new HookedServiceEvent(false, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.INDEXED,
+            _getResponse(_params), inner, HookedServiceEvent.indexed,
             params: params));
     if (before._canceled) {
       HookedServiceEvent after = await beforeIndexed._emit(
           new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.INDEXED,
+              _getResponse(_params), inner, HookedServiceEvent.indexed,
               params: params, result: before.result));
       return after.result;
     }
@@ -408,7 +408,7 @@ class HookedService extends Service {
         _getRequest(_params),
         _getResponse(_params),
         inner,
-        HookedServiceEvent.INDEXED,
+        HookedServiceEvent.indexed,
         params: params,
         result: result));
     return after.result;
@@ -422,7 +422,7 @@ class HookedService extends Service {
         _getRequest(_params),
         _getResponse(_params),
         inner,
-        HookedServiceEvent.READ,
+        HookedServiceEvent.indexed,
         id: id,
         params: params));
 
@@ -432,7 +432,7 @@ class HookedService extends Service {
           _getRequest(_params),
           _getResponse(_params),
           inner,
-          HookedServiceEvent.READ,
+          HookedServiceEvent.read,
           id: id,
           params: params,
           result: before.result));
@@ -445,7 +445,7 @@ class HookedService extends Service {
         _getRequest(_params),
         _getResponse(_params),
         inner,
-        HookedServiceEvent.READ,
+        HookedServiceEvent.read,
         id: id,
         params: params,
         result: result));
@@ -457,13 +457,13 @@ class HookedService extends Service {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeCreated._emit(
         new HookedServiceEvent(false, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.CREATED,
+            _getResponse(_params), inner, HookedServiceEvent.created,
             data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterCreated._emit(
           new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.CREATED,
+              _getResponse(_params), inner, HookedServiceEvent.created,
               data: data, params: params, result: before.result));
       return after.result;
     }
@@ -474,7 +474,7 @@ class HookedService extends Service {
         _getRequest(_params),
         _getResponse(_params),
         inner,
-        HookedServiceEvent.CREATED,
+        HookedServiceEvent.created,
         data: data,
         params: params,
         result: result));
@@ -486,13 +486,13 @@ class HookedService extends Service {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeModified._emit(
         new HookedServiceEvent(false, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
+            _getResponse(_params), inner, HookedServiceEvent.modified,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterModified._emit(
           new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.MODIFIED,
+              _getResponse(_params), inner, HookedServiceEvent.modified,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
@@ -503,7 +503,7 @@ class HookedService extends Service {
         _getRequest(_params),
         _getResponse(_params),
         inner,
-        HookedServiceEvent.MODIFIED,
+        HookedServiceEvent.modified,
         id: id,
         data: data,
         params: params,
@@ -516,13 +516,13 @@ class HookedService extends Service {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeUpdated._emit(
         new HookedServiceEvent(false, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.UPDATED,
+            _getResponse(_params), inner, HookedServiceEvent.updated,
             id: id, data: data, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterUpdated._emit(
           new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.UPDATED,
+              _getResponse(_params), inner, HookedServiceEvent.updated,
               id: id, data: data, params: params, result: before.result));
       return after.result;
     }
@@ -533,7 +533,7 @@ class HookedService extends Service {
         _getRequest(_params),
         _getResponse(_params),
         inner,
-        HookedServiceEvent.UPDATED,
+        HookedServiceEvent.updated,
         id: id,
         data: data,
         params: params,
@@ -546,13 +546,13 @@ class HookedService extends Service {
     var params = _stripReq(_params);
     HookedServiceEvent before = await beforeRemoved._emit(
         new HookedServiceEvent(false, _getRequest(_params),
-            _getResponse(_params), inner, HookedServiceEvent.REMOVED,
+            _getResponse(_params), inner, HookedServiceEvent.removed,
             id: id, params: params));
 
     if (before._canceled) {
       HookedServiceEvent after = await afterRemoved._emit(
           new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.REMOVED,
+              _getResponse(_params), inner, HookedServiceEvent.removed,
               id: id, params: params, result: before.result));
       return after.result;
     }
@@ -563,7 +563,7 @@ class HookedService extends Service {
         _getRequest(_params),
         _getResponse(_params),
         inner,
-        HookedServiceEvent.REMOVED,
+        HookedServiceEvent.removed,
         id: id,
         params: params,
         result: result));
@@ -577,22 +577,22 @@ class HookedService extends Service {
     HookedServiceEventDispatcher dispatcher;
 
     switch (eventName) {
-      case HookedServiceEvent.INDEXED:
+      case HookedServiceEvent.indexed:
         dispatcher = afterIndexed;
         break;
-      case HookedServiceEvent.READ:
+      case HookedServiceEvent.read:
         dispatcher = afterRead;
         break;
-      case HookedServiceEvent.CREATED:
+      case HookedServiceEvent.created:
         dispatcher = afterCreated;
         break;
-      case HookedServiceEvent.MODIFIED:
+      case HookedServiceEvent.modified:
         dispatcher = afterModified;
         break;
-      case HookedServiceEvent.UPDATED:
+      case HookedServiceEvent.updated:
         dispatcher = afterUpdated;
         break;
-      case HookedServiceEvent.REMOVED:
+      case HookedServiceEvent.removed:
         dispatcher = afterRemoved;
         break;
       default:
@@ -614,20 +614,44 @@ class HookedService extends Service {
 
 /// Fired when a hooked service is invoked.
 class HookedServiceEvent {
-  static const String INDEXED = "indexed";
-  static const String READ = "read";
-  static const String CREATED = "created";
-  static const String MODIFIED = "modified";
-  static const String UPDATED = "updated";
-  static const String REMOVED = "removed";
-  static const List<String> ALL = const [
-    INDEXED,
-    READ,
-    CREATED,
-    MODIFIED,
-    UPDATED,
-    REMOVED
+  static const String indexed = 'indexed';
+  static const String read = 'read';
+  static const String created = 'created';
+  static const String modified = 'modified';
+  static const String updated = 'updated';
+  static const String removed = 'removed';
+
+  static const List<String> all = const [
+    indexed, read, created, modified, updated, removed
   ];
+  
+  /// Use [indexed] instead.
+  @deprecated
+  static const String INDEXED = indexed;
+
+  /// Use [read] instead.
+  @deprecated
+  static const String READ = read;
+
+  /// Use [created] instead.
+  @deprecated
+  static const String CREATED = created;
+
+  /// Use [modified] instead.
+  @deprecated
+  static const String MODIFIED = modified;
+
+  /// Use [updated] instead.
+  @deprecated
+  static const String UPDATED = updated;
+
+  /// Use [removed] instead.
+  @deprecated
+  static const String REMOVED = removed;
+
+  /// Use [all] instead.
+  @deprecated
+  static const List<String> ALL = all;
 
   /// Use this to end processing of an event.
   void cancel([result]) {
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 73dcbd5e..086ed951 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -2,18 +2,23 @@ library angel_framework.http.request_context;
 
 import 'dart:async';
 import 'dart:io';
-import 'package:angel_route/src/extensible.dart';
 import 'package:body_parser/body_parser.dart';
+import 'package:charcode/charcode.dart';
+import '../fast_name_from_symbol.dart';
 import 'server.dart' show Angel;
 
 /// A convenience wrapper around an incoming HTTP request.
-class RequestContext extends Extensible {
+@proxy
+class RequestContext {
   String _acceptHeaderCache;
   bool _acceptsAllCache;
   BodyParseResult _body;
   ContentType _contentType;
   HttpRequest _io;
   String _override, _path;
+  Map _provisionalQuery;
+
+  final Map properties = {};
 
   /// Additional params to be passed to services.
   final Map serviceParams = {};
@@ -106,7 +111,7 @@ class RequestContext extends Extensible {
   /// **If you are writing a plug-in, consider using [lazyQuery] instead.**
   Map get query {
     if (_body == null)
-      return uri.queryParameters;
+      return _provisionalQuery ??= new Map.from(uri.queryParameters);
     else
       return _body.query;
   }
@@ -145,16 +150,36 @@ class RequestContext extends Extensible {
     ctx.app = app;
     ctx._contentType = request.headers.contentType;
     ctx._override = override;
-    ctx._path = request.uri
-        .toString()
-        .replaceAll("?" + request.uri.query, "")
-        .replaceAll(new RegExp(r'/+$'), '');
+
+    // Faster way to get path
+    List<int> _path = [];
+
+    // Go up until we reach a ?
+    for (int ch in request.uri.toString().codeUnits) {
+      if (ch != $question)
+        _path.add(ch);
+      else break;
+    }
+
+    // Remove trailing slashes
+    int lastSlash = -1;
+
+    for (int i = _path.length - 1; i >= 0; i--) {
+      if (_path[i] == $slash)
+        lastSlash = i;
+      else break;
+    }
+
+    if (lastSlash > -1)
+      ctx._path = new String.fromCharCodes(_path.take(lastSlash));
+    else ctx._path = new String.fromCharCodes(_path);
     ctx._io = request;
 
-    if (app.lazyParseBodies != true)
+    if (app.lazyParseBodies != true) {
       ctx._body = (await parseBody(request,
-              storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
+          storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
           {};
+    }
 
     return ctx;
   }
@@ -246,7 +271,26 @@ class RequestContext extends Extensible {
     if (_body != null)
       return _body;
     else
+      _provisionalQuery = null;
       return _body = await parseBody(io,
           storeOriginalBuffer: app.storeOriginalBuffer == true);
   }
+
+  operator [](key) => properties[key];
+  operator []=(key, value) => properties[key] = value;
+
+  noSuchMethod(Invocation invocation) {
+    if (invocation.memberName != null) {
+      String name = fastNameFromSymbol(invocation.memberName);
+
+      if (invocation.isMethod) {
+        return Function.apply(properties[name], invocation.positionalArguments,
+            invocation.namedArguments);
+      } else if (invocation.isGetter) {
+        return properties[name];
+      }
+    }
+
+    return super.noSuchMethod(invocation);
+  }
 }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 9ce80e0b..08bd6972 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -3,10 +3,10 @@ library angel_framework.http.response_context;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
-import '../extensible.dart';
 import 'server.dart' show Angel;
 import 'controller.dart';
 
@@ -19,9 +19,10 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef String ResponseSerializer(data);
 
 /// A convenience wrapper around an outgoing HTTP request.
-class ResponseContext extends Extensible implements StringSink {
+class ResponseContext implements StringSink {
   final _LockableBytesBuilder _buffer = new _LockableBytesBuilder();
   final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
+  final Map properties = {};
   bool _isOpen = true, _isClosed = false;
   int _statusCode = 200;
 
@@ -366,7 +367,7 @@ abstract class _LockableBytesBuilder extends BytesBuilder {
 
 class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
   bool _closed = false;
-  final List<int> _data = [];
+  Uint8List _data = new Uint8List(0);
 
   StateError _deny() =>
       new StateError('Cannot modified a closed response\'s buffer.');
@@ -385,8 +386,19 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
   void add(List<int> bytes) {
     if (_closed)
       throw _deny();
-    else {
-      _data.addAll(bytes);
+    else if (bytes.isNotEmpty) {
+      int len = _data.length + bytes.length;
+      var d = new Uint8List(len);
+
+      for (int i = 0; i < _data.length; i++) {
+        d[i] = _data[i];
+      }
+
+      for (int i = 0; i < bytes.length; i++) {
+        d[i + _data.length] = bytes[i];
+      }
+
+      _data = d;
     }
   }
 
@@ -395,7 +407,15 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
     if (_closed)
       throw _deny();
     else {
-      _data.add(byte);
+      int len = _data.length + 1;
+      var d = new Uint8List(len);
+
+      for (int i = 0; i < _data.length; i++) {
+        d[i] = _data[i];
+      }
+
+      d[_data.length] = byte;
+      _data = d;
     }
   }
 
@@ -404,7 +424,7 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
     if (_closed)
       throw _deny();
     else {
-      _data.clear();
+      for (int i = 0; i < _data.length; i++) _data[i] = 0;
     }
   }
 
@@ -422,7 +442,7 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
     if (_closed)
       return toBytes();
     else {
-      var r = new List<int>.from(_data);
+      var r = new Uint8List.fromList(_data);
       clear();
       return r;
     }
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index c01cfd61..6102b503 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -2,6 +2,7 @@ library angel_framework.http.routable;
 
 import 'dart:async';
 import 'package:angel_route/angel_route.dart';
+import 'package:meta/meta.dart';
 import '../util.dart';
 import 'angel_base.dart';
 import 'controller.dart';
@@ -36,6 +37,7 @@ RequestMiddleware waterfall(List handlers) {
 class Routable extends Router {
   final Map<Pattern, Controller> _controllers = {};
   final Map<Pattern, Service> _services = {};
+  final Map properties = {};
 
   Routable({bool debug: false}) : super(debug: debug);
 
@@ -59,7 +61,7 @@ class Routable extends Router {
 
   /// Assigns a middleware to a name for convenience.
   @override
-  registerMiddleware(String name, RequestMiddleware middleware) =>
+  registerMiddleware(String name, @checked RequestHandler middleware) =>
       super.registerMiddleware(name, middleware);
 
   /// Retrieves the service assigned to the given path.
@@ -129,17 +131,19 @@ class Routable extends Router {
     }
 
     // Also copy properties...
-    Map copiedProperties = new Map.from(router.properties);
-    for (String propertyName in copiedProperties.keys) {
-      properties.putIfAbsent("$middlewarePrefix$propertyName",
-          () => copiedMiddleware[propertyName]);
+    if (router is Routable) {
+      Map copiedProperties = new Map.from(router.properties);
+      for (String propertyName in copiedProperties.keys) {
+        properties.putIfAbsent("$middlewarePrefix$propertyName",
+                () => copiedMiddleware[propertyName]);
+      }
     }
 
     // _router.dumpTree(header: 'Mounting on "$path":');
     // root.child(path, debug: debug, handlers: handlers).addChild(router.root);
     mount(path, _router);
 
-    if (router is Routable) {
+    if (_router is Routable) {
       // Copy services, too. :)
       for (Pattern servicePath in _router._services.keys) {
         String newServicePath =
@@ -149,6 +153,8 @@ class Routable extends Router {
       }
     }
 
-    if (service != null) _onService.add(service);
+    if (service != null) {
+      if (_onService.hasListener) _onService.add(service);
+    }
   }
 }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 357e3eaa..8a85cd53 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -3,10 +3,13 @@ library angel_framework.http.server;
 import 'dart:async';
 import 'dart:io';
 import 'dart:mirrors';
-import 'package:angel_route/angel_route.dart';
+import 'package:angel_route/angel_route.dart' hide Extensible;
+import 'package:charcode/charcode.dart';
 export 'package:container/container.dart';
 import 'package:flatten/flatten.dart';
 import 'package:json_god/json_god.dart' as god;
+import 'package:meta/meta.dart';
+import '../safe_stream_controller.dart';
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
@@ -31,18 +34,18 @@ typedef Future AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
-  StreamController<HttpRequest> _afterProcessed =
-      new StreamController<HttpRequest>.broadcast();
-  StreamController<HttpRequest> _beforeProcessed =
-      new StreamController<HttpRequest>.broadcast();
-  StreamController<AngelFatalError> _fatalErrorStream =
-      new StreamController<AngelFatalError>.broadcast();
-  StreamController<Controller> _onController =
-      new StreamController<Controller>.broadcast();
+  SafeCtrl<HttpRequest> _afterProcessed = new SafeCtrl<HttpRequest>.broadcast();
+  SafeCtrl<HttpRequest> _beforeProcessed =
+      new SafeCtrl<HttpRequest>.broadcast();
+  SafeCtrl<AngelFatalError> _fatalErrorStream =
+      new SafeCtrl<AngelFatalError>.broadcast();
+  SafeCtrl<Controller> _onController = new SafeCtrl<Controller>.broadcast();
+
   final List<Angel> _children = [];
   Router _flattened;
   bool _isProduction;
   Angel _parent;
+  final Map<String, List> _handlerCache = {};
   ServerGenerator _serverGenerator = HttpServer.bind;
 
   /// A global Map of manual injections. You usually will not want to touch this.
@@ -152,7 +155,7 @@ class Angel extends AngelBase {
   }
 
   @override
-  Route addRoute(String method, String path, Object handler,
+  Route addRoute(String method, Pattern path, Object handler,
       {List middleware: const []}) {
     if (_flattened != null) {
       print(
@@ -308,9 +311,9 @@ class Angel extends AngelBase {
     });
   }
 
-  Future<ResponseContext> createResponseContext(HttpResponse response) async =>
-      new ResponseContext(response, this)
-        ..serializer = (_serializer ?? god.serialize);
+  Future<ResponseContext> createResponseContext(HttpResponse response) =>
+      new Future<ResponseContext>.value(new ResponseContext(response, this)
+        ..serializer = (_serializer ?? god.serialize));
 
   /// Attempts to find a middleware by the given name within this application.
   findMiddleware(key) {
@@ -361,42 +364,50 @@ class Angel extends AngelBase {
     try {
       var req = await createRequestContext(request);
       var res = await createResponseContext(request.response);
-      String requestedUrl = request.uri.path.replaceAll(_straySlashes, '');
+      String requestedUrl;
+
+      // Faster way to get path
+      List<int> _path = request.uri.path.codeUnits;
+
+      // Remove trailing slashes
+      int lastSlash = -1;
+
+      for (int i = _path.length - 1; i >= 0; i--) {
+        if (_path[i] == $slash)
+          lastSlash = i;
+        else
+          break;
+      }
+
+      if (lastSlash > -1)
+        requestedUrl = new String.fromCharCodes(_path.take(lastSlash));
+      else
+        requestedUrl = new String.fromCharCodes(_path);
 
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
-      Router r =
-          isProduction ? (_flattened ?? (_flattened = flatten(this))) : this;
-      var resolved =
-          r.resolveAll(requestedUrl, requestedUrl, method: req.method);
+      var pipeline = _handlerCache.putIfAbsent(requestedUrl, () {
+        Router r =
+            isProduction ? (_flattened ?? (_flattened = flatten(this))) : this;
+        var resolved =
+            r.resolveAll(requestedUrl, requestedUrl, method: req.method);
 
-      for (var result in resolved) req.params.addAll(result.allParams);
+        for (var result in resolved) req.params.addAll(result.allParams);
 
-      if (resolved.isNotEmpty) {
-        var route = resolved.first.route;
-        req.inject(Match, route.match(requestedUrl));
-      }
+        if (resolved.isNotEmpty) {
+          var route = resolved.first.route;
+          req.inject(Match, route.match(requestedUrl));
+        }
 
-      var m = new MiddlewarePipeline(resolved);
-      req.inject(MiddlewarePipeline, m);
+        var m = new MiddlewarePipeline(resolved);
+        req.inject(MiddlewarePipeline, m);
 
-      var pipeline = []..addAll(before)..addAll(m.handlers)..addAll(after);
-
-      // _printDebug('Handler sequence on $requestedUrl: $pipeline');
+        return new List.from(before)..addAll(m.handlers)..addAll(after);
+      });
 
       for (var handler in pipeline) {
         try {
-          // _printDebug('Executing handler: $handler');
-          var result = await executeHandler(handler, req, res);
-          // _printDebug('Result: $result');
-
-          if (!result) {
-            // _printDebug('Last executed handler: $handler');
-            break;
-          } else {
-            // _printDebug(
-            //    'Handler completed successfully, did not terminate response: $handler');
-          }
+          if (!await executeHandler(handler, req, res)) break;
         } on AngelHttpException catch (e, st) {
           e.stackTrace ??= st;
           return await handleAngelHttpException(e, st, req, res, request);
@@ -448,7 +459,8 @@ class Angel extends AngelBase {
       if (_flattened == null) _flattened = flatten(this);
 
       _walk(_flattened);
-      print('Angel is running in production mode.');
+
+      //if (silent != true) print('Angel is running in production mode.');
     }
   }
 
@@ -482,15 +494,16 @@ class Angel extends AngelBase {
   /// Sends a response.
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
-      {bool ignoreFinalizers: false}) async {
+      {bool ignoreFinalizers: false}) {
     _afterProcessed.add(request);
 
-    if (!res.willCloseItself) {
-      if (ignoreFinalizers != true) {
-        for (var finalizer in responseFinalizers) {
-          await finalizer(req, res);
-        }
-      }
+    if (res.willCloseItself) {
+      return new Future.value();
+    } else {
+      Future finalizers = ignoreFinalizers == true
+          ? new Future.value()
+          : responseFinalizers.fold<Future>(
+              new Future.value(), (out, f) => out.then((_) => f(req, res)));
 
       if (res.isOpen) res.end();
 
@@ -505,8 +518,9 @@ class Angel extends AngelBase {
       request.response
         ..statusCode = res.statusCode
         ..cookies.addAll(res.cookies)
-        ..add(res.buffer.takeBytes());
-      await request.response.close();
+        ..add(res.buffer.toBytes());
+
+      return finalizers.then((_) => request.response.close());
     }
   }
 
@@ -541,7 +555,7 @@ class Angel extends AngelBase {
   /// NOTE: The above will not be properly copied if [path] is
   /// a [RegExp].
   @override
-  use(Pattern path, Routable routable,
+  use(Pattern path, @checked Routable routable,
       {bool hooked: true, String namespace: null}) {
     var head = path.toString().replaceAll(_straySlashes, '');
 
@@ -581,6 +595,22 @@ class Angel extends AngelBase {
         var tail = k.toString().replaceAll(_straySlashes, '');
         services['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
+
+      _beforeProcessed.whenInitialized(() {
+        routable.beforeProcessed.listen(_beforeProcessed.add);
+      });
+
+      _afterProcessed.whenInitialized(() {
+        routable.afterProcessed.listen(_afterProcessed.add);
+      });
+
+      _fatalErrorStream.whenInitialized(() {
+        routable.fatalErrorStream.listen(_fatalErrorStream.add);
+      });
+
+      _onController.whenInitialized(() {
+        routable.onController.listen(_onController.add);
+      });
     }
 
     if (routable is Service) {
@@ -597,17 +627,18 @@ class Angel extends AngelBase {
   }
 
   /// Default constructor. ;)
-  Angel({bool debug: false}) : super(debug: debug == true) {
+  Angel({@deprecated bool debug: false}) : super() {
     bootstrapContainer();
   }
 
   /// An instance mounted on a server started by the [serverGenerator].
-  factory Angel.custom(ServerGenerator serverGenerator, {bool debug: false}) =>
-      new Angel(debug: debug == true).._serverGenerator = serverGenerator;
+  factory Angel.custom(ServerGenerator serverGenerator,
+          {@deprecated bool debug: false}) =>
+      new Angel().._serverGenerator = serverGenerator;
 
   factory Angel.fromSecurityContext(SecurityContext context,
-      {bool debug: false}) {
-    var app = new Angel(debug: debug == true);
+      {@deprecated bool debug: false}) {
+    var app = new Angel();
 
     app._serverGenerator = (InternetAddress address, int port) async {
       return await HttpServer.bindSecure(address, port, context);
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index 9a27d3f4..ab58c037 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -20,14 +20,34 @@ class Providers {
 
   const Providers(String this.via);
 
+  static const String viaRest = "rest";
+  static const String viaWebsocket = "websocket";
+  static const String viaGraphQL = "graphql";
+
+  /// Use [viaRest] instead.
+  @deprecated
   static const String VIA_REST = "rest";
+
+  /// Use [viaWebSocket] instead.
+  @deprecated
   static const String VIA_WEBSOCKET = "websocket";
 
+  /// Use [rest] instead.
+  @deprecated
+  static const Providers REST = const Providers(viaRest);
+
+  /// Use [websocket] instead.
+  @deprecated
+  static const Providers WEBSOCKET = const Providers(viaWebsocket);
+
   /// Represents a request via REST.
-  static final Providers REST = const Providers(VIA_REST);
+  static const Providers rest = const Providers(viaRest);
 
   /// Represents a request over WebSockets.
-  static final Providers WEBSOCKET = const Providers(VIA_WEBSOCKET);
+  static const Providers websocket = const Providers(viaWebsocket);
+
+  /// Represents a request parsed from GraphQL.
+  static const Providers graphql = const Providers(viaGraphQL);
 
   @override
   bool operator ==(other) => other is Providers && other.via == via;
@@ -38,13 +58,17 @@ class Providers {
 /// Heavily inspired by FeathersJS. <3
 class Service extends Routable {
   /// A [List] of keys that services should ignore, should they see them in the query.
-  static const List<String> SPECIAL_QUERY_KEYS = const [
+  static const List<String> specialQueryKeys = const [
     r'$limit',
     r'$sort',
     'page',
     'token'
   ];
 
+  /// Use [specialQueryKeys] instead.
+  @deprecated
+  static const List<String> SPECIAL_QUERY_KEYS = specialQueryKeys;
+
   /// The [Angel] app powering this service.
   AngelBase app;
 
@@ -91,7 +115,7 @@ class Service extends Routable {
 
   /// Generates RESTful routes pointing to this class's methods.
   void addRoutes() {
-    Map restProvider = {'provider': Providers.REST};
+    Map restProvider = {'provider': Providers.rest};
 
     // Add global middleware if declared on the instance itself
     Middleware before = getAnnotation(this, Middleware);
@@ -107,8 +131,9 @@ class Service extends Routable {
         req.serviceParams
       ]));
     },
-        middleware: []..addAll(handlers)..addAll(
-            (indexMiddleware == null) ? [] : indexMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(this.create, Middleware);
     post('/', (req, ResponseContext res) async {
@@ -122,29 +147,30 @@ class Service extends Routable {
       res.statusCode = 201;
       return r;
     },
-        middleware: []..addAll(handlers)..addAll(
-            (createMiddleware == null) ? [] : createMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (createMiddleware == null) ? [] : createMiddleware.handlers));
 
     Middleware readMiddleware = getAnnotation(this.read, Middleware);
 
     get(
         '/:id',
-            (req, res) async =>
-        await this.read(
+        (req, res) async => await this.read(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
             ])),
-        middleware: []..addAll(handlers)..addAll(
-            (readMiddleware == null) ? [] : readMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
     Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
     patch(
         '/:id',
-            (req, res) async =>
-        await this.modify(
+        (req, res) async => await this.modify(
             toId(req.params['id']),
             await req.lazyBody(),
             mergeMap([
@@ -152,14 +178,15 @@ class Service extends Routable {
               restProvider,
               req.serviceParams
             ])),
-        middleware: []..addAll(handlers)..addAll(
-            (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
     Middleware updateMiddleware = getAnnotation(this.update, Middleware);
     post(
         '/:id',
-            (req, res) async =>
-        await this.update(
+        (req, res) async => await this.update(
             toId(req.params['id']),
             await req.lazyBody(),
             mergeMap([
@@ -167,12 +194,13 @@ class Service extends Routable {
               restProvider,
               req.serviceParams
             ])),
-        middleware: []..addAll(handlers)..addAll(
-            (updateMiddleware == null) ? [] : updateMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put(
         '/:id',
-            (req, res) async =>
-        await this.update(
+        (req, res) async => await this.update(
             toId(req.params['id']),
             await req.lazyBody(),
             mergeMap([
@@ -180,34 +208,38 @@ class Service extends Routable {
               restProvider,
               req.serviceParams
             ])),
-        middleware: []..addAll(handlers)..addAll(
-            (updateMiddleware == null) ? [] : updateMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
     delete(
         '/',
-            (req, res) async =>
-        await this.remove(
+        (req, res) async => await this.remove(
             null,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
             ])),
-        middleware: []..addAll(handlers)..addAll(
-            (removeMiddleware == null) ? [] : removeMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
-            (req, res) async =>
-        await this.remove(
+        (req, res) async => await this.remove(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
             ])),
-        middleware: []..addAll(handlers)..addAll(
-            (removeMiddleware == null) ? [] : removeMiddleware.handlers));
+        middleware: []
+          ..addAll(handlers)
+          ..addAll(
+              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
 
     // REST compliance
     put('/', () => throw new AngelHttpException.notFound());
diff --git a/lib/src/safe_stream_controller.dart b/lib/src/safe_stream_controller.dart
new file mode 100644
index 00000000..558d1082
--- /dev/null
+++ b/lib/src/safe_stream_controller.dart
@@ -0,0 +1,123 @@
+import 'dart:async';
+
+typedef void _InitCallback();
+
+/// A [StreamController] boilerplate that prevents memory leaks.
+abstract class SafeCtrl<T> {
+  factory SafeCtrl() => new _SingleSafeCtrl();
+
+  factory SafeCtrl.broadcast() => new _BroadcastSafeCtrl();
+
+  Stream<T> get stream;
+
+  void add(T event);
+
+  void addError(error, [StackTrace stackTrace]);
+
+  Future close();
+
+  void whenInitialized(void callback());
+}
+
+class _SingleSafeCtrl<T> implements SafeCtrl<T> {
+  StreamController<T> _stream;
+  bool _hasListener = false, _initialized = false;
+  _InitCallback _initializer;
+
+  _SingleSafeCtrl() {
+    _stream = new StreamController<T>(onListen: () {
+      _hasListener = true;
+
+      if (!_initialized && _initializer != null) {
+        _initializer();
+        _initialized = true;
+      }
+    }, onPause: () {
+      _hasListener = false;
+    }, onResume: () {
+      _hasListener = true;
+    }, onCancel: () {
+      _hasListener = false;
+    });
+  }
+
+  @override
+  Stream<T> get stream => _stream.stream;
+
+  @override
+  void add(T event) {
+    if (_hasListener) _stream.add(event);
+  }
+
+  @override
+  void addError(error, [StackTrace stackTrace]) {
+    if (_hasListener) _stream.addError(error, stackTrace);
+  }
+
+  @override
+  Future close() {
+    return _stream.close();
+  }
+
+  @override
+  void whenInitialized(void callback()) {
+    if (!_initialized) {
+      if (!_hasListener)
+        _initializer = callback;
+      else {
+        _initializer();
+        _initialized = true;
+      }
+    }
+  }
+}
+
+class _BroadcastSafeCtrl<T> implements SafeCtrl<T> {
+  StreamController<T> _stream;
+  int _listeners = 0;
+  bool _initialized = false;
+  _InitCallback _initializer;
+
+  _BroadcastSafeCtrl() {
+    _stream = new StreamController<T>.broadcast(onListen: () {
+      _listeners++;
+
+      if (!_initialized && _initializer != null) {
+        _initializer();
+        _initialized = true;
+      }
+    }, onCancel: () {
+      _listeners--;
+    });
+  }
+
+  @override
+  Stream<T> get stream => _stream.stream;
+
+  @override
+  void add(T event) {
+    if (_listeners > 0) _stream.add(event);
+  }
+
+  @override
+  void addError(error, [StackTrace stackTrace]) {
+    if (_listeners > 0) _stream.addError(error, stackTrace);
+  }
+
+  @override
+  Future close() {
+    return _stream.close();
+  }
+
+  @override
+  void whenInitialized(void callback()) {
+    if (!_initialized) {
+      if (_listeners <= 0)
+        _initializer = callback;
+      else {
+        _initializer();
+        _initialized = true;
+      }
+    }
+  }
+}
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
new file mode 100644
index 00000000..405c6cde
--- /dev/null
+++ b/performance/hello/main.dart
@@ -0,0 +1,27 @@
+/// A basic server that prints "Hello, world!"
+library performance.hello;
+
+import 'dart:io';
+import 'dart:isolate';
+import 'package:angel_framework/angel_framework.dart';
+
+main() {
+  for (int i = 0; i < Platform.numberOfProcessors - 1; i++)
+    Isolate.spawn(start, i + 1);
+  start(0);
+}
+
+void start(int id) {
+  var app = new Angel.custom(startShared)
+    ..lazyParseBodies = true
+    ..get('/', (req, res) => res.write('Hello, world!'))
+    ..optimizeForProduction(force: true)
+    ..fatalErrorStream.listen((e) {
+      print('Oops: ${e.error}');
+      print(e.stack);
+    });
+  app.startServer(InternetAddress.LOOPBACK_IP_V4, 3000).then((server) {
+    print(
+        'Instance #$id listening at http://${server.address.address}:${server.port}');
+  });
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index 267e1702..344c0dd4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,14 +7,15 @@ environment:
   sdk: ">=1.19.0"
 dependencies:
   angel_model: ^1.0.0
-  angel_route: ^1.0.0-dev
+  angel_route: ">=1.0.5 <2.0.0"
   body_parser: ^1.0.0-dev
   container: ^0.1.2
   flatten: ^1.0.0
   json_god: ^2.0.0-beta
   merge_map: ^1.0.0
-  random_string: ^0.0.1
+  meta: ^1.0.0
   mime: ^0.9.3
+  random_string: ^0.0.1
 dev_dependencies:
   mock_request: ^1.0.0
   http: ^0.11.3
diff --git a/test/exception_test.dart b/test/exception_test.dart
index f1db47ff..ae00dc5d 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -2,58 +2,35 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:matcher/matcher.dart';
+import 'package:meta/meta.dart';
 import 'package:test/test.dart';
 
 main() {
   test('named constructors', () {
     expect(new AngelHttpException.badRequest(),
         isException(HttpStatus.BAD_REQUEST, '400 Bad Request'));
-    expect(new AngelHttpException.BadRequest(),
-        isException(HttpStatus.BAD_REQUEST, '400 Bad Request'));
     expect(new AngelHttpException.notAuthenticated(),
         isException(HttpStatus.UNAUTHORIZED, '401 Not Authenticated'));
-    expect(new AngelHttpException.NotAuthenticated(),
-        isException(HttpStatus.UNAUTHORIZED, '401 Not Authenticated'));
     expect(new AngelHttpException.paymentRequired(),
         isException(HttpStatus.PAYMENT_REQUIRED, '402 Payment Required'));
-    expect(new AngelHttpException.PaymentRequired(),
-        isException(HttpStatus.PAYMENT_REQUIRED, '402 Payment Required'));
     expect(new AngelHttpException.forbidden(),
         isException(HttpStatus.FORBIDDEN, '403 Forbidden'));
-    expect(new AngelHttpException.Forbidden(),
-        isException(HttpStatus.FORBIDDEN, '403 Forbidden'));
     expect(new AngelHttpException.notFound(),
         isException(HttpStatus.NOT_FOUND, '404 Not Found'));
-    expect(new AngelHttpException.NotFound(),
-        isException(HttpStatus.NOT_FOUND, '404 Not Found'));
     expect(new AngelHttpException.methodNotAllowed(),
         isException(HttpStatus.METHOD_NOT_ALLOWED, '405 Method Not Allowed'));
-    expect(new AngelHttpException.MethodNotAllowed(),
-        isException(HttpStatus.METHOD_NOT_ALLOWED, '405 Method Not Allowed'));
     expect(new AngelHttpException.notAcceptable(),
         isException(HttpStatus.NOT_ACCEPTABLE, '406 Not Acceptable'));
-    expect(new AngelHttpException.NotAcceptable(),
-        isException(HttpStatus.NOT_ACCEPTABLE, '406 Not Acceptable'));
     expect(new AngelHttpException.methodTimeout(),
         isException(HttpStatus.REQUEST_TIMEOUT, '408 Timeout'));
-    expect(new AngelHttpException.MethodTimeout(),
-        isException(HttpStatus.REQUEST_TIMEOUT, '408 Timeout'));
     expect(new AngelHttpException.conflict(),
         isException(HttpStatus.CONFLICT, '409 Conflict'));
-    expect(new AngelHttpException.Conflict(),
-        isException(HttpStatus.CONFLICT, '409 Conflict'));
     expect(new AngelHttpException.notProcessable(),
         isException(422, '422 Not Processable'));
-    expect(new AngelHttpException.NotProcessable(),
-        isException(422, '422 Not Processable'));
     expect(new AngelHttpException.notImplemented(),
         isException(HttpStatus.NOT_IMPLEMENTED, '501 Not Implemented'));
-    expect(new AngelHttpException.NotImplemented(),
-        isException(HttpStatus.NOT_IMPLEMENTED, '501 Not Implemented'));
     expect(new AngelHttpException.unavailable(),
         isException(HttpStatus.SERVICE_UNAVAILABLE, '503 Unavailable'));
-    expect(new AngelHttpException.Unavailable(),
-        isException(HttpStatus.SERVICE_UNAVAILABLE, '503 Unavailable'));
   });
 
   test('fromMap', () {
@@ -91,7 +68,7 @@ class _IsException extends Matcher {
       description.add('has status code $statusCode and message "$message"');
 
   @override
-  bool matches(AngelHttpException item, Map matchState) {
+  bool matches(@checked AngelHttpException item, Map matchState) {
     return item.statusCode == statusCode && item.message == message;
   }
 }
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 183ac2f6..e6c955de 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -13,9 +13,7 @@ testMiddlewareMetadata(RequestContext req, ResponseContext res) async {
 class QueryService extends Service {
   @override
   @Middleware(const ['interceptor'])
-  read(id, [Map params]) {
-    return params;
-  }
+  read(id, [Map params]) async => params;
 }
 
 main() {
diff --git a/test/services_test.dart b/test/services_test.dart
index fa402f0a..bfdc4595 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'package:angel_framework/src/defs.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
@@ -44,13 +45,8 @@ main() {
       var response = await client.get("$url/todos/");
       print(response.body);
       expect(response.body, equals('[]'));
-      for (int i = 0; i < 3; i++) {
-        String postData = god.serialize({'text': 'Hello, world!'});
-        await client.post("$url/todos", headers: headers, body: postData);
-      }
-      response = await client.get("$url/todos");
       print(response.body);
-      expect(god.deserialize(response.body).length, equals(3));
+      expect(JSON.decode(response.body).length, 0);
     });
 
     test('can create data', () async {
@@ -100,15 +96,12 @@ main() {
 
     test('can delete data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers, body: postData);
-      var response = await client.delete("$url/todos/0");
+      var created = await client.post("$url/todos", headers: headers, body: postData).then((r) => JSON.decode(r.body));
+      var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
       expect(json['text'], equals('Hello, world!'));
-      response = await client.get("$url/todos");
-      print(response.body);
-      expect(god.deserialize(response.body).length, equals(0));
     });
   });
 }

From 3599e83ecf978587fe9e9619610a63bf63c80c26 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 3 Aug 2017 12:42:16 -0400
Subject: [PATCH 143/414] Remove reopen

---
 CHANGELOG.md                       |  2 ++
 lib/src/http/response_context.dart | 18 ------------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db0ebd82..0fec777b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ patterns, to prevent memory leaks.
 * Removed the inheritance on `Extensible` in many classes, and removed it from `angel_route`.
 Now, only `Angel` and `RequestContext` have `@proxy` annotations.
 * Deprecated passing `debug` to Angel.
+* `_LockableBytesBuilder` now uses `Uint8List`.
+* Removed `reopen` from `ResponseContext`.
 
 # 1.0.7+2
 Changed `ResponseContext.serialize`. The `contentType` is now set *before* serialization.
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 08bd6972..3ce2b4f7 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -145,16 +145,6 @@ class ResponseContext implements StringSink {
     _isOpen = false;
   }
 
-  /// Re-opens a closed response. **NEVER USE THIS IN A PLUGIN**.
-  ///
-  /// To preserve your sanity, don't use it ever. This is solely for internal use.
-  ///
-  /// You're going to need this one day, and you'll be happy it was added.
-  void reopen() {
-    _buffer._reopen();
-    _isOpen = true;
-  }
-
   /// Sets a response header to the given value, or retrieves its value.
   @Deprecated('Please use `headers` instead.')
   header(String key, [String value]) {
@@ -361,8 +351,6 @@ abstract class _LockableBytesBuilder extends BytesBuilder {
   factory _LockableBytesBuilder() => new _LockableBytesBuilderImpl();
 
   void _lock();
-
-  void _reopen();
 }
 
 class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
@@ -376,12 +364,6 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
   void _lock() {
     _closed = true;
   }
-
-  @override
-  void _reopen() {
-    _closed = false;
-  }
-
   @override
   void add(List<int> bytes) {
     if (_closed)

From 917713bbc364d20a7ccc65992a0ed56887ab01f9 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Thu, 3 Aug 2017 13:52:10 -0400
Subject: [PATCH 144/414] 1.0.8

---
 .../performance__hello__raw.xml               |   8 +
 .idea/workspace.xml                           | 255 ++++++++++++------
 performance/hello/angel.md                    |  62 +++++
 performance/hello/raw.dart                    |  28 ++
 performance/hello/raw.md                      |  60 +++++
 pubspec.yaml                                  |   2 +-
 6 files changed, 326 insertions(+), 89 deletions(-)
 create mode 100644 .idea/runConfigurations/performance__hello__raw.xml
 create mode 100644 performance/hello/angel.md
 create mode 100644 performance/hello/raw.dart
 create mode 100644 performance/hello/raw.md

diff --git a/.idea/runConfigurations/performance__hello__raw.xml b/.idea/runConfigurations/performance__hello__raw.xml
new file mode 100644
index 00000000..a13c2280
--- /dev/null
+++ b/.idea/runConfigurations/performance__hello__raw.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="performance::hello::raw" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true">
+    <option name="checkedMode" value="false" />
+    <option name="filePath" value="$PROJECT_DIR$/performance/hello/raw.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b7eb8194..56a70f18 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,28 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/analysis_options.yaml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/extensible.dart" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello__raw.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/angel.md" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/raw.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/raw.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/exception_test.dart" afterPath="$PROJECT_DIR$/test/exception_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -47,11 +31,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="21">
+              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="147">
-              <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
+              <caret line="7" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
               <folding>
                 <element signature="e#75#92#0" expanded="true" />
               </folding>
@@ -71,12 +65,65 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5379">
-              <caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
-              <folding />
+            <state relative-caret-position="116">
+              <caret line="145" column="3" lean-forward="false" selection-start-line="145" selection-start-column="3" selection-end-line="145" selection-end-column="3" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="357">
+                <caret line="17" column="42" lean-forward="false" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="84">
+                <caret line="4" column="9" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="235">
+              <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+              <folding>
+                <element signature="e#75#92#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="raw.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/raw.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="231">
+                <caret line="11" column="7" lean-forward="false" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
+                <folding />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -176,12 +223,9 @@
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
@@ -189,6 +233,12 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/angel.md" />
+        <option value="$PROJECT_DIR$/performance/hello/raw.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -352,7 +402,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.performance::hello">
+  <component name="RunManager" selected="Dart Command Line App.performance::hello::raw">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -500,7 +550,7 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="21">
+    <list size="22">
       <item index="0" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
       <item index="1" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
       <item index="2" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
@@ -522,6 +572,7 @@
       <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
       <item index="19" class="java.lang.String" itemvalue="Dart Test.All Tests" />
       <item index="20" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -564,7 +615,7 @@
       <workItem from="1499805699713" duration="409000" />
       <workItem from="1499967777286" duration="36000" />
       <workItem from="1500824399224" duration="86000" />
-      <workItem from="1501768538452" duration="9813000" />
+      <workItem from="1501768538452" duration="11180000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -748,7 +799,21 @@
       <option name="project" value="LOCAL" />
       <updated>1500824472581</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="Working on 1.0.8, including performance tuning">
+      <created>1501778421241</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1501778421241</updated>
+    </task>
+    <task id="LOCAL-00028" summary="Remove reopen">
+      <created>1501778536483</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1501778536483</updated>
+    </task>
+    <option name="localTasksCounter" value="29" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -784,7 +849,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="35982000" />
+    <option name="totallyTimeSpent" value="37349000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -805,7 +870,7 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -831,7 +896,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Re-designed exception" />
     <MESSAGE value="Core done?" />
     <MESSAGE value="Fixed todo" />
     <MESSAGE value="Done???" />
@@ -855,34 +919,15 @@
     <MESSAGE value="Added RequestContext.accepts" />
     <MESSAGE value="Swapped to angel_model" />
     <MESSAGE value="1.0.7+2" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.7+2" />
+    <MESSAGE value="Working on 1.0.8, including performance tuning" />
+    <MESSAGE value="Remove reopen" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove reopen" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="563">
-          <caret line="74" column="0" lean-forward="false" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="38" lean-forward="true" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/Program Files/Dart/dart-sdk/lib/io/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="284">
@@ -1130,14 +1175,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="167">
@@ -1206,17 +1243,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="315">
-            <caret line="15" column="38" lean-forward="false" selection-start-line="15" selection-start-column="38" selection-end-line="15" selection-end-column="38" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -1251,16 +1277,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
-          <folding>
-            <element signature="e#75#92#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-5090">
@@ -1273,8 +1289,71 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5379">
-          <caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
+        <state relative-caret-position="116">
+          <caret line="145" column="3" lean-forward="false" selection-start-line="145" selection-start-column="3" selection-end-line="145" selection-end-column="3" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="357">
+            <caret line="17" column="42" lean-forward="false" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="235">
+          <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="84">
+            <caret line="4" column="9" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="231">
+            <caret line="11" column="7" lean-forward="false" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
           <folding />
         </state>
       </provider>
diff --git a/performance/hello/angel.md b/performance/hello/angel.md
new file mode 100644
index 00000000..e231e08c
--- /dev/null
+++ b/performance/hello/angel.md
@@ -0,0 +1,62 @@
+# Angel Results
+5 consecutive trials run on a Windows 10 box with 4GB RAM, and several programs open in the background.
+
+Setup:
+* Angel framework `1.0.8`
+* Running `wrk` 4.0.2.2
+* 2 threads
+* 256 connections
+* 30 seconds
+
+Average:
+* `11070.18` req/sec
+* `11.86` ms latency
+
+```
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency    12.23ms    7.56ms 206.05ms   93.09%
+    Req/Sec     5.48k   761.94     7.18k    87.50%
+  324822 requests in 30.06s, 62.88MB read
+Requests/sec:  10806.24
+Transfer/sec:      2.09MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency    11.06ms    4.88ms 134.86ms   78.68%
+    Req/Sec     5.98k   539.40     7.50k    91.40%
+  356355 requests in 30.11s, 68.99MB read
+Requests/sec:  11836.11
+Transfer/sec:      2.29MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency    12.03ms    6.18ms 159.93ms   87.89%
+    Req/Sec     5.52k     0.88k    7.32k    90.31%
+  327749 requests in 30.06s, 63.45MB read
+Requests/sec:  10901.35
+Transfer/sec:      2.11MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency    12.92ms    7.06ms 189.00ms   82.48%
+    Req/Sec     5.12k     1.00k    6.42k    75.59%
+  302273 requests in 30.05s, 58.52MB read
+Requests/sec:  10059.96
+Transfer/sec:      1.95MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency    11.05ms    4.92ms 104.90ms   69.57%
+    Req/Sec     5.95k     0.87k    7.65k    76.80%
+  352798 requests in 30.03s, 68.30MB read
+Requests/sec:  11747.23
+Transfer/sec:      2.27MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$
+```
\ No newline at end of file
diff --git a/performance/hello/raw.dart b/performance/hello/raw.dart
new file mode 100644
index 00000000..6fb20f5d
--- /dev/null
+++ b/performance/hello/raw.dart
@@ -0,0 +1,28 @@
+/// A basic server that prints "Hello, world!"
+library performance.hello;
+
+import 'dart:io';
+import 'dart:isolate';
+
+main() {
+  for (int i = 0; i < Platform.numberOfProcessors - 1; i++)
+    Isolate.spawn(start, i + 1);
+  start(0);
+}
+
+void start(int id) {
+  HttpServer
+      .bind(InternetAddress.LOOPBACK_IP_V4, 3000, shared: true)
+      .then((server) {
+    print(
+        'Instance #$id listening at http://${server.address.address}:${server.port}');
+
+    server.listen((request) {
+      if (request.uri.path == '/') {
+        request.response.write('Hello, world!');
+      }
+
+      request.response.close();
+    });
+  });
+}
diff --git a/performance/hello/raw.md b/performance/hello/raw.md
new file mode 100644
index 00000000..0027da54
--- /dev/null
+++ b/performance/hello/raw.md
@@ -0,0 +1,60 @@
+# `dart:io` Results
+5 consecutive trials run on a Windows 10 box with 4GB RAM, and several programs open in the background.
+
+Setup:
+* Running `wrk` 4.0.2.2
+* 2 threads
+* 256 connections
+* 30 seconds
+
+Average:
+* `14598.16` req/sec
+* `8.88` ms latency
+
+```
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency     9.67ms    8.19ms 202.28ms   96.17%
+    Req/Sec     7.15k     1.47k    9.97k    73.76%
+  417716 requests in 30.07s, 82.06MB read
+Requests/sec:  13892.50
+Transfer/sec:      2.73MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency     8.47ms    3.14ms 100.77ms   65.40%
+    Req/Sec     7.61k   670.47     8.85k    73.88%
+  453301 requests in 30.07s, 89.05MB read
+Requests/sec:  15077.15
+Transfer/sec:      2.96MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency     8.62ms    3.51ms  73.34ms   63.74%
+    Req/Sec     7.52k   650.22     8.91k    79.17%
+  448445 requests in 30.07s, 88.10MB read
+Requests/sec:  14911.53
+Transfer/sec:      2.93MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency     8.75ms    3.51ms  70.50ms   64.53%
+    Req/Sec     7.41k   825.50    10.23k    72.24%
+  441338 requests in 30.09s, 86.70MB read
+Requests/sec:  14665.62
+Transfer/sec:      2.88MB
+tobe@LAPTOP-VBHCSVRH:/mnt/c/Users/thosa$ wrk -c 256 -d 30 -t 2 http://localhost:3000
+Running 30s test @ http://localhost:3000
+  2 threads and 256 connections
+  Thread Stats   Avg      Stdev     Max   +/- Stdev
+    Latency     8.90ms    3.62ms  78.36ms   66.71%
+    Req/Sec     7.31k   742.11    10.79k    77.84%
+  434674 requests in 30.09s, 85.39MB read
+Requests/sec:  14443.98
+Transfer/sec:      2.84MB
+```
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 344c0dd4..0a336817 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.7+2
+version: 1.0.8
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 3d59ec077174cd3c9e2f966616b16c397aea8124 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 15 Aug 2017 19:01:16 -0400
Subject: [PATCH 145/414] 1.0.9

---
 .idea/workspace.xml                | 655 +++++++++++++++--------------
 CHANGELOG.md                       |  11 +
 lib/hooks.dart                     |   8 +-
 lib/src/http/response_context.dart | 180 ++++++--
 lib/src/http/server.dart           | 148 ++++---
 pubspec.yaml                       |   4 +-
 test/all.dart                      |   4 +
 test/controller_test.dart          |   2 +-
 test/di_test.dart                  |   2 +-
 test/encoders_buffer_test.dart     |  94 +++++
 test/routing_test.dart             |   7 +-
 test/streaming_test.dart           |  91 ++++
 12 files changed, 800 insertions(+), 406 deletions(-)
 create mode 100644 test/encoders_buffer_test.dart
 create mode 100644 test/streaming_test.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 56a70f18..2cf90842 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello__raw.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/angel.md" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/raw.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/performance/hello/raw.md" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="1.0.8">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -31,7 +37,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="21">
@@ -41,61 +47,42 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="7" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-              <folding>
-                <element signature="e#75#92#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="209">
+              <caret line="226" column="17" lean-forward="false" selection-start-line="226" selection-start-column="17" selection-end-line="226" selection-end-column="17" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5090">
-              <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding>
-                <element signature="e#47#67#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="63">
+              <caret line="3" column="54" lean-forward="false" selection-start-line="3" selection-start-column="54" selection-end-line="3" selection-end-column="54" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="116">
-              <caret line="145" column="3" lean-forward="false" selection-start-line="145" selection-start-column="3" selection-end-line="145" selection-end-column="3" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="340">
+              <caret line="227" column="26" lean-forward="false" selection-start-line="227" selection-start-column="26" selection-end-line="227" selection-end-column="26" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="357">
-                <caret line="17" column="42" lean-forward="false" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="84">
-                <caret line="4" column="9" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
+              <first_editor relative-caret-position="189">
+                <caret line="9" column="14" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -106,7 +93,7 @@
       <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="235">
+            <state relative-caret-position="399">
               <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
               <folding>
                 <element signature="e#75#92#0" expanded="true" />
@@ -115,15 +102,44 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="raw.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/raw.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="231">
-                <caret line="11" column="7" lean-forward="false" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
-                <folding />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="228">
+              <caret line="347" column="11" lean-forward="false" selection-start-line="347" selection-start-column="11" selection-end-line="347" selection-end-column="11" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="146">
+              <caret line="46" column="20" lean-forward="false" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="438">
+              <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -139,28 +155,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>dump</find>
-      <find>void li</find>
-      <find>_onError</find>
-      <find>Unhandled exc</find>
-      <find>handleAn</find>
-      <find>Tom Fo</find>
-      <find>transform(</find>
-      <find>grab(</find>
-      <find>json(</find>
-      <find>cons</find>
-      <find>const</find>
-      <find>call</find>
-      <find>use(</find>
-      <find>value</find>
-      <find>whenI</find>
-      <find>before</find>
-      <find>afterProcessed</find>
-      <find>onco</find>
-      <find>StreamC</find>
-      <find>onCo</find>
-      <find>fatalErrorStream</find>
-      <find>handleReq</find>
       <find>handleRequest(</find>
       <find>_Lockabl</find>
       <find>takeBy</find>
@@ -169,6 +163,28 @@
       <find>sendRes</find>
       <find>replaceAll</find>
       <find>noSuch</find>
+      <find>addStre</find>
+      <find>finalizers</find>
+      <find>write</find>
+      <find>deprec</find>
+      <find>addStr</find>
+      <find>addSt</find>
+      <find>cancell</find>
+      <find>corr</find>
+      <find>buffer.</find>
+      <find>if (_isClosed)</find>
+      <find>if (_isClosed</find>
+      <find>createRespo</find>
+      <find>injectSerializer</find>
+      <find>encoders</find>
+      <find>addAll</find>
+      <find>res.enco</find>
+      <find>encodingNa</find>
+      <find>addErr</find>
+      <find>close()</find>
+      <find>.complete(</find>
+      <find>isCompl</find>
+      <find>streamFil`</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -182,6 +198,7 @@
       <replace>after</replace>
       <replace>fatalErrorStream</replace>
       <replace>onController</replace>
+      <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -209,36 +226,39 @@
         <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/common.dart" />
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -284,6 +304,20 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="framework" />
@@ -356,20 +390,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="example" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
       <pane id="Scope" />
@@ -402,7 +422,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.performance::hello::raw">
+  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -489,6 +509,16 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <configuration default="false" name="tests in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+      <option name="testName" value="encoders_buffer_test.dart" />
+      <method />
+    </configuration>
+    <configuration default="false" name="tests in streaming_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/streaming_test.dart" />
+      <option name="testName" value="streaming_test.dart" />
+      <method />
+    </configuration>
     <configuration default="false" name="can create data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -550,29 +580,31 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="22">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+    <list size="24">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -615,7 +647,8 @@
       <workItem from="1499805699713" duration="409000" />
       <workItem from="1499967777286" duration="36000" />
       <workItem from="1500824399224" duration="86000" />
-      <workItem from="1501768538452" duration="11180000" />
+      <workItem from="1501768538452" duration="11206000" />
+      <workItem from="1502831499213" duration="6562000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -813,43 +846,50 @@
       <option name="project" value="LOCAL" />
       <updated>1501778536483</updated>
     </task>
-    <option name="localTasksCounter" value="29" />
+    <task id="LOCAL-00029" summary="1.0.8">
+      <created>1501782730507</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1501782730507</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.08.03 at 12h 28m 12s.xml">
+    <history-entry file="All_Tests - 2017.08.15 at 18h 52m 20s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.08.03 at 12h 28m 30s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.08.15 at 18h 54m 11s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.08.03 at 12h 29m 18s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.08.15 at 18h 57m 36s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.08.03 at 12h 29m 49s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 15s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.08.03 at 12h 30m 12s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 24s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.08.03 at 12h 32m 21s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 39s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.08.03 at 12h 32m 35s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 52s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.08.03 at 12h 33m 22s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 51m 38s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="can_use_app_properties_like_members_in_util_test_dart - 2017.08.03 at 12h 32m 58s.xml">
-      <configuration name="can use app.properties like members in util_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 51m 54s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="can_use_app_properties_like_members_in_util_test_dart - 2017.08.03 at 12h 33m 10s.xml">
-      <configuration name="can use app.properties like members in util_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 52m 00s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="37349000" />
+    <option name="totallyTimeSpent" value="43937000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -869,15 +909,14 @@
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -886,6 +925,7 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -896,7 +936,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Core done?" />
     <MESSAGE value="Fixed todo" />
     <MESSAGE value="Done???" />
     <MESSAGE value="findExpose" />
@@ -921,55 +960,14 @@
     <MESSAGE value="1.0.7+2" />
     <MESSAGE value="Working on 1.0.8, including performance tuning" />
     <MESSAGE value="Remove reopen" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove reopen" />
+    <MESSAGE value="1.0.8" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.8" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/io/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="36" column="19" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/anonymous_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-171">
-          <caret line="9" column="2" lean-forward="false" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="28" column="9" lean-forward="true" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -1012,13 +1010,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="33" selection-end-line="19" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="441">
@@ -1030,7 +1021,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4011">
           <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1038,7 +1028,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="46" lean-forward="false" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1046,7 +1035,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
           <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1054,23 +1042,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="17" column="24" lean-forward="false" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="48" column="23" lean-forward="false" selection-start-line="48" selection-start-column="23" selection-end-line="48" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1094,9 +1065,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="97">
           <caret line="77" column="20" lean-forward="true" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1104,9 +1072,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="643">
           <caret line="70" column="23" lean-forward="false" selection-start-line="70" selection-start-column="23" selection-end-line="70" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1114,7 +1079,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
           <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1122,7 +1086,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3137">
           <caret line="67" column="2" lean-forward="false" selection-start-line="67" selection-start-column="2" selection-end-line="67" selection-end-column="2" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1130,9 +1093,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1140,9 +1100,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1150,7 +1107,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="305">
           <caret line="22" column="15" lean-forward="true" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1158,7 +1114,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="599">
           <caret line="774" column="19" lean-forward="false" selection-start-line="774" selection-start-column="19" selection-end-line="774" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1167,30 +1122,11 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="42">
             <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="109" />
-            <folding>
-              <marker date="1497837224385" expanded="true" signature="588:776" ph="{...}" />
-            </folding>
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="230" column="24" lean-forward="false" selection-start-line="230" selection-start-column="24" selection-end-line="230" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="192" column="20" lean-forward="false" selection-start-line="192" selection-start-column="20" selection-end-line="192" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/Program Files/Dart/dart-sdk/lib/core/string.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="95">
@@ -1203,34 +1139,16 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
           <caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="8" lean-forward="false" selection-start-line="3" selection-start-column="8" selection-end-line="3" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="189">
           <caret line="39" column="35" lean-forward="true" selection-start-line="39" selection-start-column="35" selection-end-line="39" selection-end-column="35" />
           <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="735">
-          <caret line="35" column="25" lean-forward="false" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#42#62#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1239,7 +1157,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="42">
           <caret line="106" column="5" lean-forward="true" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,7 +1164,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
           <caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1255,7 +1171,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="277">
           <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1263,7 +1178,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="84">
           <caret line="4" column="31" lean-forward="false" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1271,63 +1185,19 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="475">
           <caret line="142" column="39" lean-forward="false" selection-start-line="142" selection-start-column="39" selection-end-line="142" selection-end-column="39" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5090">
-          <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+        <state relative-caret-position="294">
+          <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
           <folding>
             <element signature="e#47#67#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="145" column="3" lean-forward="false" selection-start-line="145" selection-start-column="3" selection-end-line="145" selection-end-column="3" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="357">
-            <caret line="17" column="42" lean-forward="false" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-          <folding>
-            <element signature="e#75#92#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="235">
-          <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
-          <folding>
-            <element signature="e#75#92#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1350,6 +1220,92 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="284">
+          <caret line="80" column="9" lean-forward="false" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="59">
+          <caret line="549" column="8" lean-forward="false" selection-start-line="549" selection-start-column="8" selection-end-line="565" selection-end-column="9" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="474">
+          <caret line="66" column="62" lean-forward="false" selection-start-line="66" selection-start-column="62" selection-end-line="66" selection-end-column="62" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="227" column="26" lean-forward="false" selection-start-line="227" selection-start-column="26" selection-end-line="227" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="209">
+          <caret line="226" column="17" lean-forward="false" selection-start-line="226" selection-start-column="17" selection-end-line="226" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib/src/response.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="94" column="23" lean-forward="false" selection-start-line="94" selection-start-column="23" selection-end-line="94" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="3" column="54" lean-forward="false" selection-start-line="3" selection-start-column="54" selection-end-line="3" selection-end-column="54" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -1358,5 +1314,60 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="347" column="11" lean-forward="false" selection-start-line="347" selection-start-column="11" selection-end-line="347" selection-end-column="11" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="46" column="20" lean-forward="false" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="189">
+            <caret line="9" column="14" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fec777b..b44c2ec5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 1.0.9
+* Closed [#161](https://github.com/angel-dart/framework/issues/161). `addCreated`/`addUpdatedAt` no longer
+crash when `serialize` is `false`.
+* Added an explicit on `charcode`, `path`, and others. Resolves
+[#160](https://github.com/angel-dart/framework/issues/160).
+* `ResponseContext` now implements `StreamSink<List<int>`, so data can be streamed directly to the
+underlying response.
+* You can now inject `encoders` into a `ResponseContext`, which takes care of `Accept-Encoding`.
+This will ultimately replace `package:angel_compress`.
+Resolves [#159](https://github.com/angel-dart/framework/issues/159).
+
 # 1.0.8
 * Changed `req.query` to use a modifiable Map if the body has not parsed. Resolves
 [#157](https://github.com/angel-dart/framework/issues/157).
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 4e165c47..04975215 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -220,11 +220,11 @@ HookedServiceEventListener disable([provider]) {
 ///
 /// Default key: `createdAt`
 HookedServiceEventListener addCreatedAt(
-    {assign(obj, String now), String key, bool serialize: true}) {
+    {assign(obj, now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'createdAt';
 
   return (HookedServiceEvent e) async {
-    _assign(obj, String now) {
+    _assign(obj, now) {
       if (assign != null)
         return assign(obj, now);
       else if (obj is Map)
@@ -269,11 +269,11 @@ HookedServiceEventListener addUpatedAt({
 ///
 /// Default key: `updatedAt`
 HookedServiceEventListener addUpdatedAt(
-    {assign(obj, String now), String key, bool serialize: true}) {
+    {assign(obj, now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'updatedAt';
 
   return (HookedServiceEvent e) async {
-    _assign(obj, String now) {
+    _assign(obj, now) {
       if (assign != null)
         return assign(obj, now);
       else if (obj is Map)
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 3ce2b4f7..034f1d5c 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -9,6 +9,7 @@ import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
 import 'server.dart' show Angel;
 import 'controller.dart';
+import 'request_context.dart';
 
 final RegExp _contentType =
     new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
@@ -19,11 +20,14 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef String ResponseSerializer(data);
 
 /// A convenience wrapper around an outgoing HTTP request.
-class ResponseContext implements StringSink {
-  final _LockableBytesBuilder _buffer = new _LockableBytesBuilder();
-  final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
+class ResponseContext implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
-  bool _isOpen = true, _isClosed = false;
+  final BytesBuilder _buffer = new _LockableBytesBuilder();
+  final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
+  final RequestContext _correspondingRequest;
+
+  Completer _done;
+  bool _isOpen = true, _isClosed = false, _useStream = false;
   int _statusCode = 200;
 
   /// The [Angel] instance that is sending a response.
@@ -35,6 +39,17 @@ class ResponseContext implements StringSink {
   /// Any and all cookies to be sent to the user.
   final List<Cookie> cookies = [];
 
+  /// A set of [Converter] objects that can be used to encode response data.
+  ///
+  /// At most one encoder will ever be used to convert data.
+  final Map<String, Converter<List<int>, List<int>>> encoders = {};
+
+  /// Points to the [RequestContext] corresponding to this response.
+  RequestContext get correspondingRequest => _correspondingRequest;
+
+  @override
+  Future get done => (_done ?? new Completer()).future;
+
   /// Headers that will be sent to the user.
   Map<String, String> get headers {
     /// If the response is closed, then this getter will return an immutable `Map`.
@@ -74,8 +89,8 @@ class ResponseContext implements StringSink {
   /// A set of UTF-8 encoded bytes that will be written to the response.
   BytesBuilder get buffer => _buffer;
 
-  /// Sets the status code to be sent with this response.
-  @Deprecated('Please use `statusCode=` instead.')
+  /// Please use `statusCode=` instead.'
+  @deprecated
   void status(int code) {
     statusCode = code;
   }
@@ -110,7 +125,7 @@ class ResponseContext implements StringSink {
     headers[HttpHeaders.CONTENT_TYPE] = contentType.toString();
   }
 
-  ResponseContext(this.io, this.app);
+  ResponseContext(this.io, this.app, [this._correspondingRequest]);
 
   /// Set this to true if you will manually close the response.
   ///
@@ -127,15 +142,32 @@ class ResponseContext implements StringSink {
         'attachment; filename="${filename ?? file.path}"';
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     headers[HttpHeaders.CONTENT_LENGTH] = file.lengthSync().toString();
-    buffer.add(await file.readAsBytes());
-    end();
+
+    if (_useStream) {
+      await file.openRead().pipe(this);
+    } else {
+      buffer.add(await file.readAsBytes());
+      end();
+    }
   }
 
   /// Prevents more data from being written to the response, and locks it entire from further editing.
-  void close() {
-    _buffer._lock();
+  Future close() {
+    var f = new Future.value();
+
+    if (_useStream) {
+      _useStream = false;
+      _buffer?.clear();
+      f = io.close();
+    } else if (_buffer is _LockableBytesBuilder) {
+      (_buffer as _LockableBytesBuilder)._lock();
+    }
+
     _isOpen = false;
     _isClosed = true;
+
+    if (_done?.isCompleted == false) _done.complete();
+    return f;
   }
 
   /// Prevents further request handlers from running on the response, except for response finalizers.
@@ -271,7 +303,9 @@ class ResponseContext implements StringSink {
 
   /// Copies a file's contents into the response buffer.
   Future sendFile(File file,
-      {int chunkSize, int sleepMs: 0, bool resumable: true}) async {
+      {@deprecated int chunkSize,
+      @deprecated int sleepMs: 0,
+      @deprecated bool resumable: true}) async {
     if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
@@ -297,29 +331,120 @@ class ResponseContext implements StringSink {
 
   /// Streams a file to this response.
   ///
+  // ignore: deprecated_member_use
   /// You can optionally transform the file stream with a [codec].
   Future streamFile(File file,
-      {int chunkSize,
-      int sleepMs: 0,
-      bool resumable: true,
-      Codec<List<int>, List<int>> codec}) async {
+      {@deprecated int chunkSize,
+      @deprecated int sleepMs: 0,
+      @deprecated bool resumable: true,
+
+      /// Use [encoders] instead of manually specifying a codec.
+      @deprecated Codec<List<int>, List<int>> codec}) async {
     if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
-    end();
-    willCloseItself = true;
 
-    Stream stream = codec != null
-        ? file.openRead().transform(codec.encoder)
-        : file.openRead();
-    await stream.pipe(io);
+    // ignore: deprecated_member_use
+    if (codec != null) {
+      end();
+      willCloseItself = true;
+
+      // ignore: deprecated_member_use
+      Stream stream = codec != null
+          // ignore: deprecated_member_use
+          ? file.openRead().transform(codec.encoder)
+          : file.openRead();
+      await stream.pipe(io);
+    } else {
+      await file.openRead().pipe(this);
+    }
+  }
+
+  @override
+  void add(List<int> data) {
+    if (_isClosed && !_useStream)
+      throw _closed();
+    else if (_useStream)
+      io.add(data);
+    else
+      buffer.add(data);
+  }
+
+  /// Adds a stream directly the underlying dart:[io] response.
+  ///
+  /// This will also set [willCloseItself] to `true`, thus canceling out response finalizers.
+  ///
+  /// If this instance has access to a [correspondingRequest], then it will attempt to transform
+  /// the content using at most one of the response [encoders].
+  @override
+  Future addStream(Stream<List<int>> stream) {
+    if (_isClosed && !_useStream) throw _closed();
+    bool firstStream = _useStream == false;
+    willCloseItself = _useStream = _isClosed = true;
+
+    Stream<List<int>> output = stream;
+
+    if (firstStream) {
+      // If this is the first stream added to this response,
+      // then add headers, status code, etc.
+      io
+        ..statusCode = statusCode
+        ..cookies.addAll(cookies);
+      headers.forEach(io.headers.set);
+    }
+
+    if (encoders.isNotEmpty && correspondingRequest != null) {
+      var allowedEncodings =
+          (correspondingRequest.headers[HttpHeaders.ACCEPT_ENCODING] ?? [])
+              .map((str) {
+        // Ignore quality specifications in accept-encoding
+        // ex. gzip;q=0.8
+        if (!str.contains(';')) return str;
+        return str.split(';')[0];
+      });
+
+      for (var encodingName in allowedEncodings) {
+        Converter<List<int>, List<int>> encoder;
+        String key = encodingName;
+
+        if (encoders.containsKey(encodingName))
+          encoder = encoders[encodingName];
+        else if (encodingName == '*') {
+          encoder = encoders[key = encoders.keys.first];
+        }
+
+        if (encoder != null) {
+          if (firstStream) {
+            io.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+          }
+
+          output = encoders[key].bind(output);
+          break;
+        }
+      }
+    }
+
+    return io.addStream(output);
+  }
+
+  @override
+  void addError(Object error, [StackTrace stackTrace]) {
+    io.addError(error, stackTrace);
+    if (_done?.isCompleted == false) _done.completeError(error, stackTrace);
   }
 
   /// Writes data to the response.
-  void write(value, {Encoding encoding: UTF8}) {
-    if (_isClosed)
+  void write(value, {Encoding encoding}) {
+    encoding ??= UTF8;
+
+    if (_isClosed && !_useStream)
       throw _closed();
-    else {
+    else if (_useStream) {
+      if (value is List<int>)
+        io.add(value);
+      else
+        io.add(encoding.encode(value.toString()));
+    } else {
       if (value is List<int>)
         buffer.add(value);
       else
@@ -329,8 +454,10 @@ class ResponseContext implements StringSink {
 
   @override
   void writeCharCode(int charCode) {
-    if (_isClosed)
+    if (_isClosed && !_useStream)
       throw _closed();
+    else if (_useStream)
+      io.add([charCode]);
     else
       buffer.addByte(charCode);
   }
@@ -364,6 +491,7 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
   void _lock() {
     _closed = true;
   }
+
   @override
   void add(List<int> bytes) {
     if (_closed)
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 8a85cd53..0f6dc170 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -1,6 +1,7 @@
 library angel_framework.http.server;
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart' hide Extensible;
@@ -14,6 +15,7 @@ import 'angel_base.dart';
 import 'angel_http_exception.dart';
 import 'controller.dart';
 import 'fatal_error.dart';
+
 //import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -26,30 +28,37 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
 /// Handles an [AngelHttpException].
-typedef Future AngelErrorHandler(
-    AngelHttpException err, RequestContext req, ResponseContext res);
+typedef Future AngelErrorHandler(AngelHttpException err, RequestContext req,
+    ResponseContext res);
 
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
-  SafeCtrl<HttpRequest> _afterProcessed = new SafeCtrl<HttpRequest>.broadcast();
-  SafeCtrl<HttpRequest> _beforeProcessed =
-      new SafeCtrl<HttpRequest>.broadcast();
-  SafeCtrl<AngelFatalError> _fatalErrorStream =
-      new SafeCtrl<AngelFatalError>.broadcast();
-  SafeCtrl<Controller> _onController = new SafeCtrl<Controller>.broadcast();
+  final SafeCtrl<HttpRequest> _afterProcessed =
+  new SafeCtrl<HttpRequest>.broadcast();
+  final SafeCtrl<HttpRequest> _beforeProcessed =
+  new SafeCtrl<HttpRequest>.broadcast();
+  final SafeCtrl<AngelFatalError> _fatalErrorStream =
+  new SafeCtrl<AngelFatalError>.broadcast();
+  final SafeCtrl<Controller> _onController =
+  new SafeCtrl<Controller>.broadcast();
 
   final List<Angel> _children = [];
+  final Map<String, List> _handlerCache = {};
+
   Router _flattened;
   bool _isProduction;
   Angel _parent;
-  final Map<String, List> _handlerCache = {};
   ServerGenerator _serverGenerator = HttpServer.bind;
 
+  /// A global Map of converters that can transform responses bodies.
+  final Map<String, Converter<List<int>, List<int>>> encoders = {};
+
   /// A global Map of manual injections. You usually will not want to touch this.
   final Map injections = {};
+
   final Map<dynamic, InjectionRequest> _preContained = {};
   ResponseSerializer _serializer;
 
@@ -204,17 +213,17 @@ class Angel extends AngelBase {
       await service.close();
     });
 
-    for (var plugin in justBeforeStop) await plugin(this);
+    for (var plugin in justBeforeStop)
+      await plugin(this);
 
     return server;
   }
 
   @override
-  void dumpTree(
-      {callback(String tree),
-      String header: 'Dumping route tree:',
-      String tab: '  ',
-      bool showMatchers: false}) {
+  void dumpTree({callback(String tree),
+    String header: 'Dumping route tree:',
+    String tab: '  ',
+    bool showMatchers: false}) {
     if (isProduction) {
       if (_flattened == null) _flattened = flatten(this);
 
@@ -223,8 +232,8 @@ class Angel extends AngelBase {
           header: header?.isNotEmpty == true
               ? header
               : (isProduction
-                  ? 'Dumping flattened route tree:'
-                  : 'Dumping route tree:'),
+              ? 'Dumping flattened route tree:'
+              : 'Dumping route tree:'),
           tab: tab ?? '  ',
           showMatchers: showMatchers == true);
     } else {
@@ -233,8 +242,8 @@ class Angel extends AngelBase {
           header: header?.isNotEmpty == true
               ? header
               : (isProduction
-                  ? 'Dumping flattened route tree:'
-                  : 'Dumping route tree:'),
+              ? 'Dumping flattened route tree:'
+              : 'Dumping route tree:'),
           tab: tab ?? '  ',
           showMatchers: showMatchers == true);
     }
@@ -245,13 +254,18 @@ class Angel extends AngelBase {
     injections[key] = value;
   }
 
+  /// Shortcuts for adding converters to transform the response buffer/stream of any request.
+  void injectEncoders(Map<String, Converter<List<int>, List<int>>> encoders) {
+    this.encoders.addAll(encoders);
+  }
+
   /// Shortcut for adding a middleware to inject a serialize on every request.
   void injectSerializer(ResponseSerializer serializer) {
     _serializer = serializer;
   }
 
-  Future getHandlerResult(
-      handler, RequestContext req, ResponseContext res) async {
+  Future getHandlerResult(handler, RequestContext req,
+      ResponseContext res) async {
     /*if (handler is RequestMiddleware) {
       var result = await handler(req, res);
 
@@ -289,8 +303,8 @@ class Angel extends AngelBase {
   }
 
   /// Runs some [handler]. Returns `true` if request execution should continue.
-  Future<bool> executeHandler(
-      handler, RequestContext req, ResponseContext res) async {
+  Future<bool> executeHandler(handler, RequestContext req,
+      ResponseContext res) async {
     var result = await getHandlerResult(handler, req, res);
 
     if (result is bool) {
@@ -311,9 +325,12 @@ class Angel extends AngelBase {
     });
   }
 
-  Future<ResponseContext> createResponseContext(HttpResponse response) =>
-      new Future<ResponseContext>.value(new ResponseContext(response, this)
-        ..serializer = (_serializer ?? god.serialize));
+  Future<ResponseContext> createResponseContext(HttpResponse response,
+      [RequestContext correspondingRequest]) =>
+      new Future<ResponseContext>.value(
+          new ResponseContext(response, this, correspondingRequest)
+            ..serializer = (_serializer ?? god.serialize)
+            ..encoders.addAll(encoders ?? {}));
 
   /// Attempts to find a middleware by the given name within this application.
   findMiddleware(key) {
@@ -363,7 +380,7 @@ class Angel extends AngelBase {
   Future handleRequest(HttpRequest request) async {
     try {
       var req = await createRequestContext(request);
-      var res = await createResponseContext(request.response);
+      var res = await createResponseContext(request.response, req);
       String requestedUrl;
 
       // Faster way to get path
@@ -388,11 +405,12 @@ class Angel extends AngelBase {
 
       var pipeline = _handlerCache.putIfAbsent(requestedUrl, () {
         Router r =
-            isProduction ? (_flattened ?? (_flattened = flatten(this))) : this;
+        isProduction ? (_flattened ?? (_flattened = flatten(this))) : this;
         var resolved =
-            r.resolveAll(requestedUrl, requestedUrl, method: req.method);
+        r.resolveAll(requestedUrl, requestedUrl, method: req.method);
 
-        for (var result in resolved) req.params.addAll(result.allParams);
+        for (var result in resolved)
+          req.params.addAll(result.allParams);
 
         if (resolved.isNotEmpty) {
           var route = resolved.first.route;
@@ -402,7 +420,8 @@ class Angel extends AngelBase {
         var m = new MiddlewarePipeline(resolved);
         req.inject(MiddlewarePipeline, m);
 
-        return new List.from(before)..addAll(m.handlers)..addAll(after);
+        return new List.from(before)
+          ..addAll(m.handlers)..addAll(after);
       });
 
       for (var handler in pipeline) {
@@ -445,7 +464,9 @@ class Angel extends AngelBase {
 
       void _walk(Router router) {
         if (router is Angel) {
-          router..before.forEach(_add)..after.forEach(_add);
+          router
+            ..before.forEach(_add)
+            ..after.forEach(_add);
         }
 
         router.requestMiddleware.forEach((k, v) => _add(v));
@@ -467,8 +488,8 @@ class Angel extends AngelBase {
   /// Run a function after injecting from service container.
   /// If this function has been reflected before, then
   /// the execution will be faster, as the injection requirements were stored beforehand.
-  Future runContained(
-      Function handler, RequestContext req, ResponseContext res) {
+  Future runContained(Function handler, RequestContext req,
+      ResponseContext res) {
     if (_preContained.containsKey(handler)) {
       return handleContained(handler, _preContained[handler])(req, res);
     }
@@ -477,23 +498,23 @@ class Angel extends AngelBase {
   }
 
   /// Runs with DI, and *always* reflects. Prefer [runContained].
-  Future runReflected(
-      Function handler, RequestContext req, ResponseContext res) async {
+  Future runReflected(Function handler, RequestContext req,
+      ResponseContext res) async {
     var h =
-        handleContained(handler, _preContained[handler] = preInject(handler));
+    handleContained(handler, _preContained[handler] = preInject(handler));
     return await h(req, res);
     // return await closureMirror.apply(args).reflectee;
   }
 
   /// Use [sendResponse] instead.
   @deprecated
-  Future sendRequest(
-          HttpRequest request, RequestContext req, ResponseContext res) =>
+  Future sendRequest(HttpRequest request, RequestContext req,
+      ResponseContext res) =>
       sendResponse(request, req, res);
 
   /// Sends a response.
-  Future sendResponse(
-      HttpRequest request, RequestContext req, ResponseContext res,
+  Future sendResponse(HttpRequest request, RequestContext req,
+      ResponseContext res,
       {bool ignoreFinalizers: false}) {
     _afterProcessed.add(request);
 
@@ -503,7 +524,7 @@ class Angel extends AngelBase {
       Future finalizers = ignoreFinalizers == true
           ? new Future.value()
           : responseFinalizers.fold<Future>(
-              new Future.value(), (out, f) => out.then((_) => f(req, res)));
+          new Future.value(), (out, f) => out.then((_) => f(req, res)));
 
       if (res.isOpen) res.end();
 
@@ -515,10 +536,40 @@ class Angel extends AngelBase {
         ..chunkedTransferEncoding = res.chunked ?? true
         ..set(HttpHeaders.CONTENT_LENGTH, res.buffer.length);
 
+      List<int> outputBuffer = res.buffer.toBytes();
+
+      if (res.encoders.isNotEmpty) {
+        var allowedEncodings =
+        (req.headers[HttpHeaders.ACCEPT_ENCODING] ?? []).map((str) {
+          // Ignore quality specifications in accept-encoding
+          // ex. gzip;q=0.8
+          if (!str.contains(';')) return str;
+          return str.split(';')[0];
+        });
+
+        for (var encodingName in allowedEncodings) {
+          Converter<List<int>, List<int>> encoder;
+          String key = encodingName;
+
+          if (res.encoders.containsKey(encodingName))
+            encoder = res.encoders[encodingName];
+          else if (encodingName == '*') {
+            encoder = res.encoders[key = res.encoders.keys.first];
+          }
+
+          if (encoder != null) {
+            request.response.headers
+                .set(HttpHeaders.CONTENT_ENCODING, key);
+            outputBuffer = res.encoders[key].convert(outputBuffer);
+            break;
+          }
+        }
+      }
+
       request.response
         ..statusCode = res.statusCode
         ..cookies.addAll(res.cookies)
-        ..add(res.buffer.toBytes());
+        ..add(outputBuffer);
 
       return finalizers.then((_) => request.response.close());
     }
@@ -529,7 +580,9 @@ class Angel extends AngelBase {
     await configurer(this);
 
     if (configurer is Controller)
-      _onController.add(controllers[configurer.findExpose().path] = configurer);
+      _onController.add(controllers[configurer
+          .findExpose()
+          .path] = configurer);
   }
 
   /// Starts the server, wrapped in a [runZoned] call.
@@ -633,8 +686,9 @@ class Angel extends AngelBase {
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory Angel.custom(ServerGenerator serverGenerator,
-          {@deprecated bool debug: false}) =>
-      new Angel().._serverGenerator = serverGenerator;
+      {@deprecated bool debug: false}) =>
+      new Angel()
+        .._serverGenerator = serverGenerator;
 
   factory Angel.fromSecurityContext(SecurityContext context,
       {@deprecated bool debug: false}) {
@@ -655,7 +709,7 @@ class Angel extends AngelBase {
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
       {bool debug: false, String password}) {
     var certificateChain =
-        Platform.script.resolve(certificateChainPath).toFilePath();
+    Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
     var serverContext = new SecurityContext();
     serverContext.useCertificateChain(certificateChain, password: password);
diff --git a/pubspec.yaml b/pubspec.yaml
index 0a336817..0be3cf64 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.8
+version: 1.0.9
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -9,6 +9,7 @@ dependencies:
   angel_model: ^1.0.0
   angel_route: ">=1.0.5 <2.0.0"
   body_parser: ^1.0.0-dev
+  charcode: ^1.0.0
   container: ^0.1.2
   flatten: ^1.0.0
   json_god: ^2.0.0-beta
@@ -17,6 +18,7 @@ dependencies:
   mime: ^0.9.3
   random_string: ^0.0.1
 dev_dependencies:
+  matcher: ^0.12.0
   mock_request: ^1.0.0
   http: ^0.11.3
   test: ^0.12.13
diff --git a/test/all.dart b/test/all.dart
index 7cdfd9e4..f2d089d6 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -2,6 +2,7 @@ import 'accepts_test.dart' as accepts;
 import 'anonymous_service_test.dart' as anonymous_service;
 import 'controller_test.dart' as controller;
 import 'di_test.dart' as di;
+import 'encoders_buffer_test.dart' as encoders_buffer;
 import 'exception_test.dart' as exception;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
@@ -10,6 +11,7 @@ import 'routing_test.dart' as routing;
 import 'serialize_test.dart' as serialize;
 import 'server_test.dart' as server;
 import 'services_test.dart' as services;
+import 'streaming_test.dart' as streaming;
 import 'typed_service_test.dart' as typed_service;
 import 'util_test.dart' as util;
 import 'view_generator_test.dart' as view_generator;
@@ -21,6 +23,7 @@ main() {
   group('anonymous service', anonymous_service.main);
   group('controller', controller.main);
   group('di', di.main);
+  group('encoders_buffer', encoders_buffer.main);
   group('exception', exception.main);
   group('general', general.main);
   group('hooked', hooked.main);
@@ -29,6 +32,7 @@ main() {
   group('serialize', serialize.main);
   group('server', server.main);
   group('services', services.main);
+  group('streaming', streaming.main);
   group('typed_service', typed_service.main);
   group('util', util.main);
   group('view generator', view_generator.main);
diff --git a/test/controller_test.dart b/test/controller_test.dart
index e56000ae..7c371790 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -44,7 +44,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(debug: true);
+    app = new Angel();
     app.registerMiddleware("foo", (req, res) async => res.write("Hello, "));
     app.registerMiddleware("bar", (req, res) async => res.write("world!"));
     app.get(
diff --git a/test/di_test.dart b/test/di_test.dart
index 9f441c13..3882a750 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -16,7 +16,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(debug: true);
+    app = new Angel();
     client = new http.Client();
 
     // Inject some todos
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
new file mode 100644
index 00000000..47ed8812
--- /dev/null
+++ b/test/encoders_buffer_test.dart
@@ -0,0 +1,94 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+main() async {
+  Angel app;
+
+  setUp(() {
+    app = new Angel();
+    app.injectEncoders(
+      {
+        'deflate': ZLIB.encoder,
+        'gzip': GZIP.encoder,
+      },
+    );
+
+    app.get('/hello', (res) {
+      res.write('Hello, world!');
+    });
+  });
+
+  tearDown(() => app.close());
+
+  encodingTests(() => app);
+}
+
+void encodingTests(Angel getApp()) {
+  group('encoding', () {
+    Angel app;
+
+    setUp(() {
+      app = getApp();
+    });
+
+    test('sends plaintext if no accept-encoding', () async {
+      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))..close();
+      var rs = rq.response;
+      await app.handleRequest(rq);
+
+      var body = await rs.transform(UTF8.decoder).join();
+      expect(body, 'Hello, world!');
+    });
+
+    test('encodes if wildcard', () async {
+      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+        ..headers.set(HttpHeaders.ACCEPT_ENCODING, '*')
+        ..close();
+      var rs = rq.response;
+      await app.handleRequest(rq);
+
+      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
+      expect(body, ZLIB.encode(UTF8.encode('Hello, world!')));
+    });
+
+    test('encodes if wildcard + multiple', () async {
+      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['foo', 'bar', '*'])
+        ..close();
+      var rs = rq.response;
+      await app.handleRequest(rq);
+
+      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
+      expect(body, ZLIB.encode(UTF8.encode('Hello, world!')));
+    });
+
+    test('encodes if explicit', () async {
+      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+        ..headers.set(HttpHeaders.ACCEPT_ENCODING, 'gzip')
+        ..close();
+      var rs = rq.response;
+      await app.handleRequest(rq);
+
+      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
+      expect(body, GZIP.encode(UTF8.encode('Hello, world!')));
+    });
+
+    test('only uses one encoder', () async {
+      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['gzip', 'deflate'])
+        ..close();
+      var rs = rq.response;
+      await app.handleRequest(rq);
+
+      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
+      expect(body, GZIP.encode(UTF8.encode('Hello, world!')));
+    });
+  });
+}
diff --git a/test/routing_test.dart b/test/routing_test.dart
index e6c955de..b0074f69 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -24,10 +24,9 @@ main() {
   http.Client client;
 
   setUp(() async {
-    final debug = true;
-    app = new Angel(debug: debug);
-    nested = new Angel(debug: debug);
-    todos = new Angel(debug: debug);
+    app = new Angel();
+    nested = new Angel();
+    todos = new Angel();
 
     // Lazy-parse in production
     [app, nested, todos].forEach((Angel app) {
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
new file mode 100644
index 00000000..b59dc91a
--- /dev/null
+++ b/test/streaming_test.dart
@@ -0,0 +1,91 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+import 'encoders_buffer_test.dart' show encodingTests;
+
+main() async {
+  Angel app;
+
+  setUp(() {
+    app = new Angel();
+    app.injectEncoders(
+      {
+        'deflate': ZLIB.encoder,
+        'gzip': GZIP.encoder,
+      },
+    );
+
+    app.get('/hello', (res) {
+      new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]).pipe(res);
+    });
+
+    app.get('/write', (res) async {
+      await res.addStream(
+          new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
+      res.write('bye');
+      await res.close();
+    });
+
+    app.get('/multiple', (res) async {
+      await res.addStream(
+          new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
+      await res.addStream(
+          new Stream<List<int>>.fromIterable(['bye'.codeUnits]));
+      await res.close();
+    });
+
+    app.get('/overwrite', (res) async {
+      res.statusCode = 32;
+      await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+          .pipe(res);
+      await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+          .pipe(res);
+    });
+
+    app.get('/error', (res) => res.addError(new StateError('wtf')));
+
+    app.fatalErrorStream.listen((e) {
+      stderr..writeln(e.error)..writeln(e.stack);
+    });
+  });
+
+  tearDown(() => app.close());
+
+  _expectHelloBye(String path) async {
+    var rq = new MockHttpRequest('GET', Uri.parse(path))..close();
+    await app.handleRequest(rq);
+    var body = await rq.response.transform(UTF8.decoder).join();
+    expect(body, 'Hello, world!bye');
+  }
+
+  test('write after addStream', () => _expectHelloBye('/write'));
+
+  test('multiple addStream', () => _expectHelloBye('/multiple'));
+
+  test('cannot write after close', () async {
+    var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))
+      ..close();
+    await app.handleRequest(rq);
+    var body = await rq.response.transform(UTF8.decoder).join();
+
+    if (rq.response.statusCode != 32)
+      throw 'overwrite should throw error; response: $body';
+  });
+
+  test('res => addError', () async {
+    try {
+      var rq = new MockHttpRequest('GET', Uri.parse('/error'))
+        ..close();
+      await app.handleRequest(rq);
+      var body = await rq.response.transform(UTF8.decoder).join();
+      throw 'addError should throw error; response: $body';
+    } on StateError {
+      // Should throw error...
+    }
+  });
+
+  encodingTests(() => app);
+}

From 8ebe4bfbfafdc182a336d493cfbb077c74aff5fb Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Tue, 15 Aug 2017 19:08:24 -0400
Subject: [PATCH 146/414] Fix travis

---
 .idea/workspace.xml            | 346 +++++++++++++++------------------
 test/encoders_buffer_test.dart |   2 +-
 test/streaming_test.dart       |   2 +-
 tool/travis.sh                 |   4 +-
 4 files changed, 161 insertions(+), 193 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2cf90842..580b63af 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="1.0.8">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/streaming_test.dart" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tool/travis.sh" afterPath="$PROJECT_DIR$/tool/travis.sh" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -37,47 +29,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="209">
-              <caret line="226" column="17" lean-forward="false" selection-start-line="226" selection-start-column="17" selection-end-line="226" selection-end-column="17" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="3" column="54" lean-forward="false" selection-start-line="3" selection-start-column="54" selection-end-line="3" selection-end-column="54" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="227" column="26" lean-forward="false" selection-start-line="227" selection-start-column="26" selection-end-line="227" selection-end-column="26" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
@@ -90,13 +42,57 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <file leaf-file-name="view_generator_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding>
-                <element signature="e#75#92#0" expanded="true" />
+                <element signature="e#0#54#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="42">
+              <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/all.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="84">
+              <caret line="4" column="28" lean-forward="false" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="126">
+              <caret line="6" column="6" lean-forward="false" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="168">
+              <caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -155,36 +151,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>handleRequest(</find>
-      <find>_Lockabl</find>
-      <find>takeBy</find>
-      <find>from</find>
-      <find>createR</find>
-      <find>sendRes</find>
-      <find>replaceAll</find>
-      <find>noSuch</find>
-      <find>addStre</find>
-      <find>finalizers</find>
-      <find>write</find>
-      <find>deprec</find>
-      <find>addStr</find>
-      <find>addSt</find>
-      <find>cancell</find>
-      <find>corr</find>
-      <find>buffer.</find>
-      <find>if (_isClosed)</find>
-      <find>if (_isClosed</find>
-      <find>createRespo</find>
-      <find>injectSerializer</find>
-      <find>encoders</find>
-      <find>addAll</find>
-      <find>res.enco</find>
-      <find>encodingNa</find>
-      <find>addErr</find>
-      <find>close()</find>
-      <find>.complete(</find>
-      <find>isCompl</find>
       <find>streamFil`</find>
+      <find>g</find>
+      <find>group('</find>
+      <find>group(</find>
+      <find>group\'</find>
+      <find>group</find>
+      <find>group\</find>
+      <find>group\(</find>
+      <find>group\('</find>
+      <find>group\('[</find>
+      <find>group\('[^</find>
+      <find>group\('[^'</find>
+      <find>group\('[^']</find>
+      <find>group\('[^']+</find>
+      <find>group\('[^']+'</find>
+      <find>group\('[^']+',</find>
+      <find>group\('[^']+', (</find>
+      <find>group\('[^']+',</find>
+      <find>group\('[^']+', \</find>
+      <find>group\('[^']+', \()</find>
+      <find>group\('[^']+', \(</find>
+      <find>group\('[^']+', \(\</find>
+      <find>group\('[^']+', \(\) as</find>
+      <find>group\('[^']+', \(\) a</find>
+      <find>group\('[^']+', \(\)</find>
+      <find>group\('[^']+', \(\)</find>
+      <find>group\('[^']+', \(\)\s</find>
+      <find>group\('[^']+', \(\)\s*</find>
+      <find>group\('[^']+', \(\)\s*a</find>
+      <find>group\('[^']+', \(\)\s*as</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -203,6 +199,7 @@
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
+      <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -226,7 +223,6 @@
         <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
-        <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
@@ -251,14 +247,15 @@
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/tool/travis.sh" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
       </list>
     </option>
   </component>
@@ -304,6 +301,20 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="tool" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="framework" />
@@ -336,60 +347,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="http" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
       <pane id="Scope" />
@@ -648,7 +605,7 @@
       <workItem from="1499967777286" duration="36000" />
       <workItem from="1500824399224" duration="86000" />
       <workItem from="1501768538452" duration="11206000" />
-      <workItem from="1502831499213" duration="6562000" />
+      <workItem from="1502831499213" duration="6986000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -889,7 +846,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="43937000" />
+    <option name="totallyTimeSpent" value="44361000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -909,10 +866,11 @@
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3250283" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5696489" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -925,7 +883,6 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -968,13 +925,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/http/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/serialize.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
@@ -982,13 +932,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="39" lean-forward="true" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1021,6 +964,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4011">
           <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1065,6 +1009,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="97">
           <caret line="77" column="20" lean-forward="true" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1171,6 +1118,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="277">
           <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1228,14 +1176,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
@@ -1264,16 +1204,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="474">
-          <caret line="66" column="62" lean-forward="false" selection-start-line="66" selection-start-column="62" selection-end-line="66" selection-end-column="62" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
@@ -1298,14 +1228,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="54" lean-forward="false" selection-start-line="3" selection-start-column="54" selection-end-line="3" selection-end-column="54" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -1369,5 +1291,51 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="28" lean-forward="false" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="6" lean-forward="false" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 47ed8812..5879a19b 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -4,7 +4,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
-main() async {
+main() {
   Angel app;
 
   setUp(() {
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index b59dc91a..ea514341 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -6,7 +6,7 @@ import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 import 'encoders_buffer_test.dart' show encodingTests;
 
-main() async {
+main() {
   Angel app;
 
   setUp(() {
diff --git a/tool/travis.sh b/tool/travis.sh
index 97b10766..bac6b671 100644
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
-dart test/all.dart
-ANGEL_ENV=production dart test/all.dart
\ No newline at end of file
+pub run test
+ANGEL_ENV=production pub run test
\ No newline at end of file

From f2ea859b9229c1c929dfdf5a1a0837a831cf8cb4 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 28 Aug 2017 11:29:27 -0400
Subject: [PATCH 147/414] 1.0.9+1

---
 .idea/libraries/Dart_Packages.xml | 100 ++++---
 .idea/workspace.xml               | 449 +++++++++++++++++-------------
 CHANGELOG.md                      |   6 +
 lib/src/http/controller.dart      |   6 +-
 lib/src/http/server.dart          | 119 ++++----
 pubspec.yaml                      |   3 +-
 test/all.dart                     |   4 +
 test/primitives_test.dart         |  67 +++++
 test/repeat_request_test.dart     |  29 ++
 9 files changed, 485 insertions(+), 298 deletions(-)
 create mode 100644 test/primitives_test.dart
 create mode 100644 test/repeat_request_test.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 264fd455..8712f48d 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -47,7 +47,7 @@
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
             </list>
           </value>
         </entry>
@@ -68,14 +68,14 @@
         <entry key="cli_util">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
             </list>
           </value>
         </entry>
@@ -96,7 +96,7 @@
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.2/lib" />
             </list>
           </value>
         </entry>
@@ -138,7 +138,7 @@
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
             </list>
           </value>
         </entry>
@@ -170,6 +170,13 @@
             </list>
           </value>
         </entry>
+        <entry key="js">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="json_god">
           <value>
             <list>
@@ -208,7 +215,7 @@
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
             </list>
           </value>
         </entry>
@@ -222,14 +229,21 @@
         <entry key="mock_request">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="node_preamble">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_config">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
             </list>
           </value>
         </entry>
@@ -243,14 +257,14 @@
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="plugin">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
             </list>
           </value>
         </entry>
@@ -268,6 +282,13 @@
             </list>
           </value>
         </entry>
+        <entry key="quiver_hashcode">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="random_string">
           <value>
             <list>
@@ -278,21 +299,21 @@
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_packages_handler">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
             </list>
           </value>
         </entry>
@@ -327,7 +348,7 @@
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.8.0/lib" />
             </list>
           </value>
         </entry>
@@ -355,14 +376,21 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.21/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.24+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="tuple">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="typed_data">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
             </list>
           </value>
         </entry>
@@ -383,7 +411,7 @@
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
             </list>
           </value>
         </entry>
@@ -403,55 +431,59 @@
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.14.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+13/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.1+1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.0.5/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.3.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.7+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.8/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.7.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.8.0/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.21/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.3/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.24+2/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.4/lib" />
+      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
       <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
     </CLASSES>
     <SOURCES />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 580b63af..6877262e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="1.0.8">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="1.0.9+1">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/primitives_test.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/streaming_test.dart" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tool/travis.sh" afterPath="$PROJECT_DIR$/tool/travis.sh" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -33,8 +38,8 @@
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="189">
-                <caret line="9" column="14" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
+              <first_editor relative-caret-position="0">
+                <caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -42,6 +47,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="view_generator_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -64,11 +81,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="84">
-              <caret line="4" column="28" lean-forward="false" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+            <state relative-caret-position="21">
+              <caret line="1" column="15" lean-forward="false" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="561">
+              <caret line="181" column="10" lean-forward="false" selection-start-line="181" selection-start-column="10" selection-end-line="181" selection-end-column="10" />
               <folding />
             </state>
           </provider>
@@ -86,54 +113,22 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+            <state relative-caret-position="-10">
+              <caret line="398" column="0" lean-forward="true" selection-start-line="398" selection-start-column="0" selection-end-line="398" selection-end-column="0" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#38#58#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="347" column="11" lean-forward="false" selection-start-line="347" selection-start-column="11" selection-end-line="347" selection-end-column="11" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="46" column="20" lean-forward="false" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="438">
+            <state relative-caret-position="441">
               <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
               <folding />
             </state>
@@ -151,8 +146,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>streamFil`</find>
-      <find>g</find>
       <find>group('</find>
       <find>group(</find>
       <find>group\'</find>
@@ -168,7 +161,6 @@
       <find>group\('[^']+'</find>
       <find>group\('[^']+',</find>
       <find>group\('[^']+', (</find>
-      <find>group\('[^']+',</find>
       <find>group\('[^']+', \</find>
       <find>group\('[^']+', \()</find>
       <find>group\('[^']+', \(</find>
@@ -176,11 +168,14 @@
       <find>group\('[^']+', \(\) as</find>
       <find>group\('[^']+', \(\) a</find>
       <find>group\('[^']+', \(\)</find>
-      <find>group\('[^']+', \(\)</find>
       <find>group\('[^']+', \(\)\s</find>
       <find>group\('[^']+', \(\)\s*</find>
       <find>group\('[^']+', \(\)\s*a</find>
       <find>group\('[^']+', \(\)\s*as</find>
+      <find>_hand</find>
+      <find>_handle</find>
+      <find>handleContaine</find>
+      <find>_handlerC</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -229,7 +224,6 @@
         <option value="$PROJECT_DIR$/lib/common.dart" />
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
@@ -245,17 +239,20 @@
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
       </list>
     </option>
   </component>
@@ -347,10 +344,64 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="framework" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="lib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="http" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -379,7 +430,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -466,6 +517,16 @@
       <recursive>false</recursive>
       <method />
     </configuration>
+    <configuration default="false" name="tests in primitives_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/primitives_test.dart" />
+      <option name="testName" value="primitives_test.dart" />
+      <method />
+    </configuration>
+    <configuration default="false" name="tests in repeat_request_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+      <option name="testName" value="repeat_request_test.dart" />
+      <method />
+    </configuration>
     <configuration default="false" name="tests in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
       <option name="testName" value="encoders_buffer_test.dart" />
@@ -537,31 +598,33 @@
       <option name="testName" value="precontained_test.dart" />
       <method />
     </configuration>
-    <list size="24">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+    <list size="26">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -605,7 +668,8 @@
       <workItem from="1499967777286" duration="36000" />
       <workItem from="1500824399224" duration="86000" />
       <workItem from="1501768538452" duration="11206000" />
-      <workItem from="1502831499213" duration="6986000" />
+      <workItem from="1502831499213" duration="7608000" />
+      <workItem from="1503931951079" duration="2209000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -814,39 +878,39 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.08.15 at 18h 52m 20s.xml">
+    <history-entry file="All_Tests - 2017.08.28 at 11h 25m 10s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.08.15 at 18h 54m 11s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 20m 14s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.08.15 at 18h 57m 36s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 21m 03s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 15s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 04s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 24s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 16s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 39s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 23s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 50m 52s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 46s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 51m 38s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 55s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 51m 54s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 24m 16s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.08.15 at 18h 52m 00s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 24m 26s.xml">
+      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="44361000" />
+    <option name="totallyTimeSpent" value="47192000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -863,14 +927,13 @@
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5696489" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -883,6 +946,7 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -893,7 +957,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Fixed todo" />
     <MESSAGE value="Done???" />
     <MESSAGE value="findExpose" />
     <MESSAGE value="I love stack overflows!!!" />
@@ -918,27 +981,14 @@
     <MESSAGE value="Working on 1.0.8, including performance tuning" />
     <MESSAGE value="Remove reopen" />
     <MESSAGE value="1.0.8" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.8" />
+    <MESSAGE value="1.0.9+1" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.9+1" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/serialize.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="40" column="27" lean-forward="false" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2730">
@@ -964,7 +1014,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4011">
           <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -993,7 +1042,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="683">
           <caret line="139" column="71" lean-forward="true" selection-start-line="139" selection-start-column="71" selection-end-line="139" selection-end-column="71" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1001,7 +1049,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="10" column="23" lean-forward="true" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1009,9 +1056,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="97">
           <caret line="77" column="20" lean-forward="true" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1078,7 +1122,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="95">
           <caret line="295" column="0" lean-forward="true" selection-start-line="295" selection-start-column="0" selection-end-line="295" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1118,7 +1161,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="277">
           <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1151,7 +1193,6 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="84">
             <caret line="4" column="9" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
@@ -1162,7 +1203,6 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="231">
             <caret line="11" column="7" lean-forward="false" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
@@ -1180,19 +1220,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
           <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
-          <folding>
-            <element signature="e#75#92#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="59">
-          <caret line="549" column="8" lean-forward="false" selection-start-line="549" selection-start-column="8" selection-end-line="565" selection-end-column="9" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1200,15 +1227,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="227" column="26" lean-forward="false" selection-start-line="227" selection-start-column="26" selection-end-line="227" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1216,7 +1234,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="209">
           <caret line="226" column="17" lean-forward="false" selection-start-line="226" selection-start-column="17" selection-end-line="226" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1224,15 +1241,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="183">
           <caret line="94" column="23" lean-forward="false" selection-start-line="94" selection-start-column="23" selection-end-line="94" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1240,25 +1248,22 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
           <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
-          <folding>
-            <element signature="e#75#92#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
+        <state relative-caret-position="7098">
           <caret line="347" column="11" lean-forward="false" selection-start-line="347" selection-start-column="11" selection-end-line="347" selection-end-column="11" />
           <folding>
-            <element signature="e#48#68#0" expanded="true" />
+            <element signature="e#48#68#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
+        <state relative-caret-position="819">
           <caret line="46" column="20" lean-forward="false" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
           <folding />
         </state>
@@ -1274,23 +1279,12 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
+        <state relative-caret-position="441">
           <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="189">
-            <caret line="9" column="14" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1301,19 +1295,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="28" lean-forward="false" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding />
+        <state relative-caret-position="630">
+          <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1327,15 +1315,80 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="32" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-10">
+          <caret line="398" column="0" lean-forward="true" selection-start-line="398" selection-start-column="0" selection-end-line="398" selection-end-column="0" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="561">
+          <caret line="181" column="10" lean-forward="false" selection-start-line="181" selection-start-column="10" selection-end-line="181" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="32" column="39" lean-forward="false" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="42">
+          <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="1" column="15" lean-forward="false" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b44c2ec5..94a98d92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.0.9+1
+* Closed [#162](https://github.com/angel-dart/framework/issues/162), fixing a caching bug
+that would cause multiple requests to the same URL to fail.
+* Resolved dependency injection of primitives (namely `String`), no longer triggering
+errors about `String has no constructor`, etc.
+
 # 1.0.9
 * Closed [#161](https://github.com/angel-dart/framework/issues/161). `addCreated`/`addUpdatedAt` no longer
 crash when `serialize` is `false`.
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index beb760dd..811df1de 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -10,6 +10,8 @@ import 'response_context.dart';
 import 'routable.dart';
 import 'server.dart' show Angel, preInject;
 
+const List<Type> _primitiveTypes = const [String, int, num, double, Null];
+
 /// Contains a list of the data required for a DI-enabled method to run.
 ///
 /// This improves performance by removing the necessity to reflect a method
@@ -186,11 +188,11 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
           requirement.last is Type) {
         String key = requirement.first;
         Type type = requirement.last;
-
         if (req.params.containsKey(key) ||
             req.injections.containsKey(key) ||
             req.properties.containsKey(key) ||
-            req.app.properties.containsKey(key)) {
+            req.app.properties.containsKey(key) ||
+            _primitiveTypes.contains(type)) {
           inject(key);
         } else
           inject(type);
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 0f6dc170..53a445eb 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -10,6 +10,7 @@ export 'package:container/container.dart';
 import 'package:flatten/flatten.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:meta/meta.dart';
+import 'package:tuple/tuple.dart';
 import '../safe_stream_controller.dart';
 import 'angel_base.dart';
 import 'angel_http_exception.dart';
@@ -28,8 +29,8 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
 /// Handles an [AngelHttpException].
-typedef Future AngelErrorHandler(AngelHttpException err, RequestContext req,
-    ResponseContext res);
+typedef Future AngelErrorHandler(
+    AngelHttpException err, RequestContext req, ResponseContext res);
 
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
@@ -37,16 +38,16 @@ typedef Future AngelConfigurer(Angel app);
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
   final SafeCtrl<HttpRequest> _afterProcessed =
-  new SafeCtrl<HttpRequest>.broadcast();
+      new SafeCtrl<HttpRequest>.broadcast();
   final SafeCtrl<HttpRequest> _beforeProcessed =
-  new SafeCtrl<HttpRequest>.broadcast();
+      new SafeCtrl<HttpRequest>.broadcast();
   final SafeCtrl<AngelFatalError> _fatalErrorStream =
-  new SafeCtrl<AngelFatalError>.broadcast();
+      new SafeCtrl<AngelFatalError>.broadcast();
   final SafeCtrl<Controller> _onController =
-  new SafeCtrl<Controller>.broadcast();
+      new SafeCtrl<Controller>.broadcast();
 
   final List<Angel> _children = [];
-  final Map<String, List> _handlerCache = {};
+  final Map<String, Tuple3<MiddlewarePipeline, Map, Match>> _handlerCache = {};
 
   Router _flattened;
   bool _isProduction;
@@ -213,17 +214,17 @@ class Angel extends AngelBase {
       await service.close();
     });
 
-    for (var plugin in justBeforeStop)
-      await plugin(this);
+    for (var plugin in justBeforeStop) await plugin(this);
 
     return server;
   }
 
   @override
-  void dumpTree({callback(String tree),
-    String header: 'Dumping route tree:',
-    String tab: '  ',
-    bool showMatchers: false}) {
+  void dumpTree(
+      {callback(String tree),
+      String header: 'Dumping route tree:',
+      String tab: '  ',
+      bool showMatchers: false}) {
     if (isProduction) {
       if (_flattened == null) _flattened = flatten(this);
 
@@ -232,8 +233,8 @@ class Angel extends AngelBase {
           header: header?.isNotEmpty == true
               ? header
               : (isProduction
-              ? 'Dumping flattened route tree:'
-              : 'Dumping route tree:'),
+                  ? 'Dumping flattened route tree:'
+                  : 'Dumping route tree:'),
           tab: tab ?? '  ',
           showMatchers: showMatchers == true);
     } else {
@@ -242,8 +243,8 @@ class Angel extends AngelBase {
           header: header?.isNotEmpty == true
               ? header
               : (isProduction
-              ? 'Dumping flattened route tree:'
-              : 'Dumping route tree:'),
+                  ? 'Dumping flattened route tree:'
+                  : 'Dumping route tree:'),
           tab: tab ?? '  ',
           showMatchers: showMatchers == true);
     }
@@ -264,8 +265,8 @@ class Angel extends AngelBase {
     _serializer = serializer;
   }
 
-  Future getHandlerResult(handler, RequestContext req,
-      ResponseContext res) async {
+  Future getHandlerResult(
+      handler, RequestContext req, ResponseContext res) async {
     /*if (handler is RequestMiddleware) {
       var result = await handler(req, res);
 
@@ -303,8 +304,8 @@ class Angel extends AngelBase {
   }
 
   /// Runs some [handler]. Returns `true` if request execution should continue.
-  Future<bool> executeHandler(handler, RequestContext req,
-      ResponseContext res) async {
+  Future<bool> executeHandler(
+      handler, RequestContext req, ResponseContext res) async {
     var result = await getHandlerResult(handler, req, res);
 
     if (result is bool) {
@@ -326,7 +327,7 @@ class Angel extends AngelBase {
   }
 
   Future<ResponseContext> createResponseContext(HttpResponse response,
-      [RequestContext correspondingRequest]) =>
+          [RequestContext correspondingRequest]) =>
       new Future<ResponseContext>.value(
           new ResponseContext(response, this, correspondingRequest)
             ..serializer = (_serializer ?? god.serialize)
@@ -403,27 +404,25 @@ class Angel extends AngelBase {
 
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
-      var pipeline = _handlerCache.putIfAbsent(requestedUrl, () {
-        Router r =
-        isProduction ? (_flattened ?? (_flattened = flatten(this))) : this;
+      var tuple = _handlerCache.putIfAbsent(requestedUrl, () {
+        Router r = isProduction ? (_flattened ??= flatten(this)) : this;
         var resolved =
-        r.resolveAll(requestedUrl, requestedUrl, method: req.method);
-
-        for (var result in resolved)
-          req.params.addAll(result.allParams);
-
-        if (resolved.isNotEmpty) {
-          var route = resolved.first.route;
-          req.inject(Match, route.match(requestedUrl));
-        }
-
-        var m = new MiddlewarePipeline(resolved);
-        req.inject(MiddlewarePipeline, m);
-
-        return new List.from(before)
-          ..addAll(m.handlers)..addAll(after);
+            r.resolveAll(requestedUrl, requestedUrl, method: req.method);
+        return new Tuple3(
+          new MiddlewarePipeline(resolved),
+          resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
+          resolved.isEmpty ? null : resolved.first.route.match(requestedUrl),
+        );
       });
 
+      req.inject(MiddlewarePipeline, tuple.item1);
+      req.params.addAll(tuple.item2);
+      req.inject(Match, tuple.item3);
+
+      var pipeline = new List.from(before)
+        ..addAll(tuple.item1.handlers)
+        ..addAll(after);
+
       for (var handler in pipeline) {
         try {
           if (!await executeHandler(handler, req, res)) break;
@@ -464,9 +463,7 @@ class Angel extends AngelBase {
 
       void _walk(Router router) {
         if (router is Angel) {
-          router
-            ..before.forEach(_add)
-            ..after.forEach(_add);
+          router..before.forEach(_add)..after.forEach(_add);
         }
 
         router.requestMiddleware.forEach((k, v) => _add(v));
@@ -488,8 +485,8 @@ class Angel extends AngelBase {
   /// Run a function after injecting from service container.
   /// If this function has been reflected before, then
   /// the execution will be faster, as the injection requirements were stored beforehand.
-  Future runContained(Function handler, RequestContext req,
-      ResponseContext res) {
+  Future runContained(
+      Function handler, RequestContext req, ResponseContext res) {
     if (_preContained.containsKey(handler)) {
       return handleContained(handler, _preContained[handler])(req, res);
     }
@@ -498,23 +495,23 @@ class Angel extends AngelBase {
   }
 
   /// Runs with DI, and *always* reflects. Prefer [runContained].
-  Future runReflected(Function handler, RequestContext req,
-      ResponseContext res) async {
+  Future runReflected(
+      Function handler, RequestContext req, ResponseContext res) async {
     var h =
-    handleContained(handler, _preContained[handler] = preInject(handler));
+        handleContained(handler, _preContained[handler] = preInject(handler));
     return await h(req, res);
     // return await closureMirror.apply(args).reflectee;
   }
 
   /// Use [sendResponse] instead.
   @deprecated
-  Future sendRequest(HttpRequest request, RequestContext req,
-      ResponseContext res) =>
+  Future sendRequest(
+          HttpRequest request, RequestContext req, ResponseContext res) =>
       sendResponse(request, req, res);
 
   /// Sends a response.
-  Future sendResponse(HttpRequest request, RequestContext req,
-      ResponseContext res,
+  Future sendResponse(
+      HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
     _afterProcessed.add(request);
 
@@ -524,7 +521,7 @@ class Angel extends AngelBase {
       Future finalizers = ignoreFinalizers == true
           ? new Future.value()
           : responseFinalizers.fold<Future>(
-          new Future.value(), (out, f) => out.then((_) => f(req, res)));
+              new Future.value(), (out, f) => out.then((_) => f(req, res)));
 
       if (res.isOpen) res.end();
 
@@ -540,7 +537,7 @@ class Angel extends AngelBase {
 
       if (res.encoders.isNotEmpty) {
         var allowedEncodings =
-        (req.headers[HttpHeaders.ACCEPT_ENCODING] ?? []).map((str) {
+            (req.headers[HttpHeaders.ACCEPT_ENCODING] ?? []).map((str) {
           // Ignore quality specifications in accept-encoding
           // ex. gzip;q=0.8
           if (!str.contains(';')) return str;
@@ -558,8 +555,7 @@ class Angel extends AngelBase {
           }
 
           if (encoder != null) {
-            request.response.headers
-                .set(HttpHeaders.CONTENT_ENCODING, key);
+            request.response.headers.set(HttpHeaders.CONTENT_ENCODING, key);
             outputBuffer = res.encoders[key].convert(outputBuffer);
             break;
           }
@@ -580,9 +576,7 @@ class Angel extends AngelBase {
     await configurer(this);
 
     if (configurer is Controller)
-      _onController.add(controllers[configurer
-          .findExpose()
-          .path] = configurer);
+      _onController.add(controllers[configurer.findExpose().path] = configurer);
   }
 
   /// Starts the server, wrapped in a [runZoned] call.
@@ -686,9 +680,8 @@ class Angel extends AngelBase {
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory Angel.custom(ServerGenerator serverGenerator,
-      {@deprecated bool debug: false}) =>
-      new Angel()
-        .._serverGenerator = serverGenerator;
+          {@deprecated bool debug: false}) =>
+      new Angel().._serverGenerator = serverGenerator;
 
   factory Angel.fromSecurityContext(SecurityContext context,
       {@deprecated bool debug: false}) {
@@ -709,7 +702,7 @@ class Angel extends AngelBase {
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
       {bool debug: false, String password}) {
     var certificateChain =
-    Platform.script.resolve(certificateChainPath).toFilePath();
+        Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
     var serverContext = new SecurityContext();
     serverContext.useCertificateChain(certificateChain, password: password);
diff --git a/pubspec.yaml b/pubspec.yaml
index 0be3cf64..4fa991bc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.0.9
+version: 1.0.10
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -17,6 +17,7 @@ dependencies:
   meta: ^1.0.0
   mime: ^0.9.3
   random_string: ^0.0.1
+  tuple: ^1.0.0
 dev_dependencies:
   matcher: ^0.12.0
   mock_request: ^1.0.0
diff --git a/test/all.dart b/test/all.dart
index f2d089d6..392fb5e4 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -7,6 +7,8 @@ import 'exception_test.dart' as exception;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
 import 'precontained_test.dart' as precontained;
+import 'primitives_test.dart' as primitives;
+import 'repeat_request_test.dart' as repeat_request;
 import 'routing_test.dart' as routing;
 import 'serialize_test.dart' as serialize;
 import 'server_test.dart' as server;
@@ -28,6 +30,8 @@ main() {
   group('general', general.main);
   group('hooked', hooked.main);
   group('precontained', precontained.main);
+  group('primitives', primitives.main);
+  group('repeat request', repeat_request.main);
   group('routing', routing.main);
   group('serialize', serialize.main);
   group('server', server.main);
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
new file mode 100644
index 00000000..172542cf
--- /dev/null
+++ b/test/primitives_test.dart
@@ -0,0 +1,67 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+main() {
+  Angel app;
+
+  setUp(() {
+    app = new Angel()..inject('global', 305); // Pitbull!
+
+    app.get('/string/:string', (String string) => string);
+
+    app.get(
+        '/num/parsed/:num',
+        waterfall([
+          (RequestContext req) {
+            req.params['n'] = num.parse(req.params['num']);
+            return true;
+          },
+          (num n) => n,
+        ]));
+
+    app.get('/num/global', (num global) => global);
+
+    app.fatalErrorStream.listen((e) {
+      stderr..writeln(e.error)..writeln(e.stack);
+    });
+  });
+
+  tearDown(() => app.close());
+
+  test('String type annotation', () async {
+    var rq = new MockHttpRequest('GET', Uri.parse('/string/hello'))..close();
+    await app.handleRequest(rq);
+    var rs = await rq.response.transform(UTF8.decoder).join();
+    expect(rs, JSON.encode('hello'));
+  });
+
+  test('Primitive after parsed param injection', () async {
+    var rq = new MockHttpRequest('GET', Uri.parse('/num/parsed/24'))..close();
+    await app.handleRequest(rq);
+    var rs = await rq.response.transform(UTF8.decoder).join();
+    expect(rs, JSON.encode(24));
+  });
+
+  test('globally-injected primitive', () async {
+    var rq = new MockHttpRequest('GET', Uri.parse('/num/global'))..close();
+    await app.handleRequest(rq);
+    var rs = await rq.response.transform(UTF8.decoder).join();
+    expect(rs, JSON.encode(305));
+  });
+
+  test('unparsed primitive throws error', () async {
+    try {
+      var rq = new MockHttpRequest('GET', Uri.parse('/num/unparsed/32'))
+        ..close();
+      var req = await app.createRequestContext(rq);
+      var res = await app.createResponseContext(rq.response, req);
+      await app.runContained((num unparsed) => unparsed, req, res);
+      throw new StateError('ArgumentError should be thrown if a parameter cannot be resolved.');
+    } on ArgumentError {
+      // Success
+    }
+  });
+}
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
new file mode 100644
index 00000000..8f1d1c43
--- /dev/null
+++ b/test/repeat_request_test.dart
@@ -0,0 +1,29 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+main() {
+  MockHttpRequest mk(int id) {
+    return new MockHttpRequest('GET', Uri.parse('/test/$id'))..close();
+  }
+
+  test('can request the same url twice', () async {
+    var app = new Angel()..get('/test/:id', (id) => 'Hello $id');
+    var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
+    await Future.wait([rq1, rq2, rq3].map(app.handleRequest));
+    var body1 = await rq1.response.transform(UTF8.decoder).join(),
+        body2 = await rq2.response.transform(UTF8.decoder).join(),
+        body3 = await rq3.response.transform(UTF8.decoder).join();
+    print('Response #1: $body1');
+    print('Response #2: $body2');
+    print('Response #3: $body3');
+    expect(
+        body1,
+        allOf(
+          isNot(body2),
+          equals(body3),
+        ));
+  });
+}

From e9721554cc9d5588c8573b906621eb662fe41526 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Mon, 28 Aug 2017 11:40:08 -0400
Subject: [PATCH 148/414] Update README

---
 .idea/workspace.xml | 60 ++++++++++++++++++++++-----------------------
 CHANGELOG.md        |  2 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6877262e..4b7e4442 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="1.0.9+1">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/primitives_test.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -34,12 +27,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="0">
-                <caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
+                <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -47,7 +40,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="0">
@@ -251,8 +244,8 @@
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -669,7 +662,7 @@
       <workItem from="1500824399224" duration="86000" />
       <workItem from="1501768538452" duration="11206000" />
       <workItem from="1502831499213" duration="7608000" />
-      <workItem from="1503931951079" duration="2209000" />
+      <workItem from="1503931951079" duration="2851000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -874,7 +867,14 @@
       <option name="project" value="LOCAL" />
       <updated>1501782730507</updated>
     </task>
-    <option name="localTasksCounter" value="30" />
+    <task id="LOCAL-00030" summary="1.0.9+1">
+      <created>1503934167188</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1503934167188</updated>
+    </task>
+    <option name="localTasksCounter" value="31" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -910,7 +910,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47192000" />
+    <option name="totallyTimeSpent" value="47834000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -925,15 +925,16 @@
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32842582" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5696489" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5696489" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -946,7 +947,6 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -1361,6 +1361,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
@@ -1373,22 +1383,12 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="0">
-            <caret line="0" column="9" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
+            <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94a98d92..00d47205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.9+1
+# 1.0.10
 * Closed [#162](https://github.com/angel-dart/framework/issues/162), fixing a caching bug
 that would cause multiple requests to the same URL to fail.
 * Resolved dependency injection of primitives (namely `String`), no longer triggering

From 5e88ef16f951479652469147ad92aaeb52a84382 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Sep 2017 00:48:22 -0400
Subject: [PATCH 149/414] 1.1.0-alpha start

---
 .idea/libraries/Dart_Packages.xml             |  249 ++--
 .idea/libraries/Dart_SDK.xml                  |   37 +-
 .idea/modules.xml                             |    3 +-
 ...ite_after_close_in_streaming_test_dart.xml |    8 +
 .idea/workspace.xml                           | 1279 ++++++++---------
 CHANGELOG.md                                  |    4 +
 lib/angel_framework.dart                      |    3 +-
 lib/hooks.dart                                |    8 -
 lib/src/defs.dart                             |    9 -
 lib/src/fast_name_from_symbol.dart            |   14 +-
 lib/src/http/angel_http_exception.dart        |  183 ---
 lib/src/http/base_middleware.dart             |    5 -
 lib/src/http/fatal_error.dart                 |    4 +-
 lib/src/http/hooked_service.dart              |   30 +-
 lib/src/http/http.dart                        |    4 +-
 lib/src/http/map_service.dart                 |    2 +-
 lib/src/http/memory_service.dart              |  123 --
 lib/src/http/metadata.dart                    |    7 -
 lib/src/http/request_context.dart             |    6 -
 lib/src/http/response_context.dart            |   55 +-
 lib/src/http/routable.dart                    |   20 +-
 lib/src/http/server.dart                      |  206 ++-
 lib/src/http/service.dart                     |   22 +-
 pubspec.yaml                                  |    3 +-
 test/server_test.dart                         |   46 +-
 test/services_test.dart                       |    1 -
 test/streaming_test.dart                      |   14 +-
 27 files changed, 939 insertions(+), 1406 deletions(-)
 create mode 100644 .idea/runConfigurations/cannot_write_after_close_in_streaming_test_dart.xml
 delete mode 100644 lib/src/defs.dart
 delete mode 100644 lib/src/http/angel_http_exception.dart
 delete mode 100644 lib/src/http/memory_service.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 8712f48d..695dedd4 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,487 +5,496 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.30.0+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="angel_http_exception">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_model">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="async">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="barback">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
             </list>
           </value>
         </entry>
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="boolean_selector">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="charcode">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="cli_util">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="container">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="convert">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.2+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.14.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="flatten">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="front_end">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_multi_server">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_server">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="isolate">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="js">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="json_god">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="kernel">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="logging">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.1+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.1+4/lib" />
             </list>
           </value>
         </entry>
         <entry key="merge_map">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="mock_request">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="node_preamble">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_config">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_resolver">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="plugin">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.3.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="pub_semver">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="quiver_hashcode">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="random_string">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.8/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_packages_handler">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_map_stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_span">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.8.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.8.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="string_scanner">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="term_glyph">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.24+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+6/lib" />
             </list>
           </value>
         </entry>
         <entry key="tuple">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="typed_data">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="utf">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+4/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
             </list>
           </value>
         </entry>
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/analyzer-0.30.0+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/args-0.13.7/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/cli_util-0.1.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/crypto-2.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/csslib-0.14.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/isolate-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/matcher-0.12.1+1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pool-1.3.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf-0.6.8/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stack_trace-1.8.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.24+2/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+3/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
-      <root url="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.2+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.1+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.8.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 51942706..2255dbd8 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,25 +1,26 @@
 <component name="libraryTable">
   <library name="Dart SDK">
     <CLASSES>
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/async" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/collection" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/convert" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/core" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/developer" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/html" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/indexed_db" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/io" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/isolate" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/js" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/js_util" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/math" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/mirrors" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/svg" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/typed_data" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/web_audio" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/web_gl" />
-      <root url="file://C:/Program Files/Dart/dart-sdk/lib/web_sql" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/async" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/collection" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/convert" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/core" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/developer" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/html" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/indexed_db" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/io" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/isolate" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/js" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/js_util" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/math" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/mirrors" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/svg" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/typed_data" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/web_audio" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/web_gl" />
+      <root url="file:///usr/local/opt/dart/libexec/lib/web_sql" />
     </CLASSES>
+    <JAVADOC />
     <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fe3e59d4..e6494b43 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://C:\Users\thosa\Source\Angel\framework\.idea\angel_framework.iml" filepath="C:\Users\thosa\Source\Angel\framework\.idea\angel_framework.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/framework.iml" filepath="$PROJECT_DIR$/.idea/framework.iml" />
+      <module fileurl="file://$PROJECT_DIR$/framework.iml" filepath="$PROJECT_DIR$/framework.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/cannot_write_after_close_in_streaming_test_dart.xml b/.idea/runConfigurations/cannot_write_after_close_in_streaming_test_dart.xml
new file mode 100644
index 00000000..e0ee83ca
--- /dev/null
+++ b/.idea/runConfigurations/cannot_write_after_close_in_streaming_test_dart.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="cannot write after close in streaming_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/streaming_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="cannot write after close" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4b7e4442..31f93b53 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,33 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/cannot_write_after_close_in_streaming_test_dart.xml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/defs.dart" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/memory_service.dart" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/angel_framework.dart" afterPath="$PROJECT_DIR$/lib/angel_framework.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" afterPath="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" afterPath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" afterPath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/streaming_test.dart" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -21,87 +46,47 @@
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FavoritesManager">
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="0">
-                <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#22#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="view_generator_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#54#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="42">
-              <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="21">
-              <caret line="1" column="15" lean-forward="false" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
+            <state relative-caret-position="120">
+              <caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="561">
-              <caret line="181" column="10" lean-forward="false" selection-start-line="181" selection-start-column="10" selection-end-line="181" selection-end-column="10" />
+            <state relative-caret-position="452">
+              <caret line="42" column="24" lean-forward="false" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="6" column="6" lean-forward="false" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
-              <folding>
-                <element signature="e#0#22#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="167">
+              <caret line="181" column="46" lean-forward="false" selection-start-line="181" selection-start-column="46" selection-end-line="181" selection-end-column="46" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="82">
+              <caret line="160" column="101" lean-forward="false" selection-start-line="160" selection-start-column="101" selection-end-line="160" selection-end-column="101" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -109,20 +94,48 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-10">
-              <caret line="398" column="0" lean-forward="true" selection-start-line="398" selection-start-column="0" selection-end-line="398" selection-end-column="0" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="90">
+              <caret line="6" column="64" lean-forward="false" selection-start-line="6" selection-start-column="64" selection-end-line="6" selection-end-column="64" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="441">
-              <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+            <state relative-caret-position="30">
+              <caret line="2" column="20" lean-forward="true" selection-start-line="2" selection-start-column="20" selection-end-line="3" selection-end-column="64" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="88">
+              <caret line="6" column="8" lean-forward="false" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="15">
+              <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-32">
+              <caret line="4" column="64" lean-forward="false" selection-start-line="4" selection-start-column="64" selection-end-line="4" selection-end-column="64" />
               <folding />
             </state>
           </provider>
@@ -139,24 +152,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>group('</find>
-      <find>group(</find>
-      <find>group\'</find>
-      <find>group</find>
-      <find>group\</find>
-      <find>group\(</find>
-      <find>group\('</find>
-      <find>group\('[</find>
-      <find>group\('[^</find>
-      <find>group\('[^'</find>
-      <find>group\('[^']</find>
-      <find>group\('[^']+</find>
-      <find>group\('[^']+'</find>
-      <find>group\('[^']+',</find>
-      <find>group\('[^']+', (</find>
-      <find>group\('[^']+', \</find>
-      <find>group\('[^']+', \()</find>
-      <find>group\('[^']+', \(</find>
       <find>group\('[^']+', \(\</find>
       <find>group\('[^']+', \(\) as</find>
       <find>group\('[^']+', \(\) a</find>
@@ -169,6 +164,24 @@
       <find>_handle</find>
       <find>handleContaine</find>
       <find>_handlerC</find>
+      <find>angel(</find>
+      <find>depre</find>
+      <find>deprecated</find>
+      <find>close!</find>
+      <find>close(</find>
+      <find>addStream</find>
+      <find>Angel(</find>
+      <find>handleRe</find>
+      <find>createZ</find>
+      <find>aNGEL(</find>
+      <find>zone</find>
+      <find>print(</find>
+      <find>handleaNGE</find>
+      <find>print</find>
+      <find>stderr</find>
+      <find>_AFTERp</find>
+      <find>_afterProc</find>
+      <find>_beforeP</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -188,64 +201,71 @@
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
+      <dir>$PROJECT_DIR$/lib</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GradleLocalSettings">
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/test/common.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/common.dart" />
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-        <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
+        <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
       </list>
     </option>
   </component>
@@ -256,16 +276,16 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1938" />
-    <option name="height" value="1048" />
+    <option name="x" value="149" />
+    <option name="y" value="29" />
+    <option name="width" value="1168" />
+    <option name="height" value="797" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
+    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -279,122 +299,39 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="tool" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="performance" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="hello" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="framework" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="lib" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="http" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
+      <pane id="AndroidView" />
+      <pane id="Scratches" />
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <expand>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
+          </expand>
+          <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -410,6 +347,10 @@
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
     <property name="settings.editor.selected.configurable" value="dart.settings" />
     <property name="restartRequiresConfirmation" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -424,6 +365,14 @@
     </option>
   </component>
   <component name="RunManager" selected="Dart Test.All Tests">
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+    </configuration>
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -481,15 +430,6 @@
       <option name="filePath" />
       <method />
     </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="js.build_tools.npm" factoryName="npm">
       <command value="run" />
       <scripts />
@@ -510,115 +450,106 @@
       <recursive>false</recursive>
       <method />
     </configuration>
-    <configuration default="false" name="tests in primitives_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/primitives_test.dart" />
-      <option name="testName" value="primitives_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="tests in repeat_request_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/repeat_request_test.dart" />
-      <option name="testName" value="repeat_request_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="tests in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-      <option name="testName" value="encoders_buffer_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="tests in streaming_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/streaming_test.dart" />
-      <option name="testName" value="streaming_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="can create data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+    <configuration name="can create data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="can create data" />
-      <method />
     </configuration>
-    <configuration default="false" name="can delete data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+    <configuration name="can delete data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="can delete data" />
-      <method />
     </configuration>
-    <configuration default="false" name="can use app.properties like members in util_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+    <configuration name="can use app.properties like members in util_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/util_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="can use app.properties like members" />
       <option name="testRunnerOptions" value="-j 4" />
-      <method />
     </configuration>
-    <configuration default="false" name="tests in accepts_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/accepts_test.dart" />
-      <option name="testName" value="accepts_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="contains provider in before and after in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+    <configuration name="contains provider in before and after in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="contains provider in before and after" />
-      <method />
     </configuration>
-    <configuration default="false" name="tests in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
-      <option name="testName" value="server_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="tests in anonymous_service_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
-      <option name="testName" value="anonymous_service_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="tests in exception_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/exception_test.dart" />
-      <option name="testName" value="exception_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="tests in typed_service_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
-      <option name="testName" value="typed_service_test.dart" />
-      <method />
-    </configuration>
-    <configuration default="false" name="default view generator in view_generator_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+    <configuration name="default view generator in view_generator_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/view_generator_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="default view generator" />
-      <method />
     </configuration>
-    <configuration default="false" name="tests in precontained_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+    <configuration name="tests in accepts_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/accepts_test.dart" />
+      <option name="testName" value="accepts_test.dart" />
+    </configuration>
+    <configuration name="tests in anonymous_service_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
+      <option name="testName" value="anonymous_service_test.dart" />
+    </configuration>
+    <configuration name="tests in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+      <option name="testName" value="encoders_buffer_test.dart" />
+    </configuration>
+    <configuration name="tests in exception_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/exception_test.dart" />
+      <option name="testName" value="exception_test.dart" />
+    </configuration>
+    <configuration name="tests in precontained_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/precontained_test.dart" />
       <option name="testName" value="precontained_test.dart" />
-      <method />
     </configuration>
-    <list size="26">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+    <configuration name="tests in primitives_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/primitives_test.dart" />
+      <option name="testName" value="primitives_test.dart" />
+    </configuration>
+    <configuration name="tests in repeat_request_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+      <option name="testName" value="repeat_request_test.dart" />
+    </configuration>
+    <configuration name="tests in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
+      <option name="testName" value="server_test.dart" />
+    </configuration>
+    <configuration name="tests in streaming_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/streaming_test.dart" />
+      <option name="testName" value="streaming_test.dart" />
+    </configuration>
+    <configuration name="tests in typed_service_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
+      <option name="testName" value="typed_service_test.dart" />
+    </configuration>
+    <list size="27">
+      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
     </list>
+    <recent_temporary>
+      <list size="1">
+        <item index="0" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
@@ -663,6 +594,7 @@
       <workItem from="1501768538452" duration="11206000" />
       <workItem from="1502831499213" duration="7608000" />
       <workItem from="1503931951079" duration="2851000" />
+      <workItem from="1506050384140" duration="5179000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -878,39 +810,39 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.08.28 at 11h 25m 10s.xml">
+    <history-entry file="All_Tests - 2017.09.22 at 00h 26m 24s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 20m 14s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 27m 30s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 21m 03s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 28m 02s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 04s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 28m 13s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 16s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 29m 13s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 23s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 30m 31s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 46s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 31m 12s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 22m 55s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 31m 30s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 24m 16s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.22 at 00h 37m 21s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_primitives_test_dart - 2017.08.28 at 11h 24m 26s.xml">
-      <configuration name="tests in primitives_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 00h 27m 34s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47834000" />
+    <option name="totallyTimeSpent" value="53013000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -922,24 +854,34 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
+    <frame x="149" y="29" width="1168" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32842582" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32616082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3272933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34314835" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32621083" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5696489" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18455844" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295583" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56837606" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26376554" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -947,11 +889,11 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="processedProjectFiles" value="true" />
+    <option name="version" value="1" />
   </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
@@ -989,125 +931,7 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2730">
-          <caret line="135" column="30" lean-forward="true" selection-start-line="135" selection-start-column="30" selection-end-line="135" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/test-0.12.21/lib/src/frontend/expect_async.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="536">
-          <caret line="266" column="22" lean-forward="false" selection-start-line="266" selection-start-column="22" selection-end-line="266" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4011">
-          <caret line="197" column="4" lean-forward="false" selection-start-line="197" selection-start-column="4" selection-end-line="197" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="46" lean-forward="false" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/body_parser-1.0.1/lib/src/parse_body.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="17" column="24" lean-forward="false" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/async/stream_controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="683">
-          <caret line="139" column="71" lean-forward="true" selection-start-line="139" selection-start-column="71" selection-end-line="139" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/safe_stream_controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="10" column="23" lean-forward="true" selection-start-line="10" selection-start-column="23" selection-end-line="10" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="97">
-          <caret line="77" column="20" lean-forward="true" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="643">
-          <caret line="70" column="23" lean-forward="false" selection-start-line="70" selection-start-column="23" selection-end-line="70" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3137">
-          <caret line="67" column="2" lean-forward="false" selection-start-line="67" selection-start-column="2" selection-end-line="67" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/io/bytes_builder.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="305">
-          <caret line="22" column="15" lean-forward="true" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/typed_data/typed_data.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="599">
-          <caret line="774" column="19" lean-forward="false" selection-start-line="774" selection-start-column="19" selection-end-line="774" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/typed_data/typed_data.dart" />
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1118,38 +942,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/core/string.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="295" column="0" lean-forward="true" selection-start-line="295" selection-start-column="0" selection-end-line="295" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/extensible.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="8" column="6" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/core/string.dart" />
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/extensible.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="39" column="35" lean-forward="true" selection-start-line="39" selection-start-column="35" selection-end-line="39" selection-end-column="35" />
-          <folding>
-            <element signature="e#42#62#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="106" column="5" lean-forward="true" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -1164,40 +959,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="31" lean-forward="false" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="142" column="39" lean-forward="false" selection-start-line="142" selection-start-column="39" selection-end-line="142" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="84">
-            <caret line="4" column="9" lean-forward="false" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/raw.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1208,14 +969,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="80" column="9" lean-forward="false" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart" />
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
@@ -1223,27 +977,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="226" column="17" lean-forward="false" selection-start-line="226" selection-start-column="17" selection-end-line="226" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib/src/response.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="94" column="23" lean-forward="false" selection-start-line="94" selection-start-column="23" selection-end-line="94" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib/src/response.dart" />
     <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="399">
@@ -1251,21 +985,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="7098">
-          <caret line="347" column="11" lean-forward="false" selection-start-line="347" selection-start-column="11" selection-end-line="347" selection-end-column="11" />
-          <folding>
-            <element signature="e#48#68#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="819">
           <caret line="46" column="20" lean-forward="false" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1277,40 +1000,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="441">
-          <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="6" column="6" lean-forward="false" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
+            <element signature="e#0#54#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1319,19 +1014,31 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="319">
+          <caret line="32" column="39" lean-forward="false" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#22#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-10">
-          <caret line="398" column="0" lean-forward="true" selection-start-line="398" selection-start-column="0" selection-end-line="398" selection-end-column="0" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="30">
+          <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1343,52 +1050,340 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="32" column="39" lean-forward="false" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
+        <state relative-caret-position="90">
+          <caret line="6" column="6" lean-forward="false" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
           <folding>
-            <element signature="e#0#38#0" expanded="true" />
+            <element signature="e#0#22#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="1" column="15" lean-forward="false" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="0">
-            <caret line="0" column="8" lean-forward="false" selection-start-line="0" selection-start-column="8" selection-end-line="0" selection-end-column="8" />
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="61" lean-forward="false" selection-start-line="2" selection-start-column="61" selection-end-line="2" selection-end-column="61" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="103" column="28" lean-forward="false" selection-start-line="103" selection-start-column="28" selection-end-line="103" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" column="66" lean-forward="false" selection-start-line="10" selection-start-column="66" selection-end-line="10" selection-end-column="66" />
+          <folding>
+            <element signature="e#0#20#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="7" lean-forward="true" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="19" lean-forward="false" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+          <folding>
+            <element signature="e#47#67#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="40" column="25" lean-forward="false" selection-start-line="40" selection-start-column="25" selection-end-line="41" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/stream.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="574" column="9" lean-forward="false" selection-start-line="574" selection-start-column="9" selection-end-line="574" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="104">
+          <caret line="255" column="1" lean-forward="false" selection-start-line="255" selection-start-column="1" selection-end-line="255" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/errors.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="191">
+          <caret line="77" column="40" lean-forward="false" selection-start-line="77" selection-start-column="40" selection-end-line="77" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/lockable_headers.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="117" column="2" lean-forward="false" selection-start-line="117" selection-start-column="2" selection-end-line="117" selection-end-column="2" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="19" lean-forward="false" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1003">
+          <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2449">
+          <caret line="12" column="29" lean-forward="false" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="45" column="53" lean-forward="false" selection-start-line="45" selection-start-column="53" selection-end-line="45" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="452">
+          <caret line="42" column="24" lean-forward="false" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="181" column="46" lean-forward="false" selection-start-line="181" selection-start-column="46" selection-end-line="181" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="82">
+          <caret line="160" column="101" lean-forward="false" selection-start-line="160" selection-start-column="101" selection-end-line="160" selection-end-column="101" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="20" lean-forward="true" selection-start-line="2" selection-start-column="20" selection-end-line="3" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="6" column="8" lean-forward="false" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="64" lean-forward="false" selection-start-line="6" selection-start-column="64" selection-end-line="6" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-32">
+          <caret line="4" column="64" lean-forward="false" selection-start-line="4" selection-start-column="64" selection-end-line="4" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>framework</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.6" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>Dart SDK</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00d47205..b68ac2ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.0-alpha
+* Removed all `@deprecated` members.
+* Removed `@Hooked`, `beforeProcessed`, and `afterProcessed`.
+
 # 1.0.10
 * Closed [#162](https://github.com/angel-dart/framework/issues/162), fixing a caching bug
 that would cause multiple requests to the same URL to fail.
diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
index 636c6ca2..7a624d51 100644
--- a/lib/angel_framework.dart
+++ b/lib/angel_framework.dart
@@ -1,5 +1,4 @@
 /// An easily-extensible web server framework in Dart.
 library angel_framework;
 
-export 'src/http/http.dart';
-export 'src/defs.dart';
\ No newline at end of file
+export 'src/http/http.dart';
\ No newline at end of file
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 04975215..0fa5001e 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -255,14 +255,6 @@ HookedServiceEventListener addCreatedAt(
   };
 }
 
-/// Typo: Use [addUpdatedAt] instead.
-@deprecated
-HookedServiceEventListener addUpatedAt({
-  assign(obj, String now),
-  String key,
-}) =>
-    addUpdatedAt(assign: assign, key: key);
-
 /// Serializes the current time to `e.data` or `e.result`.
 /// You can provide an [assign] function to set the property on your object, and skip reflection.
 /// If [serialize] is `true` (default), then the set date will be a `String`. If not, a raw `DateTime` will be used.
diff --git a/lib/src/defs.dart b/lib/src/defs.dart
deleted file mode 100644
index fdf3da2b..00000000
--- a/lib/src/defs.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-library angel_framework.defs;
-import '../common.dart';
-export '../common.dart';
-
-/// Use [Model] instead.
-@deprecated
-class MemoryModel {
-  int id;
-}
\ No newline at end of file
diff --git a/lib/src/fast_name_from_symbol.dart b/lib/src/fast_name_from_symbol.dart
index 1460117d..adca8e9b 100644
--- a/lib/src/fast_name_from_symbol.dart
+++ b/lib/src/fast_name_from_symbol.dart
@@ -1,6 +1,10 @@
+final Map<Symbol, String> _cache = {};
+
 String fastNameFromSymbol(Symbol s) {
-  String str = s.toString();
-  int open = str.indexOf('"');
-  int close = str.lastIndexOf('"');
-  return str.substring(open + 1, close);
-}
\ No newline at end of file
+  return _cache.putIfAbsent(s, () {
+    String str = s.toString();
+    int open = str.indexOf('"');
+    int close = str.lastIndexOf('"');
+    return str.substring(open + 1, close);
+  });
+}
diff --git a/lib/src/http/angel_http_exception.dart b/lib/src/http/angel_http_exception.dart
deleted file mode 100644
index 781b5643..00000000
--- a/lib/src/http/angel_http_exception.dart
+++ /dev/null
@@ -1,183 +0,0 @@
-library angel_framework.http.angel_http_exception;
-
-import 'dart:convert';
-
-/// Basically the same as
-/// [feathers-errors](https://github.com/feathersjs/feathers-errors).
-class AngelHttpException implements Exception {
-  var error;
-
-  /// A list of errors that occurred when this exception was thrown.
-  final List<String> errors = [];
-
-  /// The cause of this exception.
-  String message;
-
-  /// The [StackTrace] associated with this error.
-  StackTrace stackTrace;
-
-  /// An HTTP status code this exception will throw.
-  int statusCode;
-
-  AngelHttpException(this.error,
-      {this.message: '500 Internal Server Error',
-      this.stackTrace,
-      this.statusCode: 500,
-      List<String> errors: const []}) {
-    if (errors != null) {
-      this.errors.addAll(errors);
-    }
-  }
-
-  Map toJson() {
-    return {
-      'isError': true,
-      'status_code': statusCode,
-      'message': message,
-      'errors': errors
-    };
-  }
-
-  Map toMap() => toJson();
-
-  @override
-  String toString() {
-    return "$statusCode: $message";
-  }
-
-  factory AngelHttpException.fromMap(Map data) {
-    return new AngelHttpException(null,
-        statusCode: data['status_code'] ?? data['statusCode'],
-        message: data['message'],
-        errors: data['errors']);
-  }
-
-  factory AngelHttpException.fromJson(String json) =>
-      new AngelHttpException.fromMap(JSON.decode(json));
-
-  /// Throws a 400 Bad Request error, including an optional arrray of (validation?)
-  /// errors you specify.
-  factory AngelHttpException.badRequest(
-          {String message: '400 Bad Request', List<String> errors: const []}) =>
-      new AngelHttpException(null,
-          message: message, errors: errors, statusCode: 400);
-
-  /// Throws a 401 Not Authenticated error.
-  factory AngelHttpException.notAuthenticated(
-          {String message: '401 Not Authenticated'}) =>
-      new AngelHttpException(null, message: message, statusCode: 401);
-
-  /// Throws a 402 Payment Required error.
-  factory AngelHttpException.paymentRequired(
-          {String message: '402 Payment Required'}) =>
-      new AngelHttpException(null, message: message, statusCode: 402);
-
-  /// Throws a 403 Forbidden error.
-  factory AngelHttpException.forbidden({String message: '403 Forbidden'}) =>
-      new AngelHttpException(null, message: message, statusCode: 403);
-
-  /// Throws a 404 Not Found error.
-  factory AngelHttpException.notFound({String message: '404 Not Found'}) =>
-      new AngelHttpException(null, message: message, statusCode: 404);
-
-  /// Throws a 405 Method Not Allowed error.
-  factory AngelHttpException.methodNotAllowed(
-          {String message: '405 Method Not Allowed'}) =>
-      new AngelHttpException(null, message: message, statusCode: 405);
-
-  /// Throws a 406 Not Acceptable error.
-  factory AngelHttpException.notAcceptable(
-          {String message: '406 Not Acceptable'}) =>
-      new AngelHttpException(null, message: message, statusCode: 406);
-
-  /// Throws a 408 Timeout error.
-  factory AngelHttpException.methodTimeout({String message: '408 Timeout'}) =>
-      new AngelHttpException(null, message: message, statusCode: 408);
-
-  /// Throws a 409 Conflict error.
-  factory AngelHttpException.conflict({String message: '409 Conflict'}) =>
-      new AngelHttpException(null, message: message, statusCode: 409);
-
-  /// Throws a 422 Not Processable error.
-  factory AngelHttpException.notProcessable(
-          {String message: '422 Not Processable'}) =>
-      new AngelHttpException(null, message: message, statusCode: 422);
-
-  /// Throws a 501 Not Implemented error.
-  factory AngelHttpException.notImplemented(
-          {String message: '501 Not Implemented'}) =>
-      new AngelHttpException(null, message: message, statusCode: 501);
-
-  /// Throws a 503 Unavailable error.
-  factory AngelHttpException.unavailable({String message: '503 Unavailable'}) =>
-      new AngelHttpException(null, message: message, statusCode: 503);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.BadRequest(
-          {String message: '400 Bad Request', List<String> errors: const []}) =>
-      new AngelHttpException(null,
-          message: message, errors: errors, statusCode: 400);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.NotAuthenticated(
-          {String message: '401 Not Authenticated'}) =>
-      new AngelHttpException(null, message: message, statusCode: 401);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.PaymentRequired(
-          {String message: '402 Payment Required'}) =>
-      new AngelHttpException(null, message: message, statusCode: 402);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.Forbidden({String message: '403 Forbidden'}) =>
-      new AngelHttpException(null, message: message, statusCode: 403);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.NotFound({String message: '404 Not Found'}) =>
-      new AngelHttpException(null, message: message, statusCode: 404);
-
-  @deprecated
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  factory AngelHttpException.MethodNotAllowed(
-          {String message: '405 Method Not Allowed'}) =>
-      new AngelHttpException(null, message: message, statusCode: 405);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.NotAcceptable(
-          {String message: '406 Not Acceptable'}) =>
-      new AngelHttpException(null, message: message, statusCode: 406);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.MethodTimeout({String message: '408 Timeout'}) =>
-      new AngelHttpException(null, message: message, statusCode: 408);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.Conflict({String message: '409 Conflict'}) =>
-      new AngelHttpException(null, message: message, statusCode: 409);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.NotProcessable(
-          {String message: '422 Not Processable'}) =>
-      new AngelHttpException(null, message: message, statusCode: 422);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.NotImplemented(
-          {String message: '501 Not Implemented'}) =>
-      new AngelHttpException(null, message: message, statusCode: 501);
-
-  /// DEPRECATED: Use lowercase constructor instead.
-  @deprecated
-  factory AngelHttpException.Unavailable({String message: '503 Unavailable'}) =>
-      new AngelHttpException(null, message: message, statusCode: 503);
-}
diff --git a/lib/src/http/base_middleware.dart b/lib/src/http/base_middleware.dart
index 662749f6..ccffb389 100644
--- a/lib/src/http/base_middleware.dart
+++ b/lib/src/http/base_middleware.dart
@@ -6,9 +6,4 @@ import 'response_context.dart';
 
 abstract class AngelMiddleware {
   Future<bool> call(RequestContext req, ResponseContext res);
-}
-
-@Deprecated('Use AngelMiddleware instead')
-abstract class BaseMiddleware {
-  Future<bool> call(RequestContext req, ResponseContext res);
 }
\ No newline at end of file
diff --git a/lib/src/http/fatal_error.dart b/lib/src/http/fatal_error.dart
index ab87ef2f..dc6bef45 100644
--- a/lib/src/http/fatal_error.dart
+++ b/lib/src/http/fatal_error.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 /// Thrown whenever Angel completely fails to respond to a request.
@@ -5,7 +6,8 @@ class AngelFatalError {
   var error;
   HttpRequest request;
   StackTrace stack;
+  Zone zone;
 
-  AngelFatalError({this.request, this.error, this.stack});
+  AngelFatalError({this.request, this.error, this.stack, this.zone});
 }
 
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 3e3fa0d5..536228ef 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -1,9 +1,9 @@
 library angel_framework.http;
 
 import 'dart:async';
+import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
-import 'angel_http_exception.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'metadata.dart';
@@ -624,34 +624,6 @@ class HookedServiceEvent {
   static const List<String> all = const [
     indexed, read, created, modified, updated, removed
   ];
-  
-  /// Use [indexed] instead.
-  @deprecated
-  static const String INDEXED = indexed;
-
-  /// Use [read] instead.
-  @deprecated
-  static const String READ = read;
-
-  /// Use [created] instead.
-  @deprecated
-  static const String CREATED = created;
-
-  /// Use [modified] instead.
-  @deprecated
-  static const String MODIFIED = modified;
-
-  /// Use [updated] instead.
-  @deprecated
-  static const String UPDATED = updated;
-
-  /// Use [removed] instead.
-  @deprecated
-  static const String REMOVED = removed;
-
-  /// Use [all] instead.
-  @deprecated
-  static const List<String> ALL = all;
 
   /// Use this to end processing of an event.
   void cancel([result]) {
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 16715d42..c260d5fa 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -4,10 +4,11 @@ library angel_framework.http;
 import 'dart:async';
 import 'dart:io';
 import 'server.dart' show ServerGenerator;
+export 'package:angel_http_exception/angel_http_exception.dart';
+export 'package:angel_model/angel_model.dart';
 export 'package:angel_route/angel_route.dart';
 export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'angel_base.dart';
-export 'angel_http_exception.dart';
 export 'anonymous_service.dart';
 export 'base_middleware.dart';
 export 'base_plugin.dart';
@@ -16,7 +17,6 @@ export 'fatal_error.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
 export 'metadata.dart';
-export 'memory_service.dart';
 export 'request_context.dart';
 export 'response_context.dart';
 export 'routable.dart';
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index cfe62f51..8e539f5e 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'angel_http_exception.dart';
+import 'package:angel_http_exception/angel_http_exception.dart';
 import 'service.dart';
 
 /// A basic service that manages an in-memory list of maps.
diff --git a/lib/src/http/memory_service.dart b/lib/src/http/memory_service.dart
deleted file mode 100644
index cf830a27..00000000
--- a/lib/src/http/memory_service.dart
+++ /dev/null
@@ -1,123 +0,0 @@
-library angel_framework.http.memory_service;
-
-import 'dart:async';
-import 'dart:mirrors';
-import 'package:json_god/json_god.dart' as god;
-import 'package:merge_map/merge_map.dart';
-import '../../common.dart';
-import 'angel_http_exception.dart';
-import 'service.dart';
-
-int _getId(id) {
-  try {
-    return int.parse(id.toString());
-  } catch (e) {
-    throw new AngelHttpException.badRequest(message: 'Invalid ID.');
-  }
-}
-
-/// DEPRECATED: Use MapService instead.
-/// 
-/// An in-memory [Service].
-@deprecated
-class MemoryService<T> extends Service {
-  /// If set to `true`, clients can remove all items by passing a `null` `id` to `remove`.
-  ///
-  /// `false` by default.
-  final bool allowRemoveAll;
-
-  //// The data contained in this service.
-  final Map<int, Model> items = {};
-
-  MemoryService({this.allowRemoveAll: false}) : super() {
-    if (!reflectType(T).isAssignableTo(reflectType(Model))) {
-      throw new Exception(
-          "MemoryServices only support classes that inherit from Model.");
-    }
-  }
-
-  _makeJson(int index, Model t) {
-    return t..id = index.toString();
-  }
-
-  Future<List> index([Map params]) async {
-    return items.keys
-        .where((index) => items[index] != null)
-        .map((index) => _makeJson(index, items[index]))
-        .toList();
-  }
-
-  Future read(id, [Map params]) async {
-    int desiredId = _getId(id);
-    if (items.containsKey(desiredId)) {
-      Model found = items[desiredId];
-      if (found != null) {
-        return _makeJson(desiredId, found);
-      } else
-        throw new AngelHttpException.notFound();
-    } else
-      throw new AngelHttpException.notFound();
-  }
-
-  Future create(data, [Map params]) async {
-    //try {
-    Model created =
-        (data is Model) ? data : god.deserializeDatum(data, outputType: T);
-
-    int size = items.length;
-    created.id = size.toString();
-    items[size] = created;
-    return created;
-    /*} catch (e) {
-      throw new AngelHttpException.BadRequest(message: 'Invalid data.');
-    }*/
-  }
-
-  Future modify(id, data, [Map params]) async {
-    int desiredId = _getId(id);
-    if (items.containsKey(desiredId)) {
-      try {
-        Map existing = god.serializeObject(items[desiredId]);
-        data = mergeMap([existing, data]);
-        items[desiredId] =
-            (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
-        return _makeJson(desiredId, items[desiredId]);
-      } catch (e) {
-        throw new AngelHttpException.badRequest(message: 'Invalid data.');
-      }
-    } else
-      throw new AngelHttpException.notFound();
-  }
-
-  Future update(id, data, [Map params]) async {
-    int desiredId = _getId(id);
-    if (items.containsKey(desiredId)) {
-      try {
-        items[desiredId] =
-            (data is Map) ? god.deserializeDatum(data, outputType: T) : data;
-        return _makeJson(desiredId, items[desiredId]);
-      } catch (e) {
-        throw new AngelHttpException.badRequest(message: 'Invalid data.');
-      }
-    } else
-      throw new AngelHttpException.notFound();
-  }
-
-  Future remove(id, [Map params]) async {
-    if (id == null ||
-        id == 'null' &&
-            (allowRemoveAll == true ||
-                params?.containsKey('provider') != true)) {
-      items.clear();
-      return {};
-    }
-
-    int desiredId = _getId(id);
-    if (items.containsKey(desiredId)) {
-      Model item = items[desiredId];
-      items[desiredId] = null;
-      return _makeJson(desiredId, item);
-    } else
-      throw new AngelHttpException.notFound();
-  }
-}
diff --git a/lib/src/http/metadata.dart b/lib/src/http/metadata.dart
index 48676510..c2180efe 100644
--- a/lib/src/http/metadata.dart
+++ b/lib/src/http/metadata.dart
@@ -9,13 +9,6 @@ class Middleware {
   const Middleware(this.handlers);
 }
 
-/// Annotation to set a service up to release hooks on every action.
-class Hooked {
-  const Hooked();
-}
-
-const Hooked hooked = const Hooked();
-
 /// Attaches hooks to a [HookedService].
 class Hooks {
   final List<HookedServiceEventListener> before;
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 086ed951..2de60716 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -130,12 +130,6 @@ class RequestContext {
       io.headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
       'xmlhttprequest';
 
-  @deprecated
-  HttpRequest get underlyingRequest {
-    throw new Exception(
-        '`RequestContext#underlyingRequest` is deprecated. Please update your application to use the newer `RequestContext#io`.');
-  }
-
   /// Magically transforms an [HttpRequest] into a [RequestContext].
   static Future<RequestContext> from(HttpRequest request, Angel app) async {
     RequestContext ctx = new RequestContext();
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 034f1d5c..0b4bc249 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -89,21 +89,9 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// A set of UTF-8 encoded bytes that will be written to the response.
   BytesBuilder get buffer => _buffer;
 
-  /// Please use `statusCode=` instead.'
-  @deprecated
-  void status(int code) {
-    statusCode = code;
-  }
-
   /// The underlying [HttpResponse] under this instance.
   final HttpResponse io;
 
-  @deprecated
-  HttpResponse get underlyingRequest {
-    throw new Exception(
-        '`ResponseContext#underlyingResponse` is deprecated. Please update your application to use the newer `ResponseContext#io`.');
-  }
-
   /// Gets the Content-Type header.
   ContentType get contentType {
     if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) return null;
@@ -135,7 +123,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   StateError _closed() => new StateError('Cannot modify a closed response.');
 
   /// Sends a download as a response.
-  download(File file, {String filename}) async {
+  Future download(File file, {String filename}) async {
     if (!_isOpen) throw _closed();
 
     headers["Content-Disposition"] =
@@ -163,7 +151,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
       (_buffer as _LockableBytesBuilder)._lock();
     }
 
-    _isOpen = false;
+    _isOpen = _useStream = false;
     _isClosed = true;
 
     if (_done?.isCompleted == false) _done.complete();
@@ -177,15 +165,6 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
     _isOpen = false;
   }
 
-  /// Sets a response header to the given value, or retrieves its value.
-  @Deprecated('Please use `headers` instead.')
-  header(String key, [String value]) {
-    if (value == null)
-      return headers[key];
-    else
-      headers[key] = value;
-  }
-
   /// Serializes JSON to the response.
   void json(value) => serialize(value, contentType: ContentType.JSON);
 
@@ -302,10 +281,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Copies a file's contents into the response buffer.
-  Future sendFile(File file,
-      {@deprecated int chunkSize,
-      @deprecated int sleepMs: 0,
-      @deprecated bool resumable: true}) async {
+  Future sendFile(File file) async {
     if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
@@ -331,33 +307,12 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Streams a file to this response.
   ///
-  // ignore: deprecated_member_use
   /// You can optionally transform the file stream with a [codec].
-  Future streamFile(File file,
-      {@deprecated int chunkSize,
-      @deprecated int sleepMs: 0,
-      @deprecated bool resumable: true,
-
-      /// Use [encoders] instead of manually specifying a codec.
-      @deprecated Codec<List<int>, List<int>> codec}) async {
+  Future streamFile(File file) {
     if (_isClosed) throw _closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
-
-    // ignore: deprecated_member_use
-    if (codec != null) {
-      end();
-      willCloseItself = true;
-
-      // ignore: deprecated_member_use
-      Stream stream = codec != null
-          // ignore: deprecated_member_use
-          ? file.openRead().transform(codec.encoder)
-          : file.openRead();
-      await stream.pipe(io);
-    } else {
-      await file.openRead().pipe(this);
-    }
+    return file.openRead().pipe(this);
   }
 
   @override
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 6102b503..272f13f7 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -89,18 +89,20 @@ class Routable extends Router {
     return super.addRoute(method, path, handler, middleware: handlerSequence);
   }
 
-  void use(Pattern path, Router router,
-      {bool hooked: true, String namespace: null}) {
+  /// Mounts the given [router] on this instance.
+  ///
+  /// The [router] may only omitted when called via
+  /// an [Angel] instance.
+  ///
+  /// Returns either a [Route] or a [Service] (if one was mounted).
+  use(Pattern path, [Router router, String namespace = null]) {
     Router _router = router;
     Service service;
 
     // If we need to hook this service, do it here. It has to be first, or
     // else all routes will point to the old service.
     if (router is Service) {
-      Hooked hookedDeclaration = getAnnotation(router, Hooked);
-      _router = service = (hookedDeclaration != null || hooked)
-          ? new HookedService(router)
-          : router;
+      _router = service = new HookedService(router);
       _services[path
           .toString()
           .trim()
@@ -135,13 +137,13 @@ class Routable extends Router {
       Map copiedProperties = new Map.from(router.properties);
       for (String propertyName in copiedProperties.keys) {
         properties.putIfAbsent("$middlewarePrefix$propertyName",
-                () => copiedMiddleware[propertyName]);
+            () => copiedMiddleware[propertyName]);
       }
     }
 
     // _router.dumpTree(header: 'Mounting on "$path":');
     // root.child(path, debug: debug, handlers: handlers).addChild(router.root);
-    mount(path, _router);
+    var mounted = mount(path, _router);
 
     if (_router is Routable) {
       // Copy services, too. :)
@@ -156,5 +158,7 @@ class Routable extends Router {
     if (service != null) {
       if (_onService.hasListener) _onService.add(service);
     }
+
+    return service ?? mounted;
   }
 }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 53a445eb..5e798c26 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -4,20 +4,19 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:mirrors';
+import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart' hide Extensible;
 import 'package:charcode/charcode.dart';
 export 'package:container/container.dart';
 import 'package:flatten/flatten.dart';
 import 'package:json_god/json_god.dart' as god;
+import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
 import '../safe_stream_controller.dart';
 import 'angel_base.dart';
-import 'angel_http_exception.dart';
 import 'controller.dart';
 import 'fatal_error.dart';
-
-//import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -28,19 +27,11 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 /// A function that binds an [Angel] server to an Internet address and port.
 typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
 
-/// Handles an [AngelHttpException].
-typedef Future AngelErrorHandler(
-    AngelHttpException err, RequestContext req, ResponseContext res);
-
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
-  final SafeCtrl<HttpRequest> _afterProcessed =
-      new SafeCtrl<HttpRequest>.broadcast();
-  final SafeCtrl<HttpRequest> _beforeProcessed =
-      new SafeCtrl<HttpRequest>.broadcast();
   final SafeCtrl<AngelFatalError> _fatalErrorStream =
       new SafeCtrl<AngelFatalError>.broadcast();
   final SafeCtrl<Controller> _onController =
@@ -57,8 +48,12 @@ class Angel extends AngelBase {
   /// A global Map of converters that can transform responses bodies.
   final Map<String, Converter<List<int>, List<int>>> encoders = {};
 
-  /// A global Map of manual injections. You usually will not want to touch this.
-  final Map injections = {};
+  final Map _injections = {};
+
+  /// Creates a safe zone within which a request can be handled, without crashing the application.
+  Future<ZoneSpecification> Function(
+          HttpRequest request, RequestContext req, ResponseContext res)
+      createZoneForRequest;
 
   final Map<dynamic, InjectionRequest> _preContained = {};
   ResponseSerializer _serializer;
@@ -71,12 +66,6 @@ class Angel extends AngelBase {
   /// Determines whether to allow HTTP request method overrides.
   bool allowMethodOverrides = true;
 
-  /// Fired after a request is processed. Always runs.
-  Stream<HttpRequest> get afterProcessed => _afterProcessed.stream;
-
-  /// Fired before a request is processed. Always runs.
-  Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
-
   /// All child application mounted on this instance.
   List<Angel> get children => new List<Angel>.unmodifiable(_children);
 
@@ -108,15 +97,18 @@ class Angel extends AngelBase {
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
 
+  /// Outputs diagnostics and debug messages.
+  Logger logger;
+
   /// Plug-ins to be called right before server startup.
   ///
   /// If the server is never started, they will never be called.
-  final List<AngelConfigurer> justBeforeStart = [];
+  final List<AngelConfigurer> startupHooks = [];
 
-  /// Plug-ins to be called right before server shutdown
+  /// Plug-ins to be called right before server shutdown.
   ///
   /// If the server is never [close]d, they will never be called.
-  final List<AngelConfigurer> justBeforeStop = [];
+  final List<AngelConfigurer> shutdownHooks = [];
 
   /// Always run before responses are sent.
   ///
@@ -125,8 +117,8 @@ class Angel extends AngelBase {
   final List<RequestHandler> responseFinalizers = [];
 
   /// The handler currently configured to run on [AngelHttpException]s.
-  AngelErrorHandler errorHandler =
-      (AngelHttpException e, req, ResponseContext res) {
+  Function(AngelHttpException e, RequestContext req, ResponseContext res)
+      errorHandler = (AngelHttpException e, req, ResponseContext res) {
     res.headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
@@ -140,12 +132,6 @@ class Angel extends AngelBase {
     res.end();
   };
 
-  /// [RequestMiddleware] to be run before all requests.
-  final List before = [];
-
-  /// [RequestMiddleware] to be run after all requests.
-  final List after = [];
-
   /// The native HttpServer running this instancce.
   HttpServer httpServer;
 
@@ -156,7 +142,7 @@ class Angel extends AngelBase {
     var host = address ?? InternetAddress.LOOPBACK_IP_V4;
     this.httpServer = await _serverGenerator(host, port ?? 0);
 
-    for (var configurer in justBeforeStart) {
+    for (var configurer in startupHooks) {
       await configure(configurer);
     }
 
@@ -205,8 +191,6 @@ class Angel extends AngelBase {
       await httpServer.close(force: true);
     }
 
-    _afterProcessed.close();
-    _beforeProcessed.close();
     _fatalErrorStream.close();
     _onController.close();
 
@@ -214,7 +198,7 @@ class Angel extends AngelBase {
       await service.close();
     });
 
-    for (var plugin in justBeforeStop) await plugin(this);
+    for (var plugin in shutdownHooks) await plugin(this);
 
     return server;
   }
@@ -252,7 +236,7 @@ class Angel extends AngelBase {
 
   /// Shortcut for adding a middleware to inject a key/value pair on every request.
   void inject(key, value) {
-    injections[key] = value;
+    _injections[key] = value;
   }
 
   /// Shortcuts for adding converters to transform the response buffer/stream of any request.
@@ -267,15 +251,6 @@ class Angel extends AngelBase {
 
   Future getHandlerResult(
       handler, RequestContext req, ResponseContext res) async {
-    /*if (handler is RequestMiddleware) {
-      var result = await handler(req, res);
-
-      if (result is RequestHandler)
-        return await getHandlerResult(result, req, res);
-      else
-        return result;
-    }*/
-
     if (handler is RequestHandler) {
       var result = await handler(req, res);
       return await getHandlerResult(result, req, res);
@@ -320,9 +295,8 @@ class Angel extends AngelBase {
   }
 
   Future<RequestContext> createRequestContext(HttpRequest request) {
-    _beforeProcessed.add(request);
     return RequestContext.from(request, this).then((req) {
-      return req..injections.addAll(injections ?? {});
+      return req..injections.addAll(_injections ?? {});
     });
   }
 
@@ -346,21 +320,23 @@ class Angel extends AngelBase {
   }
 
   /// Handles an [AngelHttpException].
-  handleAngelHttpException(AngelHttpException e, StackTrace st,
+  Future handleAngelHttpException(AngelHttpException e, StackTrace st,
       RequestContext req, ResponseContext res, HttpRequest request,
       {bool ignoreFinalizers: false}) async {
     if (req == null || res == null) {
-      _fatalErrorStream.add(new AngelFatalError(
-          request: request,
-          error: e?.error ??
-              e ??
-              new Exception(
-                  'handleAngelHttpException was called on a null request or response context.'),
-          stack: st));
-      return;
+      try {
+        logger?.severe(e, st);
+        request.response
+          ..statusCode = HttpStatus.INTERNAL_SERVER_ERROR
+          ..write('500 Internal Server Error')
+          ..close();
+      } finally {
+        return null;
+      }
     }
 
     res.statusCode = e.statusCode;
+
     if (req.headers.value(HttpHeaders.ACCEPT) == null ||
         req.acceptsAll ||
         req.accepts(ContentType.JSON) ||
@@ -373,13 +349,16 @@ class Angel extends AngelBase {
     }
 
     res.end();
-    await sendResponse(request, req, res,
+    return await sendResponse(request, req, res,
         ignoreFinalizers: ignoreFinalizers == true);
   }
 
   /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
-    try {
+    var zoneSpec = await createZoneForRequest(request, req, res);
+    var zone = Zone.current.fork(specification: zoneSpec);
+
+    return zone.run(() async {
       var req = await createRequestContext(request);
       var res = await createResponseContext(request.response, req);
       String requestedUrl;
@@ -415,13 +394,13 @@ class Angel extends AngelBase {
         );
       });
 
+      req.inject(Zone, zone);
+      req.inject(ZoneSpecification, zoneSpec);
       req.inject(MiddlewarePipeline, tuple.item1);
       req.params.addAll(tuple.item2);
       req.inject(Match, tuple.item3);
 
-      var pipeline = new List.from(before)
-        ..addAll(tuple.item1.handlers)
-        ..addAll(after);
+      var pipeline = tuple.item1.handlers;
 
       for (var handler in pipeline) {
         try {
@@ -436,13 +415,16 @@ class Angel extends AngelBase {
         await sendResponse(request, req, res);
       } on AngelHttpException catch (e, st) {
         e.stackTrace ??= st;
-        return await handleAngelHttpException(e, st, req, res, request,
-            ignoreFinalizers: true);
+        return await handleAngelHttpException(
+          e,
+          st,
+          req,
+          res,
+          request,
+          ignoreFinalizers: true,
+        );
       }
-    } catch (e, st) {
-      _fatalErrorStream
-          .add(new AngelFatalError(request: request, error: e, stack: st));
-    }
+    });
   }
 
   /// Runs several optimizations, *if* [isProduction] is `true`.
@@ -503,17 +485,10 @@ class Angel extends AngelBase {
     // return await closureMirror.apply(args).reflectee;
   }
 
-  /// Use [sendResponse] instead.
-  @deprecated
-  Future sendRequest(
-          HttpRequest request, RequestContext req, ResponseContext res) =>
-      sendResponse(request, req, res);
-
   /// Sends a response.
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
-    _afterProcessed.add(request);
 
     if (res.willCloseItself) {
       return new Future.value();
@@ -579,20 +554,8 @@ class Angel extends AngelBase {
       _onController.add(controllers[configurer.findExpose().path] = configurer);
   }
 
-  /// Starts the server, wrapped in a [runZoned] call.
-  Future<HttpServer> listen({InternetAddress address, int port: 3000}) {
-    var c = new Completer<HttpServer>();
-    runZoned(() async {
-      await startServer(address, port)
-          .then(c.complete)
-          .catchError(c.completeError);
-    }, onError: (e, st) {
-      _fatalErrorStream.add(new AngelFatalError(error: e, stack: st));
-    });
-    return c.future;
-  }
-
-  /// Mounts the child on this router.
+  /// Mounts the child on this router. If [routable] is `null`,
+  /// then this method will add a handler as a global middleware instead.
   ///
   /// If the router is an [Angel] instance, all controllers
   /// will be copied, as well as services and response finalizers.
@@ -602,26 +565,15 @@ class Angel extends AngelBase {
   /// NOTE: The above will not be properly copied if [path] is
   /// a [RegExp].
   @override
-  use(Pattern path, @checked Routable routable,
-      {bool hooked: true, String namespace: null}) {
+  use(path, [@checked Routable routable, String namespace = null]) {
+    if (routable == null) return all('*', path);
+
     var head = path.toString().replaceAll(_straySlashes, '');
 
     if (routable is Angel) {
       _children.add(routable.._parent = this);
       _preContained.addAll(routable._preContained);
 
-      if (routable.before.isNotEmpty) {
-        all(path, (req, res) {
-          return true;
-        }, middleware: routable.before);
-      }
-
-      if (routable.after.isNotEmpty) {
-        all(path, (req, res) {
-          return true;
-        }, middleware: routable.after);
-      }
-
       if (routable.responseFinalizers.isNotEmpty) {
         responseFinalizers.add((req, res) async {
           if (req.path.replaceAll(_straySlashes, '').startsWith(head)) {
@@ -643,14 +595,6 @@ class Angel extends AngelBase {
         services['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
 
-      _beforeProcessed.whenInitialized(() {
-        routable.beforeProcessed.listen(_beforeProcessed.add);
-      });
-
-      _afterProcessed.whenInitialized(() {
-        routable.afterProcessed.listen(_afterProcessed.add);
-      });
-
       _fatalErrorStream.whenInitialized(() {
         routable.fatalErrorStream.listen(_fatalErrorStream.add);
       });
@@ -664,27 +608,45 @@ class Angel extends AngelBase {
       routable.app = this;
     }
 
-    return super.use(path, routable, hooked: hooked, namespace: namespace);
-  }
-
-  /// Registers a callback to run upon errors.
-  @deprecated
-  onError(AngelErrorHandler handler) {
-    this.errorHandler = handler;
+    return super.use(path, routable, namespace);
   }
 
   /// Default constructor. ;)
-  Angel({@deprecated bool debug: false}) : super() {
+  Angel() : super() {
     bootstrapContainer();
+
+    createZoneForRequest = (request, req, res) async {
+      return new ZoneSpecification(
+        handleUncaughtError: (Zone self, ZoneDelegate parent, Zone zone, error,
+            StackTrace stackTrace) {
+          var e = new AngelHttpException(error,
+              stackTrace: stackTrace, message: error?.toString());
+          return handleAngelHttpException(
+            e,
+            stackTrace,
+            req,
+            res,
+            request,
+            ignoreFinalizers: true,
+          );
+        },
+        print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
+          if (logger != null) {
+            logger.info(line);
+          } else {
+            return parent.print(zone, line);
+          }
+        },
+      );
+    };
   }
 
   /// An instance mounted on a server started by the [serverGenerator].
-  factory Angel.custom(ServerGenerator serverGenerator,
-          {@deprecated bool debug: false}) =>
-      new Angel().._serverGenerator = serverGenerator;
+  factory Angel.custom(ServerGenerator serverGenerator) {
+    return new Angel().._serverGenerator = serverGenerator;
+  }
 
-  factory Angel.fromSecurityContext(SecurityContext context,
-      {@deprecated bool debug: false}) {
+  factory Angel.fromSecurityContext(SecurityContext context) {
     var app = new Angel();
 
     app._serverGenerator = (InternetAddress address, int port) async {
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index ab58c037..c8124817 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -2,10 +2,10 @@ library angel_framework.http.service;
 
 import 'dart:async';
 import 'package:angel_framework/src/http/response_context.dart';
+import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'angel_base.dart';
-import 'angel_http_exception.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
 import 'routable.dart';
@@ -24,22 +24,6 @@ class Providers {
   static const String viaWebsocket = "websocket";
   static const String viaGraphQL = "graphql";
 
-  /// Use [viaRest] instead.
-  @deprecated
-  static const String VIA_REST = "rest";
-
-  /// Use [viaWebSocket] instead.
-  @deprecated
-  static const String VIA_WEBSOCKET = "websocket";
-
-  /// Use [rest] instead.
-  @deprecated
-  static const Providers REST = const Providers(viaRest);
-
-  /// Use [websocket] instead.
-  @deprecated
-  static const Providers WEBSOCKET = const Providers(viaWebsocket);
-
   /// Represents a request via REST.
   static const Providers rest = const Providers(viaRest);
 
@@ -65,10 +49,6 @@ class Service extends Routable {
     'token'
   ];
 
-  /// Use [specialQueryKeys] instead.
-  @deprecated
-  static const List<String> SPECIAL_QUERY_KEYS = specialQueryKeys;
-
   /// The [Angel] app powering this service.
   AngelBase app;
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 4fa991bc..edb00091 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,12 @@
 name: angel_framework
-version: 1.0.10
+version: 1.1.0-alpha
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
   sdk: ">=1.19.0"
 dependencies:
+  angel_http_exception: ^1.0.0
   angel_model: ^1.0.0
   angel_route: ">=1.0.5 <2.0.0"
   body_parser: ^1.0.0-dev
diff --git a/test/server_test.dart b/test/server_test.dart
index 411c9d96..a8903181 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -11,17 +11,6 @@ final Uri $foo = Uri.parse('http://localhost:3000/foo');
 /// Additional tests to improve coverage of server.dart
 main() {
   group('streams fired', () {
-    test('before+after processed are fired', () async {
-      var app = new Angel();
-      var before = app.beforeProcessed.first;
-      var after = app.afterProcessed.first;
-      var rq = new MockHttpRequest('GET', $foo);
-      rq.close();
-      await app.handleRequest(rq);
-      app.close();
-      expect(await before, rq);
-      expect(await after, rq);
-    });
 
     test('oncontroller fired', () async {
       var app = new Angel();
@@ -77,7 +66,7 @@ main() {
 
   test('plug-ins run on startup', () async {
     var app = new Angel();
-    app.justBeforeStart.add((app) async {
+    app.startupHooks.add((app) async {
       app.properties['two'] = 2;
     });
     await app.startServer();
@@ -101,9 +90,13 @@ main() {
     expect(svc.value, 3);
   });
 
-  test('global injection added to injection map', () {
+  test('global injection added to injection map', () async {
     var app = new Angel()..inject('a', 'b');
-    expect(app.injections['a'], 'b');
+    app.get('/', (String a) => a);
+    var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
+    await app.handleRequest(rq);
+    var body = await rq.response.transform(UTF8.decoder).join();
+    expect(body, JSON.encode('b'));
   });
 
   test('global injected serializer', () async {
@@ -163,7 +156,7 @@ main() {
       app = new Angel();
       app.get('/wtf', () => throw new AngelHttpException.forbidden());
       app.get('/wtf2', () => throw new AngelHttpException.forbidden());
-      await app.listen(address: InternetAddress.LOOPBACK_IP_V4, port: 0);
+      await app.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
       app.fatalErrorStream.listen((e) {
         print('FATAL: ${e.error}');
         print(e.stack);
@@ -172,29 +165,6 @@ main() {
 
     tearDown(() => app.close());
 
-    test('null req/res', () async {
-      app.handleAngelHttpException(null, null, null, null, null);
-      var empty = app.fatalErrorStream.isEmpty;
-      await app.close();
-      expect(await empty, isFalse);
-    });
-
-    test('null req/res, valid error', () async {
-      app.handleAngelHttpException(
-          new AngelHttpException(new StateError('')), null, null, null, null);
-      var empty = app.fatalErrorStream.isEmpty;
-      await app.close();
-      expect(await empty, isFalse);
-    });
-
-    test('null req/res, http error', () async {
-      app.handleAngelHttpException(
-          new AngelHttpException.forbidden(), null, null, null, null);
-      var empty = app.fatalErrorStream.isEmpty;
-      await app.close();
-      expect(await empty, isFalse);
-    });
-
     test('can send json', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'));
       rq.close();
diff --git a/test/services_test.dart b/test/services_test.dart
index bfdc4595..cc946415 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:angel_framework/src/defs.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index ea514341..4cb9a26b 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -41,12 +41,22 @@ main() {
       res.statusCode = 32;
       await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
-      await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
-          .pipe(res);
+
+      try {
+        await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+            .pipe(res);
+        throw new Exception('Should throw on rewrite...');
+      } on StateError {
+        // Yay!!!
+      }
     });
 
     app.get('/error', (res) => res.addError(new StateError('wtf')));
 
+    app.errorHandler = (e, req, res) async {
+      print('ok');
+    };
+
     app.fatalErrorStream.listen((e) {
       stderr..writeln(e.error)..writeln(e.stack);
     });

From 79b5b79af190073fc57d63187f13aabfe6919dba Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Sep 2017 10:03:23 -0400
Subject: [PATCH 150/414] 1.1.0-alpha

---
 .idea/workspace.xml               | 598 +++++++++++++++---------------
 CHANGELOG.md                      |   1 +
 lib/angel_framework.dart          |   2 +-
 lib/common.dart                   |   2 +-
 lib/hooks.dart                    |   3 +-
 lib/src/http/angel_base.dart      |   5 +-
 lib/src/http/base_middleware.dart |   2 +-
 lib/src/http/base_plugin.dart     |   2 +-
 lib/src/http/fatal_error.dart     |  13 -
 lib/src/http/hooked_service.dart  |   7 +-
 lib/src/http/http.dart            |   1 -
 lib/src/http/request_context.dart |  15 +-
 lib/src/http/server.dart          |  15 +-
 lib/src/util.dart                 |   2 +-
 pubspec.yaml                      |   1 +
 test/accepts_test.dart            |   2 +-
 test/common.dart                  |   2 +-
 test/controller_test.dart         |  14 +-
 test/hooked_test.dart             |   4 +-
 test/primitives_test.dart         |   9 +-
 test/server_test.dart             |  14 +-
 test/services_test.dart           |  10 +-
 test/streaming_test.dart          |  16 +-
 test/view_generator_test.dart     |   2 +-
 24 files changed, 368 insertions(+), 374 deletions(-)
 delete mode 100644 lib/src/http/fatal_error.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 31f93b53..ede34d31 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,33 +2,30 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/cannot_write_after_close_in_streaming_test_dart.xml" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/defs.dart" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/memory_service.dart" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/angel_framework.dart" afterPath="$PROJECT_DIR$/lib/angel_framework.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/common.dart" afterPath="$PROJECT_DIR$/lib/common.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" afterPath="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" afterPath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" afterPath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/base_plugin.dart" afterPath="$PROJECT_DIR$/lib/src/http/base_plugin.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/util.dart" afterPath="$PROJECT_DIR$/lib/src/util.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/accepts_test.dart" afterPath="$PROJECT_DIR$/test/accepts_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/common.dart" afterPath="$PROJECT_DIR$/test/common.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/primitives_test.dart" afterPath="$PROJECT_DIR$/test/primitives_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/streaming_test.dart" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/view_generator_test.dart" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -54,38 +51,60 @@
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
+            <state relative-caret-position="390">
+              <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <file leaf-file-name="fast_name_from_symbol.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="452">
-              <caret line="42" column="24" lean-forward="false" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
+            <state relative-caret-position="90">
+              <caret line="6" column="37" lean-forward="true" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="167">
-              <caret line="181" column="46" lean-forward="false" selection-start-line="181" selection-start-column="46" selection-end-line="181" selection-end-column="46" />
+            <state relative-caret-position="100">
+              <caret line="56" column="47" lean-forward="false" selection-start-line="56" selection-start-column="47" selection-end-line="56" selection-end-column="47" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="82">
-              <caret line="160" column="101" lean-forward="false" selection-start-line="160" selection-start-column="101" selection-end-line="160" selection-end-column="101" />
+            <state relative-caret-position="1755">
+              <caret line="123" column="28" lean-forward="false" selection-start-line="123" selection-start-column="28" selection-end-line="123" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-886">
+              <caret line="25" column="26" lean-forward="false" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="287">
+              <caret line="229" column="26" lean-forward="false" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
               <folding />
             </state>
           </provider>
@@ -94,9 +113,11 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="64" lean-forward="false" selection-start-line="6" selection-start-column="64" selection-end-line="6" selection-end-column="64" />
-              <folding />
+            <state relative-caret-position="-4993">
+              <caret line="325" column="20" lean-forward="true" selection-start-line="325" selection-start-column="20" selection-end-line="325" selection-end-column="20" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -104,9 +125,20 @@
       <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="20" lean-forward="true" selection-start-line="2" selection-start-column="20" selection-end-line="3" selection-end-column="64" />
-              <folding />
+            <state relative-caret-position="-9109">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding>
+                <element signature="e#31#51#0" expanded="true" />
+                <marker date="1506088306000" expanded="true" signature="20449:21847" ph="{...}" />
+                <marker date="1506088306000" expanded="true" signature="20899:20967" ph="{...}" />
+                <marker date="1506088306000" expanded="true" signature="20971:21071" ph="///..." />
+                <marker date="1506088306000" expanded="true" signature="21798:21845" ph="{...}" />
+                <marker date="1506088306000" expanded="true" signature="22179:22221" ph="{...}" />
+                <marker date="1506088306000" expanded="true" signature="22382:22571" ph="{...}" />
+                <marker date="1506088306000" expanded="true" signature="22575:22816" ph="///..." />
+                <marker date="1506088306000" expanded="true" signature="22857:22988" ph="{...}" />
+                <marker date="1506088306000" expanded="true" signature="22894:22914" ph="&lt;~&gt;" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -114,28 +146,18 @@
       <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="88">
-              <caret line="6" column="8" lean-forward="false" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
+            <state relative-caret-position="135">
+              <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-32">
-              <caret line="4" column="64" lean-forward="false" selection-start-line="4" selection-start-column="64" selection-end-line="4" selection-end-column="64" />
+            <state relative-caret-position="198">
+              <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
               <folding />
             </state>
           </provider>
@@ -152,12 +174,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>group\('[^']+', \(\</find>
-      <find>group\('[^']+', \(\) as</find>
-      <find>group\('[^']+', \(\) a</find>
-      <find>group\('[^']+', \(\)</find>
-      <find>group\('[^']+', \(\)\s</find>
-      <find>group\('[^']+', \(\)\s*</find>
       <find>group\('[^']+', \(\)\s*a</find>
       <find>group\('[^']+', \(\)\s*as</find>
       <find>_hand</find>
@@ -182,6 +198,12 @@
       <find>_AFTERp</find>
       <find>_afterProc</find>
       <find>_beforeP</find>
+      <find>_fatalE</find>
+      <find>fatalError</find>
+      <find>fatale</find>
+      <find>FATAL</find>
+      <find>error ??</find>
+      <find>logger</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -224,7 +246,6 @@
         <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/common.dart" />
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
@@ -245,27 +266,28 @@
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -277,7 +299,7 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="149" />
-    <option name="y" value="29" />
+    <option name="y" value="23" />
     <option name="width" value="1168" />
     <option name="height" value="797" />
   </component>
@@ -299,7 +321,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
       <pane id="Scratches" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -330,8 +351,9 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -460,6 +482,11 @@
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="can delete data" />
     </configuration>
+    <configuration name="can send html in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="can send html" />
+    </configuration>
     <configuration name="can use app.properties like members in util_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/util_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -516,40 +543,36 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="27">
-      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+    <list size="28">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
     </list>
-    <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
@@ -594,7 +617,8 @@
       <workItem from="1501768538452" duration="11206000" />
       <workItem from="1502831499213" duration="7608000" />
       <workItem from="1503931951079" duration="2851000" />
-      <workItem from="1506050384140" duration="5179000" />
+      <workItem from="1506050384140" duration="5198000" />
+      <workItem from="1506088028663" duration="752000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -806,43 +830,50 @@
       <option name="project" value="LOCAL" />
       <updated>1503934167188</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="1.1.0-alpha start">
+      <created>1506055702294</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1506055702294</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.09.22 at 00h 26m 24s.xml">
+    <history-entry file="All_Tests - 2017.09.22 at 09h 49m 19s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 27m 30s.xml">
+    <history-entry file="All_Tests - 2017.09.22 at 09h 49m 48s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 28m 02s.xml">
+    <history-entry file="All_Tests - 2017.09.22 at 09h 50m 40s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 28m 13s.xml">
+    <history-entry file="All_Tests - 2017.09.22 at 09h 51m 53s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 29m 13s.xml">
+    <history-entry file="All_Tests - 2017.09.22 at 09h 52m 53s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 30m 31s.xml">
+    <history-entry file="All_Tests - 2017.09.22 at 09h 54m 18s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 31m 12s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_send_html_in_server_test_dart - 2017.09.22 at 09h 52m 57s.xml">
+      <configuration name="can send html in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 31m 30s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_send_html_in_server_test_dart - 2017.09.22 at 09h 53m 22s.xml">
+      <configuration name="can send html in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 00h 37m 21s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_send_html_in_server_test_dart - 2017.09.22 at 09h 54m 05s.xml">
+      <configuration name="can send html in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 00h 27m 34s.xml">
       <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="53013000" />
+    <option name="totallyTimeSpent" value="53784000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -854,42 +885,42 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="149" y="29" width="1168" height="797" extended-state="0" />
+    <frame x="149" y="23" width="1168" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32842582" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32621083" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56837606" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26376554" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -899,7 +930,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Done???" />
     <MESSAGE value="findExpose" />
     <MESSAGE value="I love stack overflows!!!" />
     <MESSAGE value="Fixed last batch?" />
@@ -924,14 +954,14 @@
     <MESSAGE value="Remove reopen" />
     <MESSAGE value="1.0.8" />
     <MESSAGE value="1.0.9+1" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.9+1" />
+    <MESSAGE value="1.1.0-alpha start" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.1.0-alpha start" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/typed_data/typed_data.dart" />
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -996,7 +1026,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
           <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1004,9 +1033,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#54#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1024,29 +1050,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="561">
-          <caret line="181" column="10" lean-forward="false" selection-start-line="181" selection-start-column="10" selection-end-line="181" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1054,20 +1061,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="6" lean-forward="false" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="61" lean-forward="false" selection-start-line="2" selection-start-column="61" selection-end-line="2" selection-end-column="61" />
-            <folding />
-          </first_editor>
-          <second_editor />
         </state>
       </provider>
     </entry>
@@ -1083,41 +1076,15 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="66" lean-forward="false" selection-start-line="10" selection-start-column="66" selection-end-line="10" selection-end-column="66" />
-          <folding>
-            <element signature="e#0#20#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/defs.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="7" lean-forward="true" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/src/defs.dart" />
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="19" lean-forward="false" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1125,9 +1092,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-          <folding>
-            <element signature="e#47#67#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1135,7 +1099,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="40" column="25" lean-forward="false" selection-start-line="40" selection-start-column="25" selection-end-line="41" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1143,7 +1106,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="145">
           <caret line="574" column="9" lean-forward="false" selection-start-line="574" selection-start-column="9" selection-end-line="574" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1159,7 +1121,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="191">
           <caret line="77" column="40" lean-forward="false" selection-start-line="77" selection-start-column="40" selection-end-line="77" selection-end-column="40" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1167,7 +1128,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="145">
           <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1175,7 +1135,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="145">
           <caret line="117" column="2" lean-forward="false" selection-start-line="117" selection-start-column="2" selection-end-line="117" selection-end-column="2" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1183,23 +1142,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="19" lean-forward="false" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1003">
-          <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1208,39 +1150,14 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="0">
             <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2449">
-          <caret line="12" column="29" lean-forward="false" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="45" column="53" lean-forward="false" selection-start-line="45" selection-start-column="53" selection-end-line="45" selection-end-column="53" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="452">
-          <caret line="42" column="24" lean-forward="false" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
+        <state relative-caret-position="2640">
           <caret line="181" column="46" lean-forward="false" selection-start-line="181" selection-start-column="46" selection-end-line="181" selection-end-column="46" />
           <folding />
         </state>
@@ -1248,52 +1165,13 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="82">
+        <state relative-caret-position="2265">
           <caret line="160" column="101" lean-forward="false" selection-start-line="160" selection-start-column="101" selection-end-line="160" selection-end-column="101" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="30" lean-forward="false" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="20" lean-forward="true" selection-start-line="2" selection-start-column="20" selection-end-line="3" selection-end-column="64" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="6" column="8" lean-forward="false" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="64" lean-forward="false" selection-start-line="6" selection-start-column="64" selection-end-line="6" selection-end-column="64" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
@@ -1304,12 +1182,144 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-32">
+        <state relative-caret-position="60">
           <caret line="4" column="64" lean-forward="false" selection-start-line="4" selection-start-column="64" selection-end-line="4" selection-end-column="64" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-133">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <marker date="1506088306000" expanded="true" signature="421:1640" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-9109">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#31#51#0" expanded="true" />
+            <marker date="1506088306000" expanded="true" signature="20449:21847" ph="{...}" />
+            <marker date="1506088306000" expanded="true" signature="20899:20967" ph="{...}" />
+            <marker date="1506088306000" expanded="true" signature="20971:21071" ph="///..." />
+            <marker date="1506088306000" expanded="true" signature="21798:21845" ph="{...}" />
+            <marker date="1506088306000" expanded="true" signature="22179:22221" ph="{...}" />
+            <marker date="1506088306000" expanded="true" signature="22382:22571" ph="{...}" />
+            <marker date="1506088306000" expanded="true" signature="22575:22816" ph="///..." />
+            <marker date="1506088306000" expanded="true" signature="22857:22988" ph="{...}" />
+            <marker date="1506088306000" expanded="true" signature="22894:22914" ph="&lt;~&gt;" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="198">
+          <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="15">
+            <caret line="1" column="65" lean-forward="false" selection-start-line="1" selection-start-column="65" selection-end-line="1" selection-end-column="65" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="287">
+          <caret line="229" column="26" lean-forward="false" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4993">
+          <caret line="325" column="20" lean-forward="true" selection-start-line="325" selection-start-column="20" selection-end-line="325" selection-end-column="20" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="27" column="52" lean-forward="false" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="56" column="47" lean-forward="false" selection-start-line="56" selection-start-column="47" selection-end-line="56" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="37" lean-forward="true" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1755">
+          <caret line="123" column="28" lean-forward="false" selection-start-line="123" selection-start-column="28" selection-end-line="123" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-886">
+          <caret line="25" column="26" lean-forward="false" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b68ac2ff..36af592b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # 1.1.0-alpha
+* Removed `AngelFatalError`, and subsequently `fatalErrorStream`.
 * Removed all `@deprecated` members.
 * Removed `@Hooked`, `beforeProcessed`, and `afterProcessed`.
 
diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
index 7a624d51..f1e0f551 100644
--- a/lib/angel_framework.dart
+++ b/lib/angel_framework.dart
@@ -1,4 +1,4 @@
 /// An easily-extensible web server framework in Dart.
 library angel_framework;
 
-export 'src/http/http.dart';
\ No newline at end of file
+export 'src/http/http.dart';
diff --git a/lib/common.dart b/lib/common.dart
index 33b1bc80..f7beed60 100644
--- a/lib/common.dart
+++ b/lib/common.dart
@@ -1 +1 @@
-export 'package:angel_model/angel_model.dart';
\ No newline at end of file
+export 'package:angel_model/angel_model.dart';
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 0fa5001e..13c18a3d 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -35,7 +35,8 @@ AngelConfigurer hookAllServices(callback(Service service)) {
 /// Transforms `e.data` or `e.result` into JSON-friendly data, i.e. a Map. Runs on Iterables as well.
 ///
 /// The [condition] is optional, and is passed to [transform].
-HookedServiceEventListener toJson([condition]) => transform(god.serializeObject, condition);
+HookedServiceEventListener toJson([condition]) =>
+    transform(god.serializeObject, condition);
 
 /// Mutates `e.data` or `e.result` using the given [transformer].
 ///
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 297f1356..2004eaf2 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -30,7 +30,8 @@ class AngelBase extends Routable {
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
-  ViewGenerator viewGenerator = (String view, [Map data]) async => "No view engine has been configured yet.";
+  ViewGenerator viewGenerator = (String view, [Map data]) async =>
+      "No view engine has been configured yet.";
 
   operator [](key) => properties[key];
   operator []=(key, value) => properties[key] = value;
@@ -49,4 +50,4 @@ class AngelBase extends Routable {
 
     return super.noSuchMethod(invocation);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/base_middleware.dart b/lib/src/http/base_middleware.dart
index ccffb389..1baa4ed5 100644
--- a/lib/src/http/base_middleware.dart
+++ b/lib/src/http/base_middleware.dart
@@ -6,4 +6,4 @@ import 'response_context.dart';
 
 abstract class AngelMiddleware {
   Future<bool> call(RequestContext req, ResponseContext res);
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/base_plugin.dart b/lib/src/http/base_plugin.dart
index ec5ed301..4aac0bb1 100644
--- a/lib/src/http/base_plugin.dart
+++ b/lib/src/http/base_plugin.dart
@@ -5,4 +5,4 @@ import 'server.dart';
 
 abstract class AngelPlugin {
   Future call(Angel app);
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/fatal_error.dart b/lib/src/http/fatal_error.dart
deleted file mode 100644
index dc6bef45..00000000
--- a/lib/src/http/fatal_error.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-/// Thrown whenever Angel completely fails to respond to a request.
-class AngelFatalError {
-  var error;
-  HttpRequest request;
-  StackTrace stack;
-  Zone zone;
-
-  AngelFatalError({this.request, this.error, this.stack, this.zone});
-}
-
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 536228ef..067fb45a 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -622,7 +622,12 @@ class HookedServiceEvent {
   static const String removed = 'removed';
 
   static const List<String> all = const [
-    indexed, read, created, modified, updated, removed
+    indexed,
+    read,
+    created,
+    modified,
+    updated,
+    removed
   ];
 
   /// Use this to end processing of an event.
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index c260d5fa..7a79ed64 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -13,7 +13,6 @@ export 'anonymous_service.dart';
 export 'base_middleware.dart';
 export 'base_plugin.dart';
 export 'controller.dart';
-export 'fatal_error.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
 export 'metadata.dart';
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 2de60716..aa0f3bf1 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -152,7 +152,8 @@ class RequestContext {
     for (int ch in request.uri.toString().codeUnits) {
       if (ch != $question)
         _path.add(ch);
-      else break;
+      else
+        break;
     }
 
     // Remove trailing slashes
@@ -161,17 +162,19 @@ class RequestContext {
     for (int i = _path.length - 1; i >= 0; i--) {
       if (_path[i] == $slash)
         lastSlash = i;
-      else break;
+      else
+        break;
     }
 
     if (lastSlash > -1)
       ctx._path = new String.fromCharCodes(_path.take(lastSlash));
-    else ctx._path = new String.fromCharCodes(_path);
+    else
+      ctx._path = new String.fromCharCodes(_path);
     ctx._io = request;
 
     if (app.lazyParseBodies != true) {
       ctx._body = (await parseBody(request,
-          storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
+              storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
           {};
     }
 
@@ -266,8 +269,8 @@ class RequestContext {
       return _body;
     else
       _provisionalQuery = null;
-      return _body = await parseBody(io,
-          storeOriginalBuffer: app.storeOriginalBuffer == true);
+    return _body = await parseBody(io,
+        storeOriginalBuffer: app.storeOriginalBuffer == true);
   }
 
   operator [](key) => properties[key];
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 5e798c26..e2482bf6 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -16,7 +16,6 @@ import 'package:tuple/tuple.dart';
 import '../safe_stream_controller.dart';
 import 'angel_base.dart';
 import 'controller.dart';
-import 'fatal_error.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -32,8 +31,6 @@ typedef Future AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
-  final SafeCtrl<AngelFatalError> _fatalErrorStream =
-      new SafeCtrl<AngelFatalError>.broadcast();
   final SafeCtrl<Controller> _onController =
       new SafeCtrl<Controller>.broadcast();
 
@@ -69,9 +66,6 @@ class Angel extends AngelBase {
   /// All child application mounted on this instance.
   List<Angel> get children => new List<Angel>.unmodifiable(_children);
 
-  /// Fired on fatal errors.
-  Stream<AngelFatalError> get fatalErrorStream => _fatalErrorStream.stream;
-
   /// Indicates whether the application is running in a production environment.
   ///
   /// The criteria for this is the `ANGEL_ENV` environment variable being set to
@@ -112,8 +106,7 @@ class Angel extends AngelBase {
 
   /// Always run before responses are sent.
   ///
-  /// These will only not run if an [AngelFatalError] occurs,
-  /// or if a response's `willCloseItself` is set to `true`.
+  /// These will only not run if a response's `willCloseItself` is set to `true`.
   final List<RequestHandler> responseFinalizers = [];
 
   /// The handler currently configured to run on [AngelHttpException]s.
@@ -191,7 +184,6 @@ class Angel extends AngelBase {
       await httpServer.close(force: true);
     }
 
-    _fatalErrorStream.close();
     _onController.close();
 
     await Future.forEach(services.values, (Service service) async {
@@ -489,7 +481,6 @@ class Angel extends AngelBase {
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
-
     if (res.willCloseItself) {
       return new Future.value();
     } else {
@@ -595,10 +586,6 @@ class Angel extends AngelBase {
         services['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
 
-      _fatalErrorStream.whenInitialized(() {
-        routable.fatalErrorStream.listen(_fatalErrorStream.add);
-      });
-
       _onController.whenInitialized(() {
         routable.onController.listen(_onController.add);
       });
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 710391b8..59c3cb50 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -21,4 +21,4 @@ getAnnotation(obj, Type T) {
     ClassMirror classMirror = reflectClass(obj.runtimeType);
     return matchingAnnotation(classMirror.metadata, T);
   }
-}
\ No newline at end of file
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index edb00091..c491369d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,6 +14,7 @@ dependencies:
   container: ^0.1.2
   flatten: ^1.0.0
   json_god: ^2.0.0-beta
+  logging:
   merge_map: ^1.0.0
   meta: ^1.0.0
   mime: ^0.9.3
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index adaf7c5b..3afcaa18 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -25,7 +25,7 @@ main() {
     expect(req.accepts('text/html'), isTrue);
   });
 
-  test('specific type', () async  {
+  test('specific type', () async {
     var req = await acceptContentTypes(['text/html']);
     expect(req.acceptsAll, isFalse);
     expect(req.accepts(ContentType.JSON), isFalse);
diff --git a/test/common.dart b/test/common.dart
index 724b96cc..c21962ad 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -13,7 +13,7 @@ class BookService extends Service {
   @override
   index([params]) async {
     print('Book params: $params');
-    
+
     return [
       {'foo': 'bar'}
     ];
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 7c371790..6f326b70 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -26,9 +26,7 @@ class TodoController extends Controller {
   }
 }
 
-class NoExposeController extends Controller {
-
-}
+class NoExposeController extends Controller {}
 
 @Expose('/named', as: 'foo')
 class NamedController extends Controller {
@@ -82,11 +80,11 @@ main() {
 
   test('create dynamic handler', () async {
     var app = new Angel();
-    app.get('/foo', createDynamicHandler(({String bar}) {
-      return 2;
-    }, optional: [
-      'bar'
-    ]));
+    app.get(
+        '/foo',
+        createDynamicHandler(({String bar}) {
+          return 2;
+        }, optional: ['bar']));
     var rq = new MockHttpRequest('GET', new Uri(path: 'foo'));
     await app.handleRequest(rq);
     var body = await rq.response.transform(UTF8.decoder).join();
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index d574b2ac..9102bafa 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -28,7 +28,9 @@ main() {
       print('Fired ${e.eventName}! Data: ${e.data}; Params: ${e.params}');
     });
 
-    app.fatalErrorStream.listen((e) => throw e.error);
+    app.errorHandler = (e, req, res) {
+      throw e.error;
+    };
 
     server = await app.startServer();
     url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 172542cf..d7e55b3a 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -24,9 +24,9 @@ main() {
 
     app.get('/num/global', (num global) => global);
 
-    app.fatalErrorStream.listen((e) {
-      stderr..writeln(e.error)..writeln(e.stack);
-    });
+    app.errorHandler = (e, req, res) {
+      stderr..writeln(e.error)..writeln(e.stackTrace);
+    };
   });
 
   tearDown(() => app.close());
@@ -59,7 +59,8 @@ main() {
       var req = await app.createRequestContext(rq);
       var res = await app.createResponseContext(rq.response, req);
       await app.runContained((num unparsed) => unparsed, req, res);
-      throw new StateError('ArgumentError should be thrown if a parameter cannot be resolved.');
+      throw new StateError(
+          'ArgumentError should be thrown if a parameter cannot be resolved.');
     } on ArgumentError {
       // Success
     }
diff --git a/test/server_test.dart b/test/server_test.dart
index a8903181..e016f2b2 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -11,7 +11,6 @@ final Uri $foo = Uri.parse('http://localhost:3000/foo');
 /// Additional tests to improve coverage of server.dart
 main() {
   group('streams fired', () {
-
     test('oncontroller fired', () async {
       var app = new Angel();
       var ctrl = new FooController();
@@ -157,10 +156,13 @@ main() {
       app.get('/wtf', () => throw new AngelHttpException.forbidden());
       app.get('/wtf2', () => throw new AngelHttpException.forbidden());
       await app.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
-      app.fatalErrorStream.listen((e) {
-        print('FATAL: ${e.error}');
-        print(e.stack);
-      });
+
+      var oldHandler = app.errorHandler;
+      app.errorHandler = (e, req, res) {
+        print('FATAL: ${e.error ?? e}');
+        print(e.stackTrace);
+        return oldHandler(e, req, res);
+      };
     });
 
     tearDown(() => app.close());
@@ -190,7 +192,7 @@ main() {
       await app.handleRequest(rq);
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
       expect(
-          rq.response.headers.contentType.mimeType, ContentType.HTML.mimeType);
+          rq.response.headers.contentType?.mimeType, ContentType.HTML.mimeType);
     });
   });
 }
diff --git a/test/services_test.dart b/test/services_test.dart
index cc946415..9f4bd135 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -21,10 +21,10 @@ main() {
   setUp(() async {
     app = new Angel()
       ..use('/todos', new TypedService<Todo>(new MapService()))
-      ..fatalErrorStream.listen((e) {
+      ..errorHandler = (e, req, res) {
         print('Whoops: ${e.error}');
-        print(e.stack);
-      });
+        print(e.stackTrace);
+      };
 
     await app.startServer();
     client = new http.Client();
@@ -95,7 +95,9 @@ main() {
 
     test('can delete data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      var created = await client.post("$url/todos", headers: headers, body: postData).then((r) => JSON.decode(r.body));
+      var created = await client
+          .post("$url/todos", headers: headers, body: postData)
+          .then((r) => JSON.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 4cb9a26b..4b91fc95 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -32,8 +32,8 @@ main() {
     app.get('/multiple', (res) async {
       await res.addStream(
           new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
-      await res.addStream(
-          new Stream<List<int>>.fromIterable(['bye'.codeUnits]));
+      await res
+          .addStream(new Stream<List<int>>.fromIterable(['bye'.codeUnits]));
       await res.close();
     });
 
@@ -54,12 +54,8 @@ main() {
     app.get('/error', (res) => res.addError(new StateError('wtf')));
 
     app.errorHandler = (e, req, res) async {
-      print('ok');
+      stderr..writeln(e.error)..writeln(e.stackTrace);
     };
-
-    app.fatalErrorStream.listen((e) {
-      stderr..writeln(e.error)..writeln(e.stack);
-    });
   });
 
   tearDown(() => app.close());
@@ -76,8 +72,7 @@ main() {
   test('multiple addStream', () => _expectHelloBye('/multiple'));
 
   test('cannot write after close', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))
-      ..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
     await app.handleRequest(rq);
     var body = await rq.response.transform(UTF8.decoder).join();
 
@@ -87,8 +82,7 @@ main() {
 
   test('res => addError', () async {
     try {
-      var rq = new MockHttpRequest('GET', Uri.parse('/error'))
-        ..close();
+      var rq = new MockHttpRequest('GET', Uri.parse('/error'))..close();
       await app.handleRequest(rq);
       var body = await rq.response.transform(UTF8.decoder).join();
       throw 'addError should throw error; response: $body';
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
index 680536dc..177fb63f 100644
--- a/test/view_generator_test.dart
+++ b/test/view_generator_test.dart
@@ -7,4 +7,4 @@ main() {
     var view = await app.viewGenerator('foo', {'bar': 'baz'});
     expect(view, contains('No view engine'));
   });
-}
\ No newline at end of file
+}

From 97fd8b28b175c1c2f6bc625cef679c49fa026102 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Sep 2017 10:04:40 -0400
Subject: [PATCH 151/414] pubspec

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index c491369d..8e380a04 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   container: ^0.1.2
   flatten: ^1.0.0
   json_god: ^2.0.0-beta
-  logging:
+  logging: ">=0.11.3 <1.0.0"
   merge_map: ^1.0.0
   meta: ^1.0.0
   mime: ^0.9.3

From 05e4e4d3bffc0da03780f63750c8e687c8acdd81 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Sep 2017 10:53:49 -0400
Subject: [PATCH 152/414] Logging support

---
 .idea/workspace.xml         | 413 +++++++++++++++---------------------
 lib/src/http/server.dart    |  22 +-
 performance/hello/main.dart |  17 +-
 pubspec.yaml                |   2 +-
 test/streaming_test.dart    |   8 +
 5 files changed, 206 insertions(+), 256 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ede34d31..c82a509b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,30 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/fatal_error.dart" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/angel_framework.dart" afterPath="$PROJECT_DIR$/lib/angel_framework.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/common.dart" afterPath="$PROJECT_DIR$/lib/common.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/hooks.dart" afterPath="$PROJECT_DIR$/lib/hooks.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" afterPath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/base_plugin.dart" afterPath="$PROJECT_DIR$/lib/src/http/base_plugin.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/util.dart" afterPath="$PROJECT_DIR$/lib/src/util.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/accepts_test.dart" afterPath="$PROJECT_DIR$/test/accepts_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/common.dart" afterPath="$PROJECT_DIR$/test/common.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/primitives_test.dart" afterPath="$PROJECT_DIR$/test/primitives_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/streaming_test.dart" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/view_generator_test.dart" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -48,63 +29,33 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
+            <state relative-caret-position="15">
+              <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="fast_name_from_symbol.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="37" lean-forward="true" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="100">
-              <caret line="56" column="47" lean-forward="false" selection-start-line="56" selection-start-column="47" selection-end-line="56" selection-end-column="47" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1755">
-              <caret line="123" column="28" lean-forward="false" selection-start-line="123" selection-start-column="28" selection-end-line="123" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-886">
-              <caret line="25" column="26" lean-forward="false" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
+            <state relative-caret-position="225">
+              <caret line="15" column="2" lean-forward="false" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
               <folding>
-                <element signature="e#0#22#0" expanded="true" />
+                <element signature="e#75#92#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="287">
-              <caret line="229" column="26" lean-forward="false" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
+            <state relative-caret-position="390">
+              <caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
               <folding />
             </state>
           </provider>
@@ -113,8 +64,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-4993">
-              <caret line="325" column="20" lean-forward="true" selection-start-line="325" selection-start-column="20" selection-end-line="325" selection-end-column="20" />
+            <state relative-caret-position="9135">
+              <caret line="609" column="0" lean-forward="true" selection-start-line="609" selection-start-column="0" selection-end-line="609" selection-end-column="0" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -122,42 +73,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-9109">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#31#51#0" expanded="true" />
-                <marker date="1506088306000" expanded="true" signature="20449:21847" ph="{...}" />
-                <marker date="1506088306000" expanded="true" signature="20899:20967" ph="{...}" />
-                <marker date="1506088306000" expanded="true" signature="20971:21071" ph="///..." />
-                <marker date="1506088306000" expanded="true" signature="21798:21845" ph="{...}" />
-                <marker date="1506088306000" expanded="true" signature="22179:22221" ph="{...}" />
-                <marker date="1506088306000" expanded="true" signature="22382:22571" ph="{...}" />
-                <marker date="1506088306000" expanded="true" signature="22575:22816" ph="///..." />
-                <marker date="1506088306000" expanded="true" signature="22857:22988" ph="{...}" />
-                <marker date="1506088306000" expanded="true" signature="22894:22914" ph="&lt;~&gt;" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
+            <state relative-caret-position="360">
+              <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
               <folding />
             </state>
           </provider>
@@ -174,9 +94,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>group\('[^']+', \(\)\s*a</find>
-      <find>group\('[^']+', \(\)\s*as</find>
-      <find>_hand</find>
       <find>_handle</find>
       <find>handleContaine</find>
       <find>_handlerC</find>
@@ -189,11 +106,9 @@
       <find>Angel(</find>
       <find>handleRe</find>
       <find>createZ</find>
-      <find>aNGEL(</find>
       <find>zone</find>
       <find>print(</find>
       <find>handleaNGE</find>
-      <find>print</find>
       <find>stderr</find>
       <find>_AFTERp</find>
       <find>_afterProc</find>
@@ -203,7 +118,12 @@
       <find>fatale</find>
       <find>FATAL</find>
       <find>error ??</find>
+      <find>sendRes</find>
+      <find>print</find>
+      <find>.name</find>
       <find>logger</find>
+      <find>handleRequ</find>
+      <find>aNGEL(</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -218,6 +138,7 @@
       <replace>fatalErrorStream</replace>
       <replace>onController</replace>
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
+      <replace>logger?.warning</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -254,7 +175,6 @@
         <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
@@ -279,14 +199,15 @@
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
@@ -321,7 +242,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane" />
       <pane id="Scratches" />
+      <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -337,22 +260,22 @@
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
             </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
+              <item name="test" type="cbb8eebc:String" user="test" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="tool" type="cbb8eebc:String" user="tool" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
       <pane id="PackagesPane" />
     </panes>
   </component>
@@ -386,15 +309,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-    </configuration>
+  <component name="RunManager" selected="Dart Command Line App.performance::hello">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -404,7 +319,14 @@
       <option name="PARAMETERS" value="" />
       <module name="" />
       <envs />
-      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
     </configuration>
     <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
       <method />
@@ -618,7 +540,8 @@
       <workItem from="1502831499213" duration="7608000" />
       <workItem from="1503931951079" duration="2851000" />
       <workItem from="1506050384140" duration="5198000" />
-      <workItem from="1506088028663" duration="752000" />
+      <workItem from="1506088028663" duration="997000" />
+      <workItem from="1506090042437" duration="1455000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -837,43 +760,57 @@
       <option name="project" value="LOCAL" />
       <updated>1506055702294</updated>
     </task>
-    <option name="localTasksCounter" value="32" />
+    <task id="LOCAL-00032" summary="1.1.0-alpha">
+      <created>1506089003709</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1506089003709</updated>
+    </task>
+    <task id="LOCAL-00033" summary="pubspec">
+      <created>1506089080836</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1506089080836</updated>
+    </task>
+    <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.09.22 at 09h 49m 19s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 02s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 09h 49m 48s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 08s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 09h 50m 40s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 16s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 09h 51m 53s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 31s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 09h 52m 53s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 55s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.22 at 09h 54m 18s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 49m 06s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="can_send_html_in_server_test_dart - 2017.09.22 at 09h 52m 57s.xml">
-      <configuration name="can send html in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 49m 37s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="can_send_html_in_server_test_dart - 2017.09.22 at 09h 53m 22s.xml">
-      <configuration name="can send html in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 51m 11s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="can_send_html_in_server_test_dart - 2017.09.22 at 09h 54m 05s.xml">
-      <configuration name="can send html in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 51m 57s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 00h 27m 34s.xml">
+    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 53m 31s.xml">
       <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="53784000" />
+    <option name="totallyTimeSpent" value="55484000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -886,31 +823,30 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="149" y="23" width="1168" height="797" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32842582" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32621083" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56837606" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26376554" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26820603" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -930,8 +866,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="findExpose" />
-    <MESSAGE value="I love stack overflows!!!" />
     <MESSAGE value="Fixed last batch?" />
     <MESSAGE value="1.0.2" />
     <MESSAGE value="+2" />
@@ -955,23 +889,15 @@
     <MESSAGE value="1.0.8" />
     <MESSAGE value="1.0.9+1" />
     <MESSAGE value="1.1.0-alpha start" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.1.0-alpha start" />
+    <MESSAGE value="1.1.0-alpha" />
+    <MESSAGE value="pubspec" />
+    <option name="LAST_COMMIT_MESSAGE" value="pubspec" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="42">
-            <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="109" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/Program Files/Dart/dart-sdk/lib/core/string.dart" />
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/extensible.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart" />
@@ -1000,35 +926,7 @@
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart" />
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib/src/response.dart" />
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="819">
-          <caret line="46" column="20" lean-forward="false" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="18" column="20" lean-forward="false" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1191,21 +1089,12 @@
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-133">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <marker date="1506088306000" expanded="true" signature="421:1640" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-9109">
@@ -1229,15 +1118,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1246,51 +1126,43 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="15">
             <caret line="1" column="65" lean-forward="false" selection-start-line="1" selection-start-column="65" selection-end-line="1" selection-end-column="65" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="229" column="26" lean-forward="false" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4993">
-          <caret line="325" column="20" lean-forward="true" selection-start-line="325" selection-start-column="20" selection-end-line="325" selection-end-column="20" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
           <caret line="27" column="52" lean-forward="false" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
-          <folding />
+        <state relative-caret-position="90">
+          <caret line="12" column="12" lean-forward="true" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="56" column="47" lean-forward="false" selection-start-line="56" selection-start-column="47" selection-end-line="56" selection-end-column="47" />
-          <folding />
+        <state relative-caret-position="192">
+          <caret line="108" column="14" lean-forward="false" selection-start-line="108" selection-start-column="14" selection-end-line="108" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="78" column="18" lean-forward="false" selection-start-line="78" selection-start-column="17" selection-end-line="78" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="13" column="40" lean-forward="true" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
         </state>
       </provider>
     </entry>
@@ -1298,28 +1170,79 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="37" lean-forward="true" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="229" column="26" lean-forward="false" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1755">
-          <caret line="123" column="28" lean-forward="false" selection-start-line="123" selection-start-column="28" selection-end-line="123" selection-end-column="28" />
+        <state relative-caret-position="360">
+          <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib/logging.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-886">
-          <caret line="25" column="26" lean-forward="false" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="26" />
+        <state relative-caret-position="271">
+          <caret line="361" column="0" lean-forward="true" selection-start-line="361" selection-start-column="0" selection-end-line="361" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="8" />
           <folding>
-            <element signature="e#0#22#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="9135">
+          <caret line="609" column="0" lean-forward="true" selection-start-line="609" selection-start-column="0" selection-end-line="609" selection-end-column="0" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="2" lean-forward="false" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index e2482bf6..f750737f 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -147,9 +147,10 @@ class Angel extends AngelBase {
   Route addRoute(String method, Pattern path, Object handler,
       {List middleware: const []}) {
     if (_flattened != null) {
-      print(
+      logger?.warning(
           'WARNING: You added a route ($method $path) to the router, after it had been optimized.');
-      print('This route will be ignored, and no requests will ever reach it.');
+      logger?.warning(
+          'This route will be ignored, and no requests will ever reach it.');
     }
 
     return super.addRoute(method, path, handler, middleware: middleware ?? []);
@@ -158,9 +159,10 @@ class Angel extends AngelBase {
   @override
   mount(Pattern path, Router router, {bool hooked: true, String namespace}) {
     if (_flattened != null) {
-      print(
+      logger?.warning(
           'WARNING: You added mounted a child router ($path) on the router, after it had been optimized.');
-      print('This route will be ignored, and no requests will ever reach it.');
+      logger?.warning(
+          'This route will be ignored, and no requests will ever reach it.');
     }
     return super
         .mount(path, router, hooked: hooked != false, namespace: namespace);
@@ -391,6 +393,7 @@ class Angel extends AngelBase {
       req.inject(MiddlewarePipeline, tuple.item1);
       req.params.addAll(tuple.item2);
       req.inject(Match, tuple.item3);
+      req.inject(Stopwatch, new Stopwatch()..start());
 
       var pipeline = tuple.item1.handlers;
 
@@ -452,7 +455,7 @@ class Angel extends AngelBase {
 
       _walk(_flattened);
 
-      //if (silent != true) print('Angel is running in production mode.');
+      logger?.config('Angel is running in production mode.');
     }
   }
 
@@ -533,7 +536,14 @@ class Angel extends AngelBase {
         ..cookies.addAll(res.cookies)
         ..add(outputBuffer);
 
-      return finalizers.then((_) => request.response.close());
+      return finalizers.then((_) => request.response.close()).then((_) {
+        if (logger != null) {
+          var sw = req.injections[Stopwatch];
+          sw?.stop();
+          logger.info(
+              "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
+        }
+      });
     }
   }
 
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 405c6cde..7c2b2602 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -4,6 +4,7 @@ library performance.hello;
 import 'dart:io';
 import 'dart:isolate';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:logging/logging.dart';
 
 main() {
   for (int i = 0; i < Platform.numberOfProcessors - 1; i++)
@@ -16,10 +17,18 @@ void start(int id) {
     ..lazyParseBodies = true
     ..get('/', (req, res) => res.write('Hello, world!'))
     ..optimizeForProduction(force: true)
-    ..fatalErrorStream.listen((e) {
-      print('Oops: ${e.error}');
-      print(e.stack);
-    });
+    ..logger = (new Logger('streaming_test')
+      ..onRecord.listen((rec) {
+        print(rec);
+        if (rec.stackTrace != null) print(rec.stackTrace);
+      }));
+
+  var oldHandler = app.errorHandler;
+  app.errorHandler = (e, req, res) {
+    print('Oops: ${e.error ?? e}');
+    print(e.stackTrace);
+    return oldHandler(e, req, res);
+  };
   app.startServer(InternetAddress.LOOPBACK_IP_V4, 3000).then((server) {
     print(
         'Instance #$id listening at http://${server.address.address}:${server.port}');
diff --git a/pubspec.yaml b/pubspec.yaml
index 8e380a04..61a75e7e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha
+version: 1.1.0-alpha+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 4b91fc95..3ecf71d2 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 import 'encoders_buffer_test.dart' show encodingTests;
@@ -11,6 +12,13 @@ main() {
 
   setUp(() {
     app = new Angel();
+
+    app.logger = new Logger('streaming_test')
+      ..onRecord.listen((rec) {
+        print(rec);
+        if (rec.stackTrace != null) print(rec.stackTrace);
+      });
+
     app.injectEncoders(
       {
         'deflate': ZLIB.encoder,

From bbf0bd7fa3eb087154cba3ab1bb8b9cd6847a884 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Sep 2017 10:56:11 -0400
Subject: [PATCH 153/414] Updated `use`

---
 .idea/workspace.xml        | 113 ++++++++++++++++---------------------
 lib/src/http/routable.dart |   2 +-
 2 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c82a509b..596e6eec 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/streaming_test.dart" afterPath="$PROJECT_DIR$/test/streaming_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -29,7 +26,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="15">
@@ -39,11 +36,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="15" column="2" lean-forward="false" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
+            <state relative-caret-position="210">
+              <caret line="14" column="20" lean-forward="true" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
               <folding>
                 <element signature="e#75#92#0" expanded="true" />
               </folding>
@@ -51,28 +48,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9135">
-              <caret line="609" column="0" lean-forward="true" selection-start-line="609" selection-start-column="0" selection-end-line="609" selection-end-column="0" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -94,7 +69,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>_handle</find>
       <find>handleContaine</find>
       <find>_handlerC</find>
       <find>angel(</find>
@@ -124,6 +98,7 @@
       <find>logger</find>
       <find>handleRequ</find>
       <find>aNGEL(</find>
+      <find>Routa</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -187,7 +162,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
@@ -207,8 +181,9 @@
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
       </list>
     </option>
   </component>
@@ -541,7 +516,7 @@
       <workItem from="1503931951079" duration="2851000" />
       <workItem from="1506050384140" duration="5198000" />
       <workItem from="1506088028663" duration="997000" />
-      <workItem from="1506090042437" duration="1455000" />
+      <workItem from="1506090042437" duration="1595000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -774,7 +749,14 @@
       <option name="project" value="LOCAL" />
       <updated>1506089080836</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="Logging support">
+      <created>1506092029287</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1506092029287</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -810,7 +792,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55484000" />
+    <option name="totallyTimeSpent" value="55624000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -823,10 +805,11 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="149" y="23" width="1168" height="797" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -834,7 +817,7 @@
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32621083" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56837606" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -866,7 +849,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Fixed last batch?" />
     <MESSAGE value="1.0.2" />
     <MESSAGE value="+2" />
     <MESSAGE value="+3" />
@@ -891,7 +873,8 @@
     <MESSAGE value="1.1.0-alpha start" />
     <MESSAGE value="1.1.0-alpha" />
     <MESSAGE value="pubspec" />
-    <option name="LAST_COMMIT_MESSAGE" value="pubspec" />
+    <MESSAGE value="Logging support" />
+    <option name="LAST_COMMIT_MESSAGE" value="Logging support" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -962,14 +945,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="103" column="28" lean-forward="false" selection-start-line="103" selection-start-column="28" selection-end-line="103" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
@@ -1197,14 +1172,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="27" column="1" lean-forward="true" selection-start-line="27" selection-start-column="1" selection-end-line="27" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
@@ -1215,22 +1182,30 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9135">
-          <caret line="609" column="0" lean-forward="true" selection-start-line="609" selection-start-column="0" selection-end-line="609" selection-end-column="0" />
+        <state relative-caret-position="165">
+          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#75#92#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="2" lean-forward="false" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
+        <state relative-caret-position="299">
+          <caret line="97" column="6" lean-forward="false" selection-start-line="97" selection-start-column="6" selection-end-line="97" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="174" column="39" lean-forward="false" selection-start-line="174" selection-start-column="34" selection-end-line="174" selection-end-column="39" />
           <folding>
-            <element signature="e#75#92#0" expanded="true" />
+            <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1243,6 +1218,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="14" column="20" lean-forward="true" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 272f13f7..208f1097 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -95,7 +95,7 @@ class Routable extends Router {
   /// an [Angel] instance.
   ///
   /// Returns either a [Route] or a [Service] (if one was mounted).
-  use(Pattern path, [Router router, String namespace = null]) {
+  use(path, [Router router, String namespace = null]) {
     Router _router = router;
     Service service;
 

From 5df1056cb810f703782acd8ada77f47e5114d6b6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Sep 2017 10:56:26 -0400
Subject: [PATCH 154/414] +2

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 61a75e7e..a6ffe23b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+1
+version: 1.1.0-alpha+2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 3fcb195d8cbfdd057e61974614a8082fb2707ad2 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 24 Sep 2017 13:56:33 -0400
Subject: [PATCH 155/414] +3

---
 .idea/workspace.xml      | 314 +++++++++++++++++++++++----------------
 CHANGELOG.md             |   4 +
 lib/src/http/server.dart |   6 +-
 pubspec.yaml             |   2 +-
 4 files changed, 198 insertions(+), 128 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 596e6eec..0bbca6ab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -36,11 +38,56 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="197">
+              <caret line="84" column="18" lean-forward="true" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="263">
+              <caret line="528" column="18" lean-forward="false" selection-start-line="528" selection-start-column="18" selection-end-line="528" selection-end-column="18" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="30">
+                <caret line="2" column="72" lean-forward="false" selection-start-line="2" selection-start-column="72" selection-end-line="2" selection-end-column="72" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-618">
+              <caret line="432" column="10" lean-forward="false" selection-start-line="432" selection-start-column="10" selection-end-line="432" selection-end-column="10" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="14" column="20" lean-forward="true" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+            <state relative-caret-position="165">
+              <caret line="14" column="20" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
               <folding>
                 <element signature="e#75#92#0" expanded="true" />
               </folding>
@@ -157,7 +204,6 @@
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
@@ -177,13 +223,14 @@
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -217,9 +264,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane" />
       <pane id="Scratches" />
       <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -232,6 +279,19 @@
               <item name="framework" type="cbb8eebc:String" user="framework" />
               <item name="lib" type="cbb8eebc:String" user="lib" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -251,7 +311,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
+      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -284,7 +344,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.performance::hello">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -400,6 +460,11 @@
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="default view generator" />
     </configuration>
+    <configuration name="only uses one encoder in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="only uses one encoder" />
+    </configuration>
     <configuration name="tests in accepts_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/accepts_test.dart" />
       <option name="testName" value="accepts_test.dart" />
@@ -440,35 +505,36 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="28">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+    <list size="29">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="28" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -516,7 +582,8 @@
       <workItem from="1503931951079" duration="2851000" />
       <workItem from="1506050384140" duration="5198000" />
       <workItem from="1506088028663" duration="997000" />
-      <workItem from="1506090042437" duration="1595000" />
+      <workItem from="1506090042437" duration="1751000" />
+      <workItem from="1506275395906" duration="390000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -756,33 +823,47 @@
       <option name="project" value="LOCAL" />
       <updated>1506092029287</updated>
     </task>
-    <option name="localTasksCounter" value="35" />
+    <task id="LOCAL-00035" summary="Updated `use`">
+      <created>1506092171442</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1506092171442</updated>
+    </task>
+    <task id="LOCAL-00036" summary="+2">
+      <created>1506092186428</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1506092186428</updated>
+    </task>
+    <option name="localTasksCounter" value="37" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 02s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.24 at 13h 52m 04s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 08s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.24 at 13h 52m 57s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 16s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.24 at 13h 53m 37s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 31s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.24 at 13h 54m 09s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 47m 55s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.24 at 13h 55m 05s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 49m 06s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.09.24 at 13h 55m 47s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 49m 37s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_uses_one_encoder_in_encoders_buffer_test_dart - 2017.09.24 at 13h 55m 12s.xml">
+      <configuration name="only uses one encoder in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 51m 11s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_uses_one_encoder_in_encoders_buffer_test_dart - 2017.09.24 at 13h 55m 29s.xml">
+      <configuration name="only uses one encoder in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 51m 57s.xml">
       <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
@@ -792,7 +873,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55624000" />
+    <option name="totallyTimeSpent" value="56170000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -813,23 +894,22 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32621083" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56837606" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26820603" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -840,6 +920,7 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -849,8 +930,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.0.2" />
-    <MESSAGE value="+2" />
     <MESSAGE value="+3" />
     <MESSAGE value="Coverage start..." />
     <MESSAGE value="1.0.3" />
@@ -874,14 +953,15 @@
     <MESSAGE value="1.1.0-alpha" />
     <MESSAGE value="pubspec" />
     <MESSAGE value="Logging support" />
-    <option name="LAST_COMMIT_MESSAGE" value="Logging support" />
+    <MESSAGE value="Updated `use`" />
+    <MESSAGE value="+2" />
+    <option name="LAST_COMMIT_MESSAGE" value="+2" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://C:/Program Files/Dart/dart-sdk/lib/core/string.dart" />
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/extensible.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart" />
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
@@ -938,13 +1018,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="6" lean-forward="false" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
@@ -986,7 +1059,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="104">
           <caret line="255" column="1" lean-forward="false" selection-start-line="255" selection-start-column="1" selection-end-line="255" selection-end-column="1" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1032,15 +1104,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2640">
           <caret line="181" column="46" lean-forward="false" selection-start-line="181" selection-start-column="46" selection-end-line="181" selection-end-column="46" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2265">
-          <caret line="160" column="101" lean-forward="false" selection-start-line="160" selection-start-column="101" selection-end-line="160" selection-end-column="101" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1049,7 +1112,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1057,7 +1119,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="64" lean-forward="false" selection-start-line="4" selection-start-column="64" selection-end-line="4" selection-end-column="64" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1065,7 +1126,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-133">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1074,18 +1134,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-9109">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#31#51#0" expanded="true" />
-            <marker date="1506088306000" expanded="true" signature="20449:21847" ph="{...}" />
-            <marker date="1506088306000" expanded="true" signature="20899:20967" ph="{...}" />
-            <marker date="1506088306000" expanded="true" signature="20971:21071" ph="///..." />
-            <marker date="1506088306000" expanded="true" signature="21798:21845" ph="{...}" />
-            <marker date="1506088306000" expanded="true" signature="22179:22221" ph="{...}" />
-            <marker date="1506088306000" expanded="true" signature="22382:22571" ph="{...}" />
-            <marker date="1506088306000" expanded="true" signature="22575:22816" ph="///..." />
-            <marker date="1506088306000" expanded="true" signature="22857:22988" ph="{...}" />
-            <marker date="1506088306000" expanded="true" signature="22894:22914" ph="&lt;~&gt;" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1096,16 +1144,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="15">
-            <caret line="1" column="65" lean-forward="false" selection-start-line="1" selection-start-column="65" selection-end-line="1" selection-end-column="65" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
@@ -1152,7 +1190,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="527">
           <caret line="229" column="26" lean-forward="false" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1176,9 +1213,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="8" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1186,9 +1220,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding>
-            <element signature="e#75#92#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1200,16 +1231,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="174" column="39" lean-forward="false" selection-start-line="174" selection-start-column="34" selection-end-line="174" selection-end-column="39" />
+        <state relative-caret-position="165">
+          <caret line="14" column="20" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#75#92#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/bytes_builder.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="57" column="12" lean-forward="false" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-618">
+          <caret line="432" column="10" lean-forward="false" selection-start-line="432" selection-start-column="10" selection-end-line="432" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
@@ -1218,16 +1265,35 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="14" column="20" lean-forward="true" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        <state relative-caret-position="197">
+          <caret line="84" column="18" lean-forward="true" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="263">
+          <caret line="528" column="18" lean-forward="false" selection-start-line="528" selection-start-column="18" selection-end-line="528" selection-end-column="18" />
           <folding>
-            <element signature="e#75#92#0" expanded="true" />
+            <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="72" lean-forward="false" selection-start-line="2" selection-start-column="72" selection-end-line="2" selection-end-column="72" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36af592b..41e8b2e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.0-alpha+3
+* Fixed a bug where `encoders` would cause a malformed response to be sent.
+* Fixed a bug where `encoders` would not always use the correct encoder.
+
 # 1.1.0-alpha
 * Removed `AngelFatalError`, and subsequently `fatalErrorStream`.
 * Removed all `@deprecated` members.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index f750737f..5d61273c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -498,9 +498,8 @@ class Angel extends AngelBase {
         request.response.headers.add(key, res.headers[key]);
       }
 
-      request.response.headers
-        ..chunkedTransferEncoding = res.chunked ?? true
-        ..set(HttpHeaders.CONTENT_LENGTH, res.buffer.length);
+      request.response.contentLength = res.buffer.length;
+      request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
 
       List<int> outputBuffer = res.buffer.toBytes();
 
@@ -526,6 +525,7 @@ class Angel extends AngelBase {
           if (encoder != null) {
             request.response.headers.set(HttpHeaders.CONTENT_ENCODING, key);
             outputBuffer = res.encoders[key].convert(outputBuffer);
+            request.response.contentLength = outputBuffer.length;
             break;
           }
         }
diff --git a/pubspec.yaml b/pubspec.yaml
index a6ffe23b..81c5b0ee 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+2
+version: 1.1.0-alpha+3
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From e3e25453b6427d6a1f0d26bada6097b91376072a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 24 Sep 2017 15:43:14 -0400
Subject: [PATCH 156/414] +4

---
 .idea/workspace.xml               | 283 ++++++++++++++++--------------
 CHANGELOG.md                      |   4 +
 lib/src/http/angel_base.dart      |  10 +-
 lib/src/http/controller.dart      | 116 +-----------
 lib/src/http/injection.dart       | 150 ++++++++++++++++
 lib/src/http/request_context.dart |  20 ++-
 lib/src/http/routable.dart        |   6 +-
 lib/src/http/server.dart          |  52 ++----
 pubspec.yaml                      |   2 +-
 test/precontained_test.dart       |   2 +-
 test/server_test.dart             |   6 +-
 test/util_test.dart               |   6 +-
 12 files changed, 344 insertions(+), 313 deletions(-)
 create mode 100644 lib/src/http/injection.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0bbca6ab..1ef420b2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/injection.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/precontained_test.dart" afterPath="$PROJECT_DIR$/test/precontained_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/util_test.dart" afterPath="$PROJECT_DIR$/test/util_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -28,47 +36,50 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="197">
-              <caret line="84" column="18" lean-forward="true" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="263">
-              <caret line="528" column="18" lean-forward="false" selection-start-line="528" selection-start-column="18" selection-end-line="528" selection-end-column="18" />
+            <state relative-caret-position="249">
+              <caret line="43" column="63" lean-forward="false" selection-start-line="43" selection-start-column="63" selection-end-line="43" selection-end-column="63" />
               <folding>
-                <element signature="e#38#58#0" expanded="true" />
+                <element signature="e#47#67#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="30">
-                <caret line="2" column="72" lean-forward="false" selection-start-line="2" selection-start-column="72" selection-end-line="2" selection-end-column="72" />
-                <folding />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-786">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding>
+                <element signature="e#42#62#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1166">
+              <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+              <folding>
+                <element signature="e#40#60#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding>
+                <element signature="e#39#59#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -76,35 +87,13 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-618">
+            <state relative-caret-position="6345">
               <caret line="432" column="10" lean-forward="false" selection-start-line="432" selection-start-column="10" selection-end-line="432" selection-end-column="10" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="14" column="20" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
-              <folding>
-                <element signature="e#75#92#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -116,10 +105,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>handleContaine</find>
-      <find>_handlerC</find>
-      <find>angel(</find>
-      <find>depre</find>
       <find>deprecated</find>
       <find>close!</find>
       <find>close(</find>
@@ -146,6 +131,10 @@
       <find>handleRequ</find>
       <find>aNGEL(</find>
       <find>Routa</find>
+      <find>properties</find>
+      <find>noSuchM</find>
+      <find>preInj</find>
+      <find>REQU</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -167,6 +156,7 @@
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib</dir>
+      <dir>$PROJECT_DIR$/lib/src</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -180,7 +170,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/memory_service.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/README.md" />
@@ -196,7 +185,6 @@
         <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
@@ -205,13 +193,11 @@
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
@@ -227,10 +213,14 @@
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
       </list>
     </option>
   </component>
@@ -265,8 +255,6 @@
     </navigator>
     <panes>
       <pane id="Scratches" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -311,7 +299,9 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -583,7 +573,8 @@
       <workItem from="1506050384140" duration="5198000" />
       <workItem from="1506088028663" duration="997000" />
       <workItem from="1506090042437" duration="1751000" />
-      <workItem from="1506275395906" duration="390000" />
+      <workItem from="1506275395906" duration="424000" />
+      <workItem from="1506281553143" duration="624000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -837,13 +828,17 @@
       <option name="project" value="LOCAL" />
       <updated>1506092186428</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="+3">
+      <created>1506275793202</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1506275793202</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.09.24 at 13h 52m 04s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2017.09.24 at 13h 52m 57s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -859,6 +854,9 @@
     <history-entry file="All_Tests - 2017.09.24 at 13h 55m 47s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2017.09.24 at 15h 41m 37s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="only_uses_one_encoder_in_encoders_buffer_test_dart - 2017.09.24 at 13h 55m 12s.xml">
       <configuration name="only uses one encoder in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -873,7 +871,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="56170000" />
+    <option name="totallyTimeSpent" value="56828000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -896,14 +894,15 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32621083" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37154695" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.56837606" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48246676" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26820603" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -920,7 +919,6 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -930,7 +928,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="+3" />
     <MESSAGE value="Coverage start..." />
     <MESSAGE value="1.0.3" />
     <MESSAGE value="+1" />
@@ -955,14 +952,14 @@
     <MESSAGE value="Logging support" />
     <MESSAGE value="Updated `use`" />
     <MESSAGE value="+2" />
-    <option name="LAST_COMMIT_MESSAGE" value="+2" />
+    <MESSAGE value="+3" />
+    <option name="LAST_COMMIT_MESSAGE" value="+3" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/extensible.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart" />
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1100,13 +1097,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2640">
-          <caret line="181" column="46" lean-forward="false" selection-start-line="181" selection-start-column="46" selection-end-line="181" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1115,20 +1105,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="64" lean-forward="false" selection-start-line="4" selection-start-column="64" selection-end-line="4" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-133">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1186,13 +1162,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="229" column="26" lean-forward="false" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
@@ -1205,7 +1174,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="271">
           <caret line="361" column="0" lean-forward="true" selection-start-line="361" selection-start-column="0" selection-end-line="361" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1223,20 +1191,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="97" column="6" lean-forward="false" selection-start-line="97" selection-start-column="6" selection-end-line="97" selection-end-column="6" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="14" column="20" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
           <folding>
-            <element signature="e#75#92#0" expanded="true" />
+            <element signature="e#75#92#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1245,18 +1205,76 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="57" column="12" lean-forward="false" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="12" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-618">
+        <state relative-caret-position="6345">
           <caret line="432" column="10" lean-forward="false" selection-start-line="432" selection-start-column="10" selection-end-line="432" selection-end-column="10" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-786">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="57" lean-forward="false" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="222">
+          <caret line="59" column="41" lean-forward="true" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" />
+          <folding>
+            <element signature="e#4016#4950#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1166">
+          <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
@@ -1267,30 +1285,29 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="84" column="18" lean-forward="true" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
+        <state relative-caret-position="903">
+          <caret line="84" column="18" lean-forward="false" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="528" column="18" lean-forward="false" selection-start-line="528" selection-start-column="18" selection-end-line="528" selection-end-column="18" />
+        <state relative-caret-position="8085">
+          <caret line="539" column="8" lean-forward="false" selection-start-line="539" selection-start-column="8" selection-end-line="539" selection-end-column="8" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="72" lean-forward="false" selection-start-line="2" selection-start-column="72" selection-end-line="2" selection-end-column="72" />
-            <folding />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="249">
+          <caret line="43" column="63" lean-forward="false" selection-start-line="43" selection-start-column="63" selection-end-line="43" selection-end-column="63" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41e8b2e4..1ff0f3b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.0-alpha+4
+* Made `injections` in `RequestContext` private.
+* Renamed `properties` in `AngelBase` to `configuration`.
+
 # 1.1.0-alpha+3
 * Fixed a bug where `encoders` would cause a malformed response to be sent.
 * Fixed a bug where `encoders` would not always use the correct encoder.
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 2004eaf2..8eb2b533 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -13,7 +13,7 @@ typedef Future<String> ViewGenerator(String path, [Map data]);
 class AngelBase extends Routable {
   Container _container = new Container();
 
-  final Map properties = {};
+  final Map configuration = {};
 
   /// When set to true, the request body will not be parsed
   /// automatically. You can call `req.parse()` manually,
@@ -33,18 +33,18 @@ class AngelBase extends Routable {
   ViewGenerator viewGenerator = (String view, [Map data]) async =>
       "No view engine has been configured yet.";
 
-  operator [](key) => properties[key];
-  operator []=(key, value) => properties[key] = value;
+  operator [](key) => configuration[key];
+  operator []=(key, value) => configuration[key] = value;
 
   noSuchMethod(Invocation invocation) {
     if (invocation.memberName != null) {
       String name = fastNameFromSymbol(invocation.memberName);
 
       if (invocation.isMethod) {
-        return Function.apply(properties[name], invocation.positionalArguments,
+        return Function.apply(configuration[name], invocation.positionalArguments,
             invocation.namedArguments);
       } else if (invocation.isGetter) {
-        return properties[name];
+        return configuration[name];
       }
     }
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 811df1de..e4da9c9f 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -8,34 +8,7 @@ import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
-import 'server.dart' show Angel, preInject;
-
-const List<Type> _primitiveTypes = const [String, int, num, double, Null];
-
-/// Contains a list of the data required for a DI-enabled method to run.
-///
-/// This improves performance by removing the necessity to reflect a method
-/// every time it is requested.
-///
-/// Regular request handlers can also skip DI entirely, lowering response time
-/// and memory use.
-class InjectionRequest {
-  /// Optional, typed data that can be passed to a DI-enabled method.
-  final Map<String, Type> named;
-
-  /// A list of the arguments required for a DI-enabled method to run.
-  final List required;
-
-  /// A list of the arguments that can be null in a DI-enabled method.
-  final List<String> optional;
-
-  const InjectionRequest.constant({this.named, this.required, this.optional});
-
-  InjectionRequest()
-      : named = {},
-        required = [],
-        optional = [];
-}
+import 'server.dart' show Angel;
 
 /// Supports grouping routes with shared functionality.
 class Controller {
@@ -144,90 +117,3 @@ class Controller {
       .map((m) => m.reflectee)
       .firstWhere((r) => r is Expose, orElse: () => null);
 }
-
-/// Shortcut for calling [preInject], and then [handleContained].
-///
-/// Use this to instantly create a request handler for a DI-enabled method.
-RequestHandler createDynamicHandler(handler,
-    {Iterable<String> optional: const []}) {
-  var injection = preInject(handler);
-  injection.optional.addAll(optional ?? []);
-  return handleContained(handler, injection);
-}
-
-/// Handles a request with a DI-enabled handler.
-RequestHandler handleContained(handler, InjectionRequest injection) {
-  return (RequestContext req, ResponseContext res) async {
-    List args = [];
-
-    void inject(requirement) {
-      var propFromApp;
-
-      if (requirement == RequestContext) {
-        args.add(req);
-      } else if (requirement == ResponseContext) {
-        args.add(res);
-      } else if (requirement is String) {
-        if (req.params.containsKey(requirement)) {
-          args.add(req.params[requirement]);
-        } else if (req.injections.containsKey(requirement))
-          args.add(req.injections[requirement]);
-        else if (req.properties.containsKey(requirement))
-          args.add(req.properties[requirement]);
-        else if ((propFromApp = req.app.findProperty(requirement)) != null)
-          args.add(propFromApp);
-        else if (injection.optional.contains(requirement))
-          args.add(null);
-        else {
-          throw new ArgumentError(
-              "Cannot resolve parameter '$requirement' within handler.");
-        }
-      } else if (requirement is List &&
-          requirement.length == 2 &&
-          requirement.first is String &&
-          requirement.last is Type) {
-        String key = requirement.first;
-        Type type = requirement.last;
-        if (req.params.containsKey(key) ||
-            req.injections.containsKey(key) ||
-            req.properties.containsKey(key) ||
-            req.app.properties.containsKey(key) ||
-            _primitiveTypes.contains(type)) {
-          inject(key);
-        } else
-          inject(type);
-      } else if (requirement is Type && requirement != dynamic) {
-        if (req.injections.containsKey(requirement))
-          args.add(req.injections[requirement]);
-        else
-          args.add(req.app.container.make(requirement));
-      } else {
-        throw new ArgumentError(
-            '$requirement cannot be injected into a request handler.');
-      }
-    }
-
-    Map<Symbol, dynamic> named = {};
-    injection.required.forEach(inject);
-
-    injection.named.forEach((k, v) {
-      var name = new Symbol(k);
-      if (req.params.containsKey(k))
-        named[name] = v;
-      else if (req.injections.containsKey(k))
-        named[name] = v;
-      else if (req.injections.containsKey(v) && v != dynamic)
-        named[name] = v;
-      else {
-        try {
-          named[name] = req.app.container.make(v);
-        } catch (e) {
-          named[name] = null;
-        }
-      }
-    });
-
-    var result = Function.apply(handler, args, named);
-    return result is Future ? await result : result;
-  };
-}
diff --git a/lib/src/http/injection.dart b/lib/src/http/injection.dart
new file mode 100644
index 00000000..4b89c7b5
--- /dev/null
+++ b/lib/src/http/injection.dart
@@ -0,0 +1,150 @@
+part of angel_framework.http.request_context;
+
+const List<Type> _primitiveTypes = const [String, int, num, double, Null];
+
+/// Shortcut for calling [preInject], and then [handleContained].
+///
+/// Use this to instantly create a request handler for a DI-enabled method.
+RequestHandler createDynamicHandler(handler,
+    {Iterable<String> optional: const []}) {
+  var injection = preInject(handler);
+  injection.optional.addAll(optional ?? []);
+  return handleContained(handler, injection);
+}
+
+/// Handles a request with a DI-enabled handler.
+RequestHandler handleContained(handler, InjectionRequest injection) {
+  return (RequestContext req, ResponseContext res) async {
+    List args = [];
+
+    void inject(requirement) {
+      var propFromApp;
+
+      if (requirement == RequestContext) {
+        args.add(req);
+      } else if (requirement == ResponseContext) {
+        args.add(res);
+      } else if (requirement is String) {
+        if (req.params.containsKey(requirement)) {
+          args.add(req.params[requirement]);
+        } else if (req._injections.containsKey(requirement))
+          args.add(req._injections[requirement]);
+        else if (req.properties.containsKey(requirement))
+          args.add(req.properties[requirement]);
+        else if ((propFromApp = req.app.findProperty(requirement)) != null)
+          args.add(propFromApp);
+        else if (injection.optional.contains(requirement))
+          args.add(null);
+        else {
+          throw new ArgumentError(
+              "Cannot resolve parameter '$requirement' within handler.");
+        }
+      } else if (requirement is List &&
+          requirement.length == 2 &&
+          requirement.first is String &&
+          requirement.last is Type) {
+        String key = requirement.first;
+        Type type = requirement.last;
+        if (req.params.containsKey(key) ||
+            req._injections.containsKey(key) ||
+            req.properties.containsKey(key) ||
+            req.app.configuration.containsKey(key) ||
+            _primitiveTypes.contains(type)) {
+          inject(key);
+        } else
+          inject(type);
+      } else if (requirement is Type && requirement != dynamic) {
+        if (req._injections.containsKey(requirement))
+          args.add(req._injections[requirement]);
+        else
+          args.add(req.app.container.make(requirement));
+      } else {
+        throw new ArgumentError(
+            '$requirement cannot be injected into a request handler.');
+      }
+    }
+
+    Map<Symbol, dynamic> named = {};
+    injection.required.forEach(inject);
+
+    injection.named.forEach((k, v) {
+      var name = new Symbol(k);
+      if (req.params.containsKey(k))
+        named[name] = v;
+      else if (req._injections.containsKey(k))
+        named[name] = v;
+      else if (req._injections.containsKey(v) && v != dynamic)
+        named[name] = v;
+      else {
+        try {
+          named[name] = req.app.container.make(v);
+        } catch (e) {
+          named[name] = null;
+        }
+      }
+    });
+
+    var result = Function.apply(handler, args, named);
+    return result is Future ? await result : result;
+  };
+}
+
+/// Contains a list of the data required for a DI-enabled method to run.
+///
+/// This improves performance by removing the necessity to reflect a method
+/// every time it is requested.
+///
+/// Regular request handlers can also skip DI entirely, lowering response time
+/// and memory use.
+class InjectionRequest {
+  /// Optional, typed data that can be passed to a DI-enabled method.
+  final Map<String, Type> named;
+
+  /// A list of the arguments required for a DI-enabled method to run.
+  final List required;
+
+  /// A list of the arguments that can be null in a DI-enabled method.
+  final List<String> optional;
+
+  const InjectionRequest.constant({this.named, this.required, this.optional});
+
+  InjectionRequest()
+      : named = {},
+        required = [],
+        optional = [];
+}
+
+/// Predetermines what needs to be injected for a handler to run.
+InjectionRequest preInject(Function handler) {
+  var injection = new InjectionRequest();
+
+  ClosureMirror closureMirror = reflect(handler);
+
+  if (closureMirror.function.parameters.isEmpty) return injection;
+
+  // Load parameters
+  for (var parameter in closureMirror.function.parameters) {
+    var name = MirrorSystem.getName(parameter.simpleName);
+    var type = parameter.type.reflectedType;
+
+    if (!parameter.isNamed) {
+      if (parameter.isOptional) injection.optional.add(name);
+
+      if (type == RequestContext || type == ResponseContext) {
+        injection.required.add(type);
+      } else if (name == 'req') {
+        injection.required.add(RequestContext);
+      } else if (name == 'res') {
+        injection.required.add(ResponseContext);
+      } else if (type == dynamic) {
+        injection.required.add(name);
+      } else {
+        injection.required.add([name, type]);
+      }
+    } else {
+      injection.named[name] = type;
+    }
+  }
+
+  return injection;
+}
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index aa0f3bf1..8e871b3f 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -2,10 +2,14 @@ library angel_framework.http.request_context;
 
 import 'dart:async';
 import 'dart:io';
+import 'dart:mirrors';
 import 'package:body_parser/body_parser.dart';
 import 'package:charcode/charcode.dart';
 import '../fast_name_from_symbol.dart';
+import 'response_context.dart';
+import 'routable.dart';
 import 'server.dart' show Angel;
+part 'injection.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
 @proxy
@@ -35,8 +39,10 @@ class RequestContext {
   /// The requested hostname.
   String get hostname => io.headers.value(HttpHeaders.HOST);
 
-  /// A [Map] of values that should be DI'd.
-  final Map injections = {};
+  final Map _injections = {};
+
+  /// A [Map] of singletons injected via [inject]. *Read-only*.
+  Map get injections => new Map.unmodifiable(_injections);
 
   /// The underlying [HttpRequest] instance underneath this context.
   HttpRequest get io => _io;
@@ -181,14 +187,14 @@ class RequestContext {
     return ctx;
   }
 
-  /// Grabs an object by key or type from [params], [injections], or
+  /// Grabs an object by key or type from [params], [_injections], or
   /// [app].container. Use this to perform dependency injection
   /// within a service hook.
   T grab<T>(key) {
     if (params.containsKey(key))
       return params[key];
-    else if (injections.containsKey(key))
-      return injections[key];
+    else if (_injections.containsKey(key))
+      return _injections[key];
     else if (properties.containsKey(key))
       return properties[key];
     else {
@@ -206,9 +212,9 @@ class RequestContext {
     }
   }
 
-  /// Shorthand to add to [injections].
+  /// Shorthand to add to [_injections].
   void inject(type, value) {
-    injections[type] = value;
+    _injections[type] = value;
   }
 
   /// Returns `true` if the client's `Accept` header indicates that the given [contentType] is considered a valid response.
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 208f1097..c8178c05 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -37,7 +37,7 @@ RequestMiddleware waterfall(List handlers) {
 class Routable extends Router {
   final Map<Pattern, Controller> _controllers = {};
   final Map<Pattern, Service> _services = {};
-  final Map properties = {};
+  final Map configuration = {};
 
   Routable({bool debug: false}) : super(debug: debug);
 
@@ -134,9 +134,9 @@ class Routable extends Router {
 
     // Also copy properties...
     if (router is Routable) {
-      Map copiedProperties = new Map.from(router.properties);
+      Map copiedProperties = new Map.from(router.configuration);
       for (String propertyName in copiedProperties.keys) {
-        properties.putIfAbsent("$middlewarePrefix$propertyName",
+        configuration.putIfAbsent("$middlewarePrefix$propertyName",
             () => copiedMiddleware[propertyName]);
       }
     }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 5d61273c..1ffcd60f 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -3,7 +3,6 @@ library angel_framework.http.server;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:mirrors';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart' hide Extensible;
 import 'package:charcode/charcode.dart';
@@ -290,7 +289,8 @@ class Angel extends AngelBase {
 
   Future<RequestContext> createRequestContext(HttpRequest request) {
     return RequestContext.from(request, this).then((req) {
-      return req..injections.addAll(_injections ?? {});
+      _injections.forEach(req.inject);
+      return req;
     });
   }
 
@@ -309,7 +309,7 @@ class Angel extends AngelBase {
 
   /// Attempts to find a property by the given name within this application.
   findProperty(key) {
-    if (properties.containsKey(key)) return properties[key];
+    if (configuration.containsKey(key)) return configuration[key];
     return parent != null ? parent.findProperty(key) : null;
   }
 
@@ -538,10 +538,13 @@ class Angel extends AngelBase {
 
       return finalizers.then((_) => request.response.close()).then((_) {
         if (logger != null) {
-          var sw = req.injections[Stopwatch];
-          sw?.stop();
-          logger.info(
-              "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
+          var sw = req.grab<Stopwatch>(Stopwatch);
+
+          if (sw.isRunning) {
+            sw?.stop();
+            logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
+                    ?.elapsedMilliseconds ?? 'unknown'} ms)");
+          }
         }
       });
     }
@@ -670,38 +673,3 @@ class Angel extends AngelBase {
     return new Angel.fromSecurityContext(serverContext);
   }
 }
-
-/// Predetermines what needs to be injected for a handler to run.
-InjectionRequest preInject(Function handler) {
-  var injection = new InjectionRequest();
-
-  ClosureMirror closureMirror = reflect(handler);
-
-  if (closureMirror.function.parameters.isEmpty) return injection;
-
-  // Load parameters
-  for (var parameter in closureMirror.function.parameters) {
-    var name = MirrorSystem.getName(parameter.simpleName);
-    var type = parameter.type.reflectedType;
-
-    if (!parameter.isNamed) {
-      if (parameter.isOptional) injection.optional.add(name);
-
-      if (type == RequestContext || type == ResponseContext) {
-        injection.required.add(type);
-      } else if (name == 'req') {
-        injection.required.add(RequestContext);
-      } else if (name == 'res') {
-        injection.required.add(ResponseContext);
-      } else if (type == dynamic) {
-        injection.required.add(name);
-      } else {
-        injection.required.add([name, type]);
-      }
-    } else {
-      injection.named[name] = type;
-    }
-  }
-
-  return injection;
-}
diff --git a/pubspec.yaml b/pubspec.yaml
index 81c5b0ee..21151459 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+3
+version: 1.1.0-alpha+4
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 319d1f8c..623bc62c 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -6,7 +6,7 @@ import 'package:test/test.dart';
 main() {
   test('preinjects functions', () async {
     var app = new Angel()
-      ..properties['foo'] = 'bar'
+      ..configuration['foo'] = 'bar'
       ..get('/foo', echoAppFoo);
     app.optimizeForProduction(force: true);
     print(app.preContained);
diff --git a/test/server_test.dart b/test/server_test.dart
index e016f2b2..bbc85c7e 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -21,7 +21,7 @@ main() {
   });
 
   group('scoping', () {
-    var parent = new Angel()..properties['two'] = 2;
+    var parent = new Angel()..configuration['two'] = 2;
     var child = new Angel();
     parent.use('/child', child);
 
@@ -66,10 +66,10 @@ main() {
   test('plug-ins run on startup', () async {
     var app = new Angel();
     app.startupHooks.add((app) async {
-      app.properties['two'] = 2;
+      app.configuration['two'] = 2;
     });
     await app.startServer();
-    expect(app.properties['two'], 2);
+    expect(app.configuration['two'], 2);
     await app.close();
   });
 
diff --git a/test/util_test.dart b/test/util_test.dart
index 8b112f25..654d4f9f 100644
--- a/test/util_test.dart
+++ b/test/util_test.dart
@@ -21,9 +21,9 @@ main() {
     });
 
     test('can use app.properties like members', () {
-      app.properties['hello'] = 'world';
-      app.properties['foo'] = () => 'bar';
-      app.properties['Foo'] = new Foo('bar');
+      app.configuration['hello'] = 'world';
+      app.configuration['foo'] = () => 'bar';
+      app.configuration['Foo'] = new Foo('bar');
 
       expect(app.hello, equals('world'));
       expect(app.foo(), equals('bar'));

From 27ca19bbeacc1dfd4ef2fe9c6392e7793718bf8f Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 4 Oct 2017 10:09:12 -0400
Subject: [PATCH 157/414] 1.1.0-alpha+5

---
 .idea/workspace.xml                | 564 +++++++++++++++++------------
 CHANGELOG.md                       |   9 +
 example/json.dart                  |   8 +-
 lib/src/http/angel_base.dart       |  20 -
 lib/src/http/base_middleware.dart  |   9 -
 lib/src/http/base_plugin.dart      |   8 -
 lib/src/http/controller.dart       |   4 +-
 lib/src/http/http.dart             |   6 +-
 lib/src/http/request_context.dart  |  20 -
 lib/src/http/response_context.dart |   6 +-
 lib/src/http/routable.dart         |  12 +-
 lib/src/http/server.dart           |  79 ++--
 pubspec.yaml                       |   2 +-
 test/all.dart                      |   2 -
 test/controller_test.dart          |  10 +-
 test/di_test.dart                  |   4 +-
 test/routing_test.dart             |  47 ++-
 test/server_test.dart              |  16 +-
 test/util_test.dart                |  33 --
 19 files changed, 438 insertions(+), 421 deletions(-)
 delete mode 100644 lib/src/http/base_middleware.dart
 delete mode 100644 lib/src/http/base_plugin.dart
 delete mode 100644 test/util_test.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1ef420b2..ed7a7c9c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,24 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/injection.dart" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/base_plugin.dart" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/test/util_test.dart" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/precontained_test.dart" afterPath="$PROJECT_DIR$/test/precontained_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/util_test.dart" afterPath="$PROJECT_DIR$/test/util_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -36,23 +42,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="249">
-              <caret line="43" column="63" lean-forward="false" selection-start-line="43" selection-start-column="63" selection-end-line="43" selection-end-column="63" />
-              <folding>
-                <element signature="e#47#67#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-786">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="139">
+              <caret line="54" column="8" lean-forward="false" selection-start-line="54" selection-start-column="8" selection-end-line="54" selection-end-column="8" />
               <folding>
                 <element signature="e#42#62#0" expanded="true" />
               </folding>
@@ -60,26 +54,60 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1166">
-              <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-              <folding>
-                <element signature="e#40#60#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="165">
+              <caret line="13" column="34" lean-forward="false" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="285">
+                <caret line="19" column="6" lean-forward="true" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+                <folding>
+                  <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
+                </folding>
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#39#59#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="90">
+              <caret line="6" column="25" lean-forward="false" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="105">
+                <caret line="7" column="85" lean-forward="false" selection-start-line="7" selection-start-column="85" selection-end-line="7" selection-end-column="85" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="75">
+              <caret line="11" column="8" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -87,13 +115,49 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6345">
-              <caret line="432" column="10" lean-forward="false" selection-start-line="432" selection-start-column="10" selection-end-line="432" selection-end-column="10" />
+            <state relative-caret-position="139">
+              <caret line="264" column="63" lean-forward="false" selection-start-line="264" selection-start-column="63" selection-end-line="264" selection-end-column="63" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="168">
+              <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="420">
+              <caret line="28" column="62" lean-forward="false" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="180">
+              <caret line="95" column="61" lean-forward="false" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="61" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -105,14 +169,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>deprecated</find>
-      <find>close!</find>
-      <find>close(</find>
-      <find>addStream</find>
-      <find>Angel(</find>
-      <find>handleRe</find>
-      <find>createZ</find>
-      <find>zone</find>
       <find>print(</find>
       <find>handleaNGE</find>
       <find>stderr</find>
@@ -135,6 +191,14 @@
       <find>noSuchM</find>
       <find>preInj</find>
       <find>REQU</find>
+      <find>registermid</find>
+      <find>custom(</find>
+      <find>errorHand</find>
+      <find>god.deserialize</find>
+      <find>registerMi</find>
+      <find>addStr</find>
+      <find>Stopwatc</find>
+      <find>_controllers</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -150,6 +214,7 @@
       <replace>onController</replace>
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
       <replace>logger?.warning</replace>
+      <replace>JSON.decode</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -157,6 +222,7 @@
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
+      <dir>$PROJECT_DIR$/test</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -170,7 +236,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
@@ -188,12 +253,8 @@
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
@@ -201,26 +262,31 @@
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
       </list>
     </option>
   </component>
@@ -231,7 +297,7 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="149" />
+    <option name="x" value="166" />
     <option name="y" value="23" />
     <option name="width" value="1168" />
     <option name="height" value="797" />
@@ -254,6 +320,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scratches" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -299,7 +366,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane" />
       <pane id="AndroidView" />
     </panes>
@@ -450,6 +516,11 @@
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="default view generator" />
     </configuration>
+    <configuration name="only match route with matching method in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="only match route with matching method" />
+    </configuration>
     <configuration name="only uses one encoder in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -495,36 +566,37 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="29">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+    <list size="30">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="28" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="29" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -574,7 +646,8 @@
       <workItem from="1506088028663" duration="997000" />
       <workItem from="1506090042437" duration="1751000" />
       <workItem from="1506275395906" duration="424000" />
-      <workItem from="1506281553143" duration="624000" />
+      <workItem from="1506281553143" duration="657000" />
+      <workItem from="1507123481086" duration="2431000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -835,43 +908,50 @@
       <option name="project" value="LOCAL" />
       <updated>1506275793202</updated>
     </task>
-    <option name="localTasksCounter" value="38" />
+    <task id="LOCAL-00038" summary="+4">
+      <created>1506282194150</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1506282194150</updated>
+    </task>
+    <option name="localTasksCounter" value="39" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.09.24 at 13h 52m 57s.xml">
+    <history-entry file="All_Tests - 2017.10.04 at 09h 53m 19s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.24 at 13h 53m 37s.xml">
+    <history-entry file="All_Tests - 2017.10.04 at 09h 54m 24s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.24 at 13h 54m 09s.xml">
+    <history-entry file="All_Tests - 2017.10.04 at 09h 55m 00s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.24 at 13h 55m 05s.xml">
+    <history-entry file="All_Tests - 2017.10.04 at 09h 56m 57s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.24 at 13h 55m 47s.xml">
+    <history-entry file="All_Tests - 2017.10.04 at 09h 57m 31s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.09.24 at 15h 41m 37s.xml">
+    <history-entry file="All_Tests - 2017.10.04 at 10h 01m 10s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_uses_one_encoder_in_encoders_buffer_test_dart - 2017.09.24 at 13h 55m 12s.xml">
-      <configuration name="only uses one encoder in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.10.04 at 10h 07m 57s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_uses_one_encoder_in_encoders_buffer_test_dart - 2017.09.24 at 13h 55m 29s.xml">
-      <configuration name="only uses one encoder in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.10.04 at 09h 49m 09s.xml">
+      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 51m 57s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.10.04 at 09h 49m 38s.xml">
+      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_streaming_test_dart - 2017.09.22 at 10h 53m 31s.xml">
-      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.10.04 at 09h 52m 16s.xml">
+      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="56828000" />
+    <option name="totallyTimeSpent" value="59292000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -883,24 +963,23 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="149" y="23" width="1168" height="797" extended-state="0" />
+    <frame x="166" y="23" width="1168" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37154695" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34188035" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31438935" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48246676" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4814815" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26820603" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27264655" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -917,6 +996,7 @@
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
     </layout>
@@ -928,7 +1008,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Coverage start..." />
     <MESSAGE value="1.0.3" />
     <MESSAGE value="+1" />
     <MESSAGE value="1.0.4" />
@@ -953,39 +1032,14 @@
     <MESSAGE value="Updated `use`" />
     <MESSAGE value="+2" />
     <MESSAGE value="+3" />
-    <option name="LAST_COMMIT_MESSAGE" value="+3" />
+    <MESSAGE value="+4" />
+    <option name="LAST_COMMIT_MESSAGE" value="+4" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/extensible.dart" />
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/util_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="277">
-          <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="231">
-            <caret line="11" column="7" lean-forward="false" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart" />
     <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib/src/response.dart" />
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1001,13 +1055,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="32" column="39" lean-forward="false" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -1031,13 +1078,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
@@ -1073,13 +1113,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="117" column="2" lean-forward="false" selection-start-line="117" selection-start-column="2" selection-end-line="117" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1113,13 +1146,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="41" lean-forward="true" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
@@ -1127,20 +1153,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="12" column="12" lean-forward="true" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="108" column="14" lean-forward="false" selection-start-line="108" selection-start-column="14" selection-end-line="108" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="137">
@@ -1148,13 +1160,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="13" column="40" lean-forward="true" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -1195,9 +1200,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="14" column="20" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
-          <folding>
-            <element signature="e#75#92#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1208,10 +1210,99 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6345">
-          <caret line="432" column="10" lean-forward="false" selection-start-line="432" selection-start-column="10" selection-end-line="432" selection-end-column="10" />
+        <state relative-caret-position="222">
+          <caret line="59" column="41" lean-forward="true" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="903">
+          <caret line="84" column="18" lean-forward="false" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
+          <folding>
+            <element signature="e#47#67#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="251" column="41" lean-forward="true" selection-start-line="251" selection-start-column="41" selection-end-line="251" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="282">
+          <caret line="45" column="37" lean-forward="true" selection-start-line="45" selection-start-column="37" selection-end-line="45" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/util_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="282">
+          <caret line="30" column="7" lean-forward="true" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="31" column="39" lean-forward="true" selection-start-line="31" selection-start-column="39" selection-end-line="31" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#38#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="42" lean-forward="false" selection-start-line="3" selection-start-column="42" selection-end-line="3" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
           <folding />
         </state>
       </provider>
@@ -1226,18 +1317,36 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+        <state relative-caret-position="168">
+          <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="139">
+          <caret line="264" column="63" lean-forward="false" selection-start-line="264" selection-start-column="63" selection-end-line="264" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="25" lean-forward="false" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-786">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="139">
+          <caret line="54" column="8" lean-forward="false" selection-start-line="54" selection-start-column="8" selection-end-line="54" selection-end-column="8" />
           <folding>
             <element signature="e#42#62#0" expanded="true" />
           </folding>
@@ -1247,67 +1356,60 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="57" lean-forward="false" selection-start-line="2" selection-start-column="57" selection-end-line="2" selection-end-column="57" />
+          <first_editor relative-caret-position="105">
+            <caret line="7" column="85" lean-forward="false" selection-start-line="7" selection-start-column="85" selection-end-line="7" selection-end-column="85" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="59" column="41" lean-forward="true" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" />
+        <state relative-caret-position="180">
+          <caret line="95" column="61" lean-forward="false" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="61" />
           <folding>
-            <element signature="e#4016#4950#0" expanded="false" />
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1166">
-          <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+        <state relative-caret-position="420">
+          <caret line="28" column="62" lean-forward="false" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
           <folding>
-            <element signature="e#40#60#0" expanded="true" />
+            <element signature="e#0#22#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="903">
-          <caret line="84" column="18" lean-forward="false" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
+        <state relative-caret-position="75">
+          <caret line="11" column="8" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8085">
-          <caret line="539" column="8" lean-forward="false" selection-start-line="539" selection-start-column="8" selection-end-line="539" selection-end-column="8" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="165">
+          <caret line="13" column="34" lean-forward="false" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="43" column="63" lean-forward="false" selection-start-line="43" selection-start-column="63" selection-end-line="43" selection-end-column="63" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="285">
+            <caret line="19" column="6" lean-forward="true" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+            <folding>
+              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ff0f3b5..857134df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 1.1.0-alpha+5
+* Closed [#166](https://github.com/angel-dart/framework/issues/166), killing any hanging `Stopwatch` instances when streaming.
+* Removed `AngelPlugin` and `AngelMiddleware`, as well as the `@proxy` annotations from `Angel` and `RequestContext`.
+* Officially deprecated `properties` in `Angel`.
+* Fixed a bug where cached routes would not heed the request method. [#173](https://github.com/angel-dart/framework/issues/173)
+* Reworked error handling logic; now, errors will not automatically default to sending JSON.
+* Removed the `onController` stream from `Angel`.
+* Controllers now longer use `call`, which has now been renamed to `configureServer`.
+
 # 1.1.0-alpha+4
 * Made `injections` in `RequestContext` private.
 * Renamed `properties` in `AngelBase` to `configuration`.
diff --git a/example/json.dart b/example/json.dart
index a8e76a35..d13447f5 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -42,10 +42,10 @@ serverMain(_) async {
     ..lazyParseBodies = true
     ..injectSerializer(JSON.encode);
 
-  app.fatalErrorStream.listen((e) {
-    print(e.error);
-    print(e.stack);
-  });
+  app.errorHandler = (e, req, res) {
+    print(e.message ?? e.error ?? e);
+    print(e.stackTrace);
+  };
 
   await app.startServer(InternetAddress.LOOPBACK_IP_V4, 3000);
 }
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 8eb2b533..7c232526 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -2,14 +2,12 @@ library angel_framework.http.angel_base;
 
 import 'dart:async';
 import 'package:container/container.dart';
-import '../fast_name_from_symbol.dart';
 import 'routable.dart';
 
 /// A function that asynchronously generates a view from the given path and data.
 typedef Future<String> ViewGenerator(String path, [Map data]);
 
 /// Base class for Angel servers. Do not bother extending this.
-@proxy
 class AngelBase extends Routable {
   Container _container = new Container();
 
@@ -32,22 +30,4 @@ class AngelBase extends Routable {
   /// Called by [ResponseContext]@`render`.
   ViewGenerator viewGenerator = (String view, [Map data]) async =>
       "No view engine has been configured yet.";
-
-  operator [](key) => configuration[key];
-  operator []=(key, value) => configuration[key] = value;
-
-  noSuchMethod(Invocation invocation) {
-    if (invocation.memberName != null) {
-      String name = fastNameFromSymbol(invocation.memberName);
-
-      if (invocation.isMethod) {
-        return Function.apply(configuration[name], invocation.positionalArguments,
-            invocation.namedArguments);
-      } else if (invocation.isGetter) {
-        return configuration[name];
-      }
-    }
-
-    return super.noSuchMethod(invocation);
-  }
 }
diff --git a/lib/src/http/base_middleware.dart b/lib/src/http/base_middleware.dart
deleted file mode 100644
index 1baa4ed5..00000000
--- a/lib/src/http/base_middleware.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-library angel_framework.http.base_middleware;
-
-import 'dart:async';
-import 'request_context.dart';
-import 'response_context.dart';
-
-abstract class AngelMiddleware {
-  Future<bool> call(RequestContext req, ResponseContext res);
-}
diff --git a/lib/src/http/base_plugin.dart b/lib/src/http/base_plugin.dart
deleted file mode 100644
index 4aac0bb1..00000000
--- a/lib/src/http/base_plugin.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-library angel_framework.http.base_plugin;
-
-import 'dart:async';
-import 'server.dart';
-
-abstract class AngelPlugin {
-  Future call(Angel app);
-}
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index e4da9c9f..f6a80c74 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -31,7 +31,7 @@ class Controller {
   Controller({this.debug: false, this.injectSingleton: true});
 
   @mustCallSuper
-  Future call(Angel app) async {
+  Future configureServer(Angel app) async {
     _app = app;
 
     if (injectSingleton != false) _app.container.singleton(this);
@@ -45,7 +45,7 @@ class Controller {
           "All controllers must carry an @Expose() declaration.");
     }
 
-    var routable = new Routable(debug: debug);
+    var routable = new Routable();
     app.use(exposeDecl.path, routable);
     TypeMirror typeMirror = reflectType(this.runtimeType);
     String name = exposeDecl.as?.isNotEmpty == true
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 7a79ed64..f72ebdc0 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -10,8 +10,6 @@ export 'package:angel_route/angel_route.dart';
 export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'angel_base.dart';
 export 'anonymous_service.dart';
-export 'base_middleware.dart';
-export 'base_plugin.dart';
 export 'controller.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
@@ -24,12 +22,12 @@ export 'service.dart';
 export 'typed_service.dart';
 
 /// Boots a shared server instance. Use this if launching multiple isolates
-Future<HttpServer> startShared(InternetAddress address, int port) => HttpServer
+Future<HttpServer> startShared(address, int port) => HttpServer
     .bind(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, shared: true);
 
 /// Boots a secure shared server instance. Use this if launching multiple isolates
 ServerGenerator startSharedSecure(SecurityContext securityContext) {
-  return (InternetAddress address, int port) => HttpServer.bindSecure(
+  return (address, int port) => HttpServer.bindSecure(
       address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, securityContext,
       shared: true);
 }
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 8e871b3f..f200d3c3 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -5,14 +5,12 @@ import 'dart:io';
 import 'dart:mirrors';
 import 'package:body_parser/body_parser.dart';
 import 'package:charcode/charcode.dart';
-import '../fast_name_from_symbol.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'server.dart' show Angel;
 part 'injection.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
-@proxy
 class RequestContext {
   String _acceptHeaderCache;
   bool _acceptsAllCache;
@@ -278,22 +276,4 @@ class RequestContext {
     return _body = await parseBody(io,
         storeOriginalBuffer: app.storeOriginalBuffer == true);
   }
-
-  operator [](key) => properties[key];
-  operator []=(key, value) => properties[key] = value;
-
-  noSuchMethod(Invocation invocation) {
-    if (invocation.memberName != null) {
-      String name = fastNameFromSymbol(invocation.memberName);
-
-      if (invocation.isMethod) {
-        return Function.apply(properties[name], invocation.positionalArguments,
-            invocation.namedArguments);
-      } else if (invocation.isGetter) {
-        return properties[name];
-      }
-    }
-
-    return super.noSuchMethod(invocation);
-  }
 }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 0b4bc249..e4c8689f 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -262,7 +262,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
           "Controller redirects must take the form of 'Controller@action'. You gave: $action");
 
     Controller controller =
-        app.controller(split[0].replaceAll(_straySlashes, ''));
+        app.controllers[split[0].replaceAll(_straySlashes, '')];
 
     if (controller == null)
       throw new Exception("Could not find a controller named '${split[0]}'");
@@ -337,6 +337,10 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
     bool firstStream = _useStream == false;
     willCloseItself = _useStream = _isClosed = true;
 
+    if (_correspondingRequest?.injections?.containsKey(Stopwatch) == true) {
+      (_correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
+    }
+
     Stream<List<int>> output = stream;
 
     if (firstStream) {
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index c8178c05..f5c3f696 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -5,7 +5,6 @@ import 'package:angel_route/angel_route.dart';
 import 'package:meta/meta.dart';
 import '../util.dart';
 import 'angel_base.dart';
-import 'controller.dart';
 import 'hooked_service.dart';
 import 'metadata.dart';
 import 'request_context.dart';
@@ -35,22 +34,18 @@ RequestMiddleware waterfall(List handlers) {
 
 /// A routable server that can handle dynamic requests.
 class Routable extends Router {
-  final Map<Pattern, Controller> _controllers = {};
   final Map<Pattern, Service> _services = {};
   final Map configuration = {};
 
-  Routable({bool debug: false}) : super(debug: debug);
+  Routable() : super();
 
   /// Additional filters to be run on designated requests.
   @override
-  final Map<String, RequestMiddleware> requestMiddleware = {};
+  final Map<String, RequestHandler> requestMiddleware = {};
 
   /// A set of [Service] objects that have been mapped into routes.
   Map<Pattern, Service> get services => _services;
 
-  /// A set of [Controller] objects that have been loaded into the application.
-  Map<Pattern, Controller> get controllers => _controllers;
-
   StreamController<Service> _onService =
       new StreamController<Service>.broadcast();
 
@@ -69,9 +64,6 @@ class Routable extends Router {
       _services[path] ??
       _services[path.toString().replaceAll(_straySlashes, '')];
 
-  /// Retrieves the controller with the given name.
-  Controller controller(String name) => controllers[name];
-
   @override
   Route addRoute(String method, Pattern path, Object handler,
       {List middleware: const []}) {
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 1ffcd60f..1c2f1b9c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -12,7 +12,6 @@ import 'package:json_god/json_god.dart' as god;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
-import '../safe_stream_controller.dart';
 import 'angel_base.dart';
 import 'controller.dart';
 import 'request_context.dart';
@@ -23,16 +22,13 @@ import 'service.dart';
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A function that binds an [Angel] server to an Internet address and port.
-typedef Future<HttpServer> ServerGenerator(InternetAddress address, int port);
+typedef Future<HttpServer> ServerGenerator(address, int port);
 
 /// A function that configures an [Angel] server in some way.
 typedef Future AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
-  final SafeCtrl<Controller> _onController =
-      new SafeCtrl<Controller>.broadcast();
-
   final List<Angel> _children = [];
   final Map<String, Tuple3<MiddlewarePipeline, Map, Match>> _handlerCache = {};
 
@@ -65,6 +61,11 @@ class Angel extends AngelBase {
   /// All child application mounted on this instance.
   List<Angel> get children => new List<Angel>.unmodifiable(_children);
 
+  final Map<Pattern, Controller> _controllers = {};
+
+  /// A set of [Controller] objects that have been loaded into the application.
+  Map<Pattern, Controller> get controllers => _controllers;
+
   /// Indicates whether the application is running in a production environment.
   ///
   /// The criteria for this is the `ANGEL_ENV` environment variable being set to
@@ -82,11 +83,6 @@ class Angel extends AngelBase {
   /// The function used to bind this instance to an HTTP server.
   ServerGenerator get serverGenerator => _serverGenerator;
 
-  /// Fired whenever a controller is added to this instance.
-  ///
-  /// **NOTE**: This is a broadcast stream.
-  Stream<Controller> get onController => _onController.stream;
-
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
 
@@ -108,9 +104,32 @@ class Angel extends AngelBase {
   /// These will only not run if a response's `willCloseItself` is set to `true`.
   final List<RequestHandler> responseFinalizers = [];
 
+  /// Use [configuration] instead.
+  @deprecated
+  Map get properties {
+    try {
+      throw new Error();
+    } catch (e, st) {
+      logger?.warning(
+        '`properties` is deprecated, and should not be used.',
+        new UnsupportedError('`properties` is deprecated.'),
+        st,
+      );
+    }
+    return configuration;
+  }
+
   /// The handler currently configured to run on [AngelHttpException]s.
   Function(AngelHttpException e, RequestContext req, ResponseContext res)
-      errorHandler = (AngelHttpException e, req, ResponseContext res) {
+      errorHandler =
+      (AngelHttpException e, RequestContext req, ResponseContext res) {
+    if (!req.accepts('text/html') &&
+        (req.accepts('application/json') ||
+            req.accepts('application/javascript'))) {
+      res.json(e.toJson());
+      return;
+    }
+
     res.headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
@@ -130,7 +149,7 @@ class Angel extends AngelBase {
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
-  Future<HttpServer> startServer([InternetAddress address, int port]) async {
+  Future<HttpServer> startServer([address, int port]) async {
     var host = address ?? InternetAddress.LOOPBACK_IP_V4;
     this.httpServer = await _serverGenerator(host, port ?? 0);
 
@@ -185,8 +204,6 @@ class Angel extends AngelBase {
       await httpServer.close(force: true);
     }
 
-    _onController.close();
-
     await Future.forEach(services.values, (Service service) async {
       await service.close();
     });
@@ -330,18 +347,7 @@ class Angel extends AngelBase {
     }
 
     res.statusCode = e.statusCode;
-
-    if (req.headers.value(HttpHeaders.ACCEPT) == null ||
-        req.acceptsAll ||
-        req.accepts(ContentType.JSON) ||
-        req.accepts('application/javascript')) {
-      res.serialize(e.toMap(),
-          contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-              ContentType.JSON.mimeType);
-    } else {
-      await errorHandler(e, req, res);
-    }
-
+    await errorHandler(e, req, res);
     res.end();
     return await sendResponse(request, req, res,
         ignoreFinalizers: ignoreFinalizers == true);
@@ -349,12 +355,12 @@ class Angel extends AngelBase {
 
   /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
+    var req = await createRequestContext(request);
+    var res = await createResponseContext(request.response, req);
     var zoneSpec = await createZoneForRequest(request, req, res);
     var zone = Zone.current.fork(specification: zoneSpec);
 
     return zone.run(() async {
-      var req = await createRequestContext(request);
-      var res = await createResponseContext(request.response, req);
       String requestedUrl;
 
       // Faster way to get path
@@ -377,7 +383,7 @@ class Angel extends AngelBase {
 
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
-      var tuple = _handlerCache.putIfAbsent(requestedUrl, () {
+      var tuple = _handlerCache.putIfAbsent('${req.method}:$requestedUrl', () {
         Router r = isProduction ? (_flattened ??= flatten(this)) : this;
         var resolved =
             r.resolveAll(requestedUrl, requestedUrl, method: req.method);
@@ -439,10 +445,6 @@ class Angel extends AngelBase {
       }
 
       void _walk(Router router) {
-        if (router is Angel) {
-          router..before.forEach(_add)..after.forEach(_add);
-        }
-
         router.requestMiddleware.forEach((k, v) => _add(v));
         router.middleware.forEach(_add);
         router.routes.forEach((r) {
@@ -553,9 +555,6 @@ class Angel extends AngelBase {
   /// Applies an [AngelConfigurer] to this instance.
   Future configure(AngelConfigurer configurer) async {
     await configurer(this);
-
-    if (configurer is Controller)
-      _onController.add(controllers[configurer.findExpose().path] = configurer);
   }
 
   /// Mounts the child on this router. If [routable] is `null`,
@@ -589,19 +588,15 @@ class Angel extends AngelBase {
         });
       }
 
-      routable.controllers.forEach((k, v) {
+      routable._controllers.forEach((k, v) {
         var tail = k.toString().replaceAll(_straySlashes, '');
-        controllers['$head/$tail'.replaceAll(_straySlashes, '')] = v;
+        _controllers['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
 
       routable.services.forEach((k, v) {
         var tail = k.toString().replaceAll(_straySlashes, '');
         services['$head/$tail'.replaceAll(_straySlashes, '')] = v;
       });
-
-      _onController.whenInitialized(() {
-        routable.onController.listen(_onController.add);
-      });
     }
 
     if (routable is Service) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 21151459..04bc9c56 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+4
+version: 1.1.0-alpha+5
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/all.dart b/test/all.dart
index 392fb5e4..0dbf6604 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -15,7 +15,6 @@ import 'server_test.dart' as server;
 import 'services_test.dart' as services;
 import 'streaming_test.dart' as streaming;
 import 'typed_service_test.dart' as typed_service;
-import 'util_test.dart' as util;
 import 'view_generator_test.dart' as view_generator;
 import 'package:test/test.dart';
 
@@ -38,6 +37,5 @@ main() {
   group('services', services.main);
   group('streaming', streaming.main);
   group('typed_service', typed_service.main);
-  group('util', util.main);
   group('view generator', view_generator.main);
 }
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 6f326b70..e8cace1a 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -43,13 +43,13 @@ main() {
 
   setUp(() async {
     app = new Angel();
-    app.registerMiddleware("foo", (req, res) async => res.write("Hello, "));
-    app.registerMiddleware("bar", (req, res) async => res.write("world!"));
+    app.requestMiddleware["foo"] = (req, res) async => res.write("Hello, ");
+    app.requestMiddleware["bar"] = (req, res) async => res.write("world!");
     app.get(
         "/redirect",
         (req, ResponseContext res) async =>
             res.redirectToAction("TodoController@foo", {"foo": "world"}));
-    await app.configure(ctrl = new TodoController());
+    await app.configure((ctrl = new TodoController()).configureServer);
 
     print(app.controllers);
     app.dumpTree();
@@ -71,7 +71,7 @@ main() {
   test('require expose', () async {
     try {
       var app = new Angel();
-      await app.configure(new NoExposeController());
+      await app.configure(new NoExposeController().configureServer);
       throw 'Should require @Expose';
     } on Exception {
       // :)
@@ -93,7 +93,7 @@ main() {
 
   test('optional name', () async {
     var app = new Angel();
-    await app.configure(new NamedController());
+    await app.configure(new NamedController().configureServer);
     expect(app.controllers['foo'], new isInstanceOf<NamedController>());
   });
 
diff --git a/test/di_test.dart b/test/di_test.dart
index 3882a750..179e890f 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -25,8 +25,8 @@ main() {
     app.get("/errands", (Todo singleton) => singleton);
     app.get("/errands3",
         ({Errand singleton, Todo foo, RequestContext req}) => singleton.text);
-    await app.configure(new SingletonController());
-    await app.configure(new ErrandController());
+    await app.configure(new SingletonController().configureServer);
+    await app.configure(new ErrandController().configureServer);
 
     server = await app.startServer();
     url = "http://${server.address.host}:${server.port}";
diff --git a/test/routing_test.dart b/test/routing_test.dart
index b0074f69..f96f7b7e 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -1,7 +1,7 @@
+import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
-import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
 
 @Middleware(const ['interceptor'])
@@ -33,16 +33,15 @@ main() {
       app.lazyParseBodies = app.isProduction;
     });
 
-    app
-      ..registerMiddleware('interceptor', (req, res) async {
+    app.requestMiddleware
+      ..['interceptor'] = (req, res) async {
         res.write('Middleware');
         return false;
-      })
-      ..registerMiddleware('intercept_service',
-          (RequestContext req, res) async {
+      }
+      ..['intercept_service'] = (RequestContext req, res) async {
         res.write("Service with ");
         return true;
-      });
+      };
 
     todos.get('/action/:action', (req, res) => res.json(req.params));
 
@@ -75,8 +74,12 @@ main() {
       return "Logged";
     });
 
+    app.get('/method', () => 'Only GET');
+    app.post('/method', () => 'Only POST');
+
     app.use('/query', new QueryService());
-    app.get('*', 'MJ');
+
+    app.use('MJ');
 
     app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
@@ -103,7 +106,7 @@ main() {
   test('Can match url with multiple parameters', () async {
     var response = await client.get('$url/name/HELLO/last/WORLD');
     print('Response: ${response.body}');
-    var json = god.deserialize(response.body);
+    var json = JSON.decode(response.body);
     expect(json, new isInstanceOf<Map<String, String>>());
     expect(json['first'], equals('HELLO'));
     expect(json['last'], equals('WORLD'));
@@ -111,13 +114,13 @@ main() {
 
   test('Can nest another Angel instance', () async {
     var response = await client.post('$url/nes/ted/foo');
-    var json = god.deserialize(response.body);
+    var json = JSON.decode(response.body);
     expect(json['route'], equals('foo'));
   });
 
   test('Can parse parameters from a nested Angel instance', () async {
     var response = await client.get('$url/todos/1337/action/test');
-    var json = god.deserialize(response.body);
+    var json = JSON.decode(response.body);
     print('JSON: $json');
     expect(json['id'], equals('1337'));
     expect(json['action'], equals('test'));
@@ -136,10 +139,10 @@ main() {
 
   test('Can serialize function result as JSON', () async {
     Map headers = {'Content-Type': 'application/json'};
-    String postData = god.serialize({'it': 'works'});
+    String postData = JSON.encode({'it': 'works'});
     var response =
         await client.post("$url/lambda", headers: headers, body: postData);
-    expect(god.deserialize(response.body)['it'], equals('works'));
+    expect(JSON.decode(response.body)['it'], equals('works'));
   });
 
   test('Fallback routes', () async {
@@ -158,17 +161,31 @@ main() {
   test('Redirect to named routes', () async {
     var response = await client.get('$url/named');
     print(response.body);
-    expect(god.deserialize(response.body), equals('Hello tests'));
+    expect(JSON.decode(response.body), equals('Hello tests'));
   });
 
   test('Match routes, even with query params', () async {
     var response =
         await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
     print(response.body);
-    expect(god.deserialize(response.body), equals('Logged'));
+    expect(JSON.decode(response.body), equals('Logged'));
 
     response = await client.get("$url/query/foo?bar=baz");
     print(response.body);
     expect(response.body, equals("Service with Middleware"));
   });
+
+  test('only match route with matching method', () async {
+    var response = await client.get("$url/method");
+    print(response.body);
+    expect(response.body, '"Only GET"');
+
+    response = await client.post("$url/method");
+    print(response.body);
+    expect(response.body, '"Only POST"');
+
+    response = await client.patch("$url/method");
+    print(response.body);
+    expect(response.body, '"MJ"');
+  });
 }
diff --git a/test/server_test.dart b/test/server_test.dart
index bbc85c7e..c22337b1 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -10,16 +10,6 @@ final Uri $foo = Uri.parse('http://localhost:3000/foo');
 
 /// Additional tests to improve coverage of server.dart
 main() {
-  group('streams fired', () {
-    test('oncontroller fired', () async {
-      var app = new Angel();
-      var ctrl = new FooController();
-      var f = app.onController.first;
-      await app.configure(ctrl);
-      expect(await f, ctrl);
-    });
-  });
-
   group('scoping', () {
     var parent = new Angel()..configuration['two'] = 2;
     var child = new Angel();
@@ -168,7 +158,8 @@ main() {
     tearDown(() => app.close());
 
     test('can send json', () async {
-      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'));
+      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
+        ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
       rq.close();
       await app.handleRequest(rq);
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
@@ -177,7 +168,8 @@ main() {
     });
 
     test('can throw in finalizer', () async {
-      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'));
+      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
+        ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
       rq.close();
       await app.handleRequest(rq);
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
diff --git a/test/util_test.dart b/test/util_test.dart
deleted file mode 100644
index 654d4f9f..00000000
--- a/test/util_test.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:angel_framework/angel_framework.dart';
-import 'package:test/test.dart';
-
-class Foo {
-  String name;
-
-  Foo(String this.name);
-}
-
-main() {
-  group('Utilities', () {
-    Angel app;
-
-    setUp(() {
-      app = new Angel();
-    });
-
-    tearDown(() async {
-      await app.close();
-      app = null;
-    });
-
-    test('can use app.properties like members', () {
-      app.configuration['hello'] = 'world';
-      app.configuration['foo'] = () => 'bar';
-      app.configuration['Foo'] = new Foo('bar');
-
-      expect(app.hello, equals('world'));
-      expect(app.foo(), equals('bar'));
-      expect(app.Foo.name, equals('bar'));
-    });
-  });
-}

From be3b3bd3d2bae86505d9fc48eaba5a5a83cbce06 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 10 Oct 2017 12:55:42 -0400
Subject: [PATCH 158/414] pattern matching

---
 .idea/libraries/Dart_Packages.xml             |  64 +-
 ..._or_throws_in_parameter_meta_test_dart.xml |   8 +
 .idea/workspace.xml                           | 699 +++++++++---------
 CHANGELOG.md                                  |   3 +
 lib/src/http/injection.dart                   | 160 ++--
 lib/src/http/metadata.dart                    | 104 +++
 lib/src/http/request_context.dart             |   2 +
 lib/src/http/server.dart                      |  28 +-
 pubspec.yaml                                  |   2 +-
 test/all.dart                                 |   2 +
 test/parameter_meta_test.dart                 | 131 ++++
 test/routing_test.dart                        |  14 +
 12 files changed, 753 insertions(+), 464 deletions(-)
 create mode 100644 .idea/runConfigurations/injects_session_or_throws_in_parameter_meta_test_dart.xml
 create mode 100644 test/parameter_meta_test.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 695dedd4..98dd117d 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -26,14 +26,14 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.1/lib" />
             </list>
           </value>
         </entry>
@@ -47,7 +47,7 @@
         <entry key="barback">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+13/lib" />
             </list>
           </value>
         </entry>
@@ -131,7 +131,7 @@
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
             </list>
           </value>
         </entry>
@@ -145,14 +145,14 @@
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+15/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_multi_server">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
             </list>
           </value>
         </entry>
@@ -222,7 +222,7 @@
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib" />
             </list>
           </value>
         </entry>
@@ -250,7 +250,7 @@
         <entry key="package_config">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
             </list>
           </value>
         </entry>
@@ -271,14 +271,14 @@
         <entry key="plugin">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib" />
             </list>
           </value>
         </entry>
@@ -327,7 +327,7 @@
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
             </list>
           </value>
         </entry>
@@ -362,7 +362,7 @@
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.2/lib" />
             </list>
           </value>
         </entry>
@@ -383,7 +383,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+8/lib" />
             </list>
           </value>
         </entry>
@@ -397,7 +397,7 @@
         <entry key="typed_data">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
             </list>
           </value>
         </entry>
@@ -418,14 +418,14 @@
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
             </list>
           </value>
         </entry>
@@ -435,10 +435,10 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+11/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+13/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
@@ -450,10 +450,10 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+14/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+15/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
@@ -463,36 +463,36 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.1+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.8.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+8/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.12/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/runConfigurations/injects_session_or_throws_in_parameter_meta_test_dart.xml b/.idea/runConfigurations/injects_session_or_throws_in_parameter_meta_test_dart.xml
new file mode 100644
index 00000000..17a6c854
--- /dev/null
+++ b/.idea/runConfigurations/injects_session_or_throws_in_parameter_meta_test_dart.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="injects session or throws in parameter_meta_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="injects session or throws" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ed7a7c9c..51b975ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/base_middleware.dart" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/lib/src/http/base_plugin.dart" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/test/util_test.dart" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/injects_session_or_throws_in_parameter_meta_test_dart.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/injection.dart" afterPath="$PROJECT_DIR$/lib/src/http/injection.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -45,11 +39,19 @@
       <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="139">
-              <caret line="54" column="8" lean-forward="false" selection-start-line="54" selection-start-column="8" selection-end-line="54" selection-end-column="8" />
-              <folding>
-                <element signature="e#42#62#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-323">
+              <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="225">
+              <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -57,44 +59,55 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="13" column="34" lean-forward="false" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
-              <folding />
+            <state relative-caret-position="243">
+              <caret line="480" column="23" lean-forward="false" selection-start-line="480" selection-start-column="13" selection-end-line="480" selection-end-column="23" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="285">
-                <caret line="19" column="6" lean-forward="true" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
-                <folding>
-                  <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
-                </folding>
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="25" lean-forward="false" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
+            <state relative-caret-position="210">
+              <caret line="73" column="28" lean-forward="false" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="180">
+              <caret line="12" column="13" lean-forward="true" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="615">
+              <caret line="100" column="8" lean-forward="false" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
+              <folding>
+                <element signature="e#40#101#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="105">
-                <caret line="7" column="85" lean-forward="false" selection-start-line="7" selection-start-column="85" selection-end-line="7" selection-end-column="85" />
+              <first_editor relative-caret-position="15">
+                <caret line="1" column="70" lean-forward="false" selection-start-line="1" selection-start-column="70" selection-end-line="1" selection-end-column="70" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -102,57 +115,13 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <file leaf-file-name="all.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/all.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="11" column="8" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="139">
-              <caret line="264" column="63" lean-forward="false" selection-start-line="264" selection-start-column="63" selection-end-line="264" selection-end-column="63" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
+            <state relative-caret-position="140">
+              <caret line="31" column="23" lean-forward="false" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
               <folding>
-                <element signature="e#0#22#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="28" column="62" lean-forward="false" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
-              <folding>
-                <element signature="e#0#22#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="95" column="61" lean-forward="false" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="61" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#0#38#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -169,19 +138,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>print(</find>
-      <find>handleaNGE</find>
-      <find>stderr</find>
-      <find>_AFTERp</find>
-      <find>_afterProc</find>
-      <find>_beforeP</find>
-      <find>_fatalE</find>
-      <find>fatalError</find>
-      <find>fatale</find>
-      <find>FATAL</find>
-      <find>error ??</find>
-      <find>sendRes</find>
-      <find>print</find>
       <find>.name</find>
       <find>logger</find>
       <find>handleRequ</find>
@@ -199,6 +155,19 @@
       <find>addStr</find>
       <find>Stopwatc</find>
       <find>_controllers</find>
+      <find>pipeline</find>
+      <find>handle</find>
+      <find>uncaught</find>
+      <find>header</find>
+      <find>creat</find>
+      <find>crea</find>
+      <find>run(</find>
+      <find>/*</find>
+      <find>runG</find>
+      <find>catchError</find>
+      <find>query</find>
+      <find>value == n</find>
+      <find>handleCont</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -215,6 +184,8 @@
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
       <replace>logger?.warning</replace>
       <replace>JSON.decode</replace>
+      <replace>query</replace>
+      <replace>cookie</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -236,9 +207,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/general_test.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
@@ -255,7 +223,6 @@
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
@@ -271,22 +238,26 @@
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
       </list>
     </option>
   </component>
@@ -297,9 +268,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="166" />
+    <option name="x" value="45" />
     <option name="y" value="23" />
-    <option name="width" value="1168" />
+    <option name="width" value="1395" />
     <option name="height" value="797" />
   </component>
   <component name="ProjectLevelVcsManager">
@@ -320,8 +291,10 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="Scratches" />
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -347,27 +320,15 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="http" type="cbb8eebc:String" user="http" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
               <item name="test" type="cbb8eebc:String" user="test" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="tool" type="cbb8eebc:String" user="tool" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -401,6 +362,11 @@
     </option>
   </component>
   <component name="RunManager" selected="Dart Test.All Tests">
+    <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="Chained routes" />
+    </configuration>
     <configuration default="true" type="BashConfigurationType" factoryName="Bash">
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
@@ -516,6 +482,11 @@
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="default view generator" />
     </configuration>
+    <configuration name="injects header or throws in parameter_meta_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="injects header or throws" />
+    </configuration>
     <configuration name="only match route with matching method in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -542,6 +513,10 @@
       <option name="filePath" value="$PROJECT_DIR$/test/exception_test.dart" />
       <option name="testName" value="exception_test.dart" />
     </configuration>
+    <configuration name="tests in parameter_meta_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+      <option name="testName" value="parameter_meta_test.dart" />
+    </configuration>
     <configuration name="tests in precontained_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/precontained_test.dart" />
       <option name="testName" value="precontained_test.dart" />
@@ -566,37 +541,41 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="30">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="29" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+    <list size="34">
+      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="28" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="29" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="30" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="31" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="32" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="33" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -647,7 +626,11 @@
       <workItem from="1506090042437" duration="1751000" />
       <workItem from="1506275395906" duration="424000" />
       <workItem from="1506281553143" duration="657000" />
-      <workItem from="1507123481086" duration="2431000" />
+      <workItem from="1507123481086" duration="2629000" />
+      <workItem from="1507496428508" duration="1038000" />
+      <workItem from="1507502664740" duration="80000" />
+      <workItem from="1507556590639" duration="230000" />
+      <workItem from="1507641822711" duration="7922000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -919,39 +902,39 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.10.04 at 09h 53m 19s.xml">
+    <history-entry file="All_Tests - 2017.10.10 at 12h 54m 58s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.10.04 at 09h 54m 24s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 48m 40s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.10.04 at 09h 55m 00s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 48m 52s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.10.04 at 09h 56m 57s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 49m 07s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.10.04 at 09h 57m 31s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 18s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.10.04 at 10h 01m 10s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 23s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.10.04 at 10h 07m 57s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 40s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.10.04 at 09h 49m 09s.xml">
-      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 57s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.10.04 at 09h 49m 38s.xml">
-      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 52m 21s.xml">
+      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.10.04 at 09h 52m 16s.xml">
-      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_parameter_meta_test_dart - 2017.10.10 at 12h 45m 38s.xml">
+      <configuration name="tests in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="59292000" />
+    <option name="totallyTimeSpent" value="68760000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -963,31 +946,31 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="166" y="23" width="1168" height="797" extended-state="0" />
+    <frame x="45" y="23" width="1395" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31438935" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4814815" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27264655" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25055432" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -996,9 +979,9 @@
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1040,51 +1023,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/mock_request-1.0.0/lib/src/response.dart" />
-    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="12" lean-forward="false" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/memory_service.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/defs.dart" />
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="19" lean-forward="false" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="40" column="25" lean-forward="false" selection-start-line="40" selection-start-column="25" selection-end-line="41" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/stream.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="145">
@@ -1171,7 +1109,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
           <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1210,20 +1147,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="59" column="41" lean-forward="true" selection-start-line="59" selection-start-column="41" selection-end-line="59" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="903">
@@ -1231,79 +1154,27 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="34" column="40" lean-forward="true" selection-start-line="34" selection-start-column="40" selection-end-line="34" selection-end-column="40" />
-          <folding>
-            <element signature="e#47#67#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
           <caret line="251" column="41" lean-forward="true" selection-start-line="251" selection-start-column="41" selection-end-line="251" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart" />
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="282">
           <caret line="45" column="37" lean-forward="true" selection-start-line="45" selection-start-column="37" selection-end-line="45" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/util_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="30" column="7" lean-forward="true" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="31" column="39" lean-forward="true" selection-start-line="31" selection-start-column="39" selection-end-line="31" selection-end-column="39" />
-          <folding>
-            <element signature="e#0#38#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/util_test.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="42" lean-forward="false" selection-start-line="3" selection-start-column="42" selection-end-line="3" selection-end-column="42" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1312,74 +1183,34 @@
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="38" column="21" lean-forward="true" selection-start-line="38" selection-start-column="21" selection-end-line="38" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
+            <element signature="e#39#59#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="139">
+        <state relative-caret-position="3825">
           <caret line="264" column="63" lean-forward="false" selection-start-line="264" selection-start-column="63" selection-end-line="264" selection-end-column="63" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="25" lean-forward="false" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="139">
-          <caret line="54" column="8" lean-forward="false" selection-start-line="54" selection-start-column="8" selection-end-line="54" selection-end-column="8" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="105">
-            <caret line="7" column="85" lean-forward="false" selection-start-line="7" selection-start-column="85" selection-end-line="7" selection-end-column="85" />
-            <folding />
-          </first_editor>
-          <second_editor />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
+        <state relative-caret-position="1320">
           <caret line="95" column="61" lean-forward="false" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="61" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
+        <state relative-caret-position="330">
           <caret line="28" column="62" lean-forward="false" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
           <folding>
-            <element signature="e#0#22#0" expanded="true" />
+            <element signature="e#0#22#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1392,10 +1223,27 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/middleware_pipeline.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="13" column="34" lean-forward="false" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
+        <state relative-caret-position="120">
+          <caret line="8" column="11" lean-forward="false" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1404">
+          <caret line="105" column="18" lean-forward="true" selection-start-line="105" selection-start-column="18" selection-end-line="105" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
           <folding />
         </state>
       </provider>
@@ -1404,7 +1252,7 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="285">
-            <caret line="19" column="6" lean-forward="true" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+            <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
             <folding>
               <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
             </folding>
@@ -1413,6 +1261,151 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="17" column="24" lean-forward="false" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#22#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="15" column="21" lean-forward="false" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
+          <folding>
+            <element signature="e#0#20#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="47">
+          <caret line="1433" column="2" lean-forward="false" selection-start-line="1433" selection-start-column="2" selection-end-line="1433" selection-end-column="2" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="33" column="13" lean-forward="false" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+          <folding>
+            <element signature="e#47#67#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="23" lean-forward="false" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="480" column="23" lean-forward="false" selection-start-line="480" selection-start-column="13" selection-end-line="480" selection-end-column="23" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="615">
+          <caret line="100" column="8" lean-forward="false" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
+          <folding>
+            <element signature="e#40#101#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="73" column="28" lean-forward="false" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-323">
+          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/pattern_matcher.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="13" lean-forward="true" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/pattern_matcher_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="59" column="40" lean-forward="true" selection-start-line="59" selection-start-column="40" selection-end-line="78" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="15">
+            <caret line="1" column="70" lean-forward="false" selection-start-line="1" selection-start-column="70" selection-end-line="1" selection-end-column="70" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="31" column="23" lean-forward="false" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 857134df..a8acd86f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.0-alpha+6
+* Added `@Parameter()` annotations, with support for pattern matching.
+
 # 1.1.0-alpha+5
 * Closed [#166](https://github.com/angel-dart/framework/issues/166), killing any hanging `Stopwatch` instances when streaming.
 * Removed `AngelPlugin` and `AngelMiddleware`, as well as the `@proxy` annotations from `Angel` and `RequestContext`.
diff --git a/lib/src/http/injection.dart b/lib/src/http/injection.dart
index 4b89c7b5..7f4e5f39 100644
--- a/lib/src/http/injection.dart
+++ b/lib/src/http/injection.dart
@@ -12,76 +12,84 @@ RequestHandler createDynamicHandler(handler,
   return handleContained(handler, injection);
 }
 
+resolveInjection(requirement, InjectionRequest injection, RequestContext req,
+    ResponseContext res, bool throwOnUnresolved) {
+  var propFromApp;
+
+  if (requirement == RequestContext) {
+    return req;
+  } else if (requirement == ResponseContext) {
+    return res;
+  } else if (requirement is String &&
+      injection.parameters.containsKey(requirement)) {
+    var param = injection.parameters[requirement];
+    var value = param.getValue(req);
+    if (value == null && param.required != false) throw param.error;
+    return value;
+  } else if (requirement is String) {
+    if (req.params.containsKey(requirement)) {
+      return req.params[requirement];
+    } else if (req._injections.containsKey(requirement))
+      return req._injections[requirement];
+    else if (req.properties.containsKey(requirement))
+      return req.properties[requirement];
+    else if ((propFromApp = req.app.findProperty(requirement)) != null)
+      return propFromApp;
+    else if (injection.optional.contains(requirement))
+      return null;
+    else if (throwOnUnresolved) {
+      throw new ArgumentError(
+          "Cannot resolve parameter '$requirement' within handler.");
+    }
+  } else if (requirement is List &&
+      requirement.length == 2 &&
+      requirement.first is String &&
+      requirement.last is Type) {
+    String key = requirement.first;
+    Type type = requirement.last;
+    if (req.params.containsKey(key) ||
+        req._injections.containsKey(key) ||
+        req.properties.containsKey(key) ||
+        req.app.configuration.containsKey(key) ||
+        _primitiveTypes.contains(type)) {
+      return resolveInjection(key, injection, req, res, throwOnUnresolved);
+    } else
+      return resolveInjection(type, injection, req, res, throwOnUnresolved);
+  } else if (requirement is Type && requirement != dynamic) {
+    if (req._injections.containsKey(requirement))
+      return req._injections[requirement];
+    else
+      return req.app.container.make(requirement);
+  } else if (throwOnUnresolved) {
+    throw new ArgumentError(
+        '$requirement cannot be injected into a request handler.');
+  }
+}
+
+/// Checks if an [InjectionRequest] can be sufficiently executed within the current request/response context.
+bool suitableForInjection(RequestContext req, ResponseContext res, InjectionRequest injection) {
+  return injection.parameters.values.any((p) {
+    if (p.match == null) return false;
+    var value = p.getValue(req);
+    return value == p.match;
+  });
+}
+
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(handler, InjectionRequest injection) {
   return (RequestContext req, ResponseContext res) async {
+    if (injection.parameters.isNotEmpty && injection.parameters.values.any((p) => p.match != null) && !suitableForInjection(req, res, injection))
+      return true;
+
     List args = [];
 
-    void inject(requirement) {
-      var propFromApp;
-
-      if (requirement == RequestContext) {
-        args.add(req);
-      } else if (requirement == ResponseContext) {
-        args.add(res);
-      } else if (requirement is String) {
-        if (req.params.containsKey(requirement)) {
-          args.add(req.params[requirement]);
-        } else if (req._injections.containsKey(requirement))
-          args.add(req._injections[requirement]);
-        else if (req.properties.containsKey(requirement))
-          args.add(req.properties[requirement]);
-        else if ((propFromApp = req.app.findProperty(requirement)) != null)
-          args.add(propFromApp);
-        else if (injection.optional.contains(requirement))
-          args.add(null);
-        else {
-          throw new ArgumentError(
-              "Cannot resolve parameter '$requirement' within handler.");
-        }
-      } else if (requirement is List &&
-          requirement.length == 2 &&
-          requirement.first is String &&
-          requirement.last is Type) {
-        String key = requirement.first;
-        Type type = requirement.last;
-        if (req.params.containsKey(key) ||
-            req._injections.containsKey(key) ||
-            req.properties.containsKey(key) ||
-            req.app.configuration.containsKey(key) ||
-            _primitiveTypes.contains(type)) {
-          inject(key);
-        } else
-          inject(type);
-      } else if (requirement is Type && requirement != dynamic) {
-        if (req._injections.containsKey(requirement))
-          args.add(req._injections[requirement]);
-        else
-          args.add(req.app.container.make(requirement));
-      } else {
-        throw new ArgumentError(
-            '$requirement cannot be injected into a request handler.');
-      }
-    }
-
     Map<Symbol, dynamic> named = {};
-    injection.required.forEach(inject);
+    args.addAll(injection.required
+        .map((r) => resolveInjection(r, injection, req, res, true)));
 
     injection.named.forEach((k, v) {
       var name = new Symbol(k);
-      if (req.params.containsKey(k))
-        named[name] = v;
-      else if (req._injections.containsKey(k))
-        named[name] = v;
-      else if (req._injections.containsKey(v) && v != dynamic)
-        named[name] = v;
-      else {
-        try {
-          named[name] = req.app.container.make(v);
-        } catch (e) {
-          named[name] = null;
-        }
-      }
+      named[name] = resolveInjection([k, v], injection, req, res, false);
     });
 
     var result = Function.apply(handler, args, named);
@@ -106,14 +114,24 @@ class InjectionRequest {
   /// A list of the arguments that can be null in a DI-enabled method.
   final List<String> optional;
 
-  const InjectionRequest.constant({this.named, this.required, this.optional});
+  /// Extended parameter definitions.
+  final Map<String, Parameter> parameters;
+
+  const InjectionRequest.constant(
+      {this.named: const {},
+      this.required: const [],
+      this.optional: const [],
+      this.parameters: const {}});
 
   InjectionRequest()
       : named = {},
         required = [],
-        optional = [];
+        optional = [],
+        parameters = {};
 }
 
+final TypeMirror _Parameter = reflectType(Parameter);
+
 /// Predetermines what needs to be injected for a handler to run.
 InjectionRequest preInject(Function handler) {
   var injection = new InjectionRequest();
@@ -127,6 +145,22 @@ InjectionRequest preInject(Function handler) {
     var name = MirrorSystem.getName(parameter.simpleName);
     var type = parameter.type.reflectedType;
 
+    var p = parameter.metadata
+        .firstWhere((m) => m.type.isAssignableTo(_Parameter),
+            orElse: () => null)
+        ?.reflectee as Parameter;
+    if (p != null) {
+      injection.parameters[name] = new Parameter(
+        cookie: p.cookie,
+        header: p.header,
+        query: p.query,
+        session: p.session,
+        match: p.match,
+        defaultValue: p.defaultValue,
+        required: parameter.isNamed ? false : p.required != false,
+      );
+    }
+
     if (!parameter.isNamed) {
       if (parameter.isOptional) injection.optional.add(name);
 
diff --git a/lib/src/http/metadata.dart b/lib/src/http/metadata.dart
index c2180efe..0fd38063 100644
--- a/lib/src/http/metadata.dart
+++ b/lib/src/http/metadata.dart
@@ -1,6 +1,8 @@
 library angel_framework.http.metadata;
 
 import 'hooked_service.dart' show HookedServiceEventListener;
+import 'package:angel_http_exception/angel_http_exception.dart';
+import 'request_context.dart';
 
 /// Annotation to map middleware onto a handler.
 class Middleware {
@@ -31,3 +33,105 @@ class Expose {
       this.as: null,
       this.allowNull: const []});
 }
+
+/// Used to apply special dependency injections or functionality to a function parameter.
+class Parameter {
+  /// Inject the value of a request cookie.
+  final String cookie;
+
+  /// Inject the value of a request header.
+  final String header;
+
+  /// Inject the value of a key from the session.
+  final String session;
+
+  /// Inject the value of a key from the query.
+  final String query;
+
+  /// Only execute the handler if the value of this parameter matches the given value.
+  final match;
+
+  /// Specify a default value.
+  final defaultValue;
+
+  /// If `true` (default), then an error will be thrown if this parameter is not present.
+  final bool required;
+
+  const Parameter(
+      {this.cookie,
+      this.query,
+      this.header,
+      this.session,
+      this.match,
+      this.defaultValue,
+      this.required});
+
+  /// Returns an error that can be thrown when the parameter is not present.
+  get error {
+    if (cookie?.isNotEmpty == true)
+      return new AngelHttpException.badRequest(
+          message: 'Missing required cookie "$cookie".');
+    if (header?.isNotEmpty == true)
+      return new AngelHttpException.badRequest(
+          message: 'Missing required header "$header".');
+    if (query?.isNotEmpty == true)
+      return new AngelHttpException.badRequest(
+          message: 'Missing required query parameter "$query".');
+    if (session?.isNotEmpty == true)
+      return new StateError(
+          'Session does not contain required key "$session".');
+  }
+
+  /// Obtains a value for this parameter from a [RequestContext].
+  getValue(RequestContext req) {
+    if (cookie?.isNotEmpty == true)
+      return req.cookies.firstWhere((c) => c.name == cookie)?.value ??
+          defaultValue;
+    if (header?.isNotEmpty == true)
+      return req.headers.value(header) ?? defaultValue;
+    if (session?.isNotEmpty == true)
+      return req.session[session] ?? defaultValue;
+    if (query?.isNotEmpty == true) return req.query[query] ?? defaultValue;
+    return defaultValue;
+  }
+}
+
+/// Shortcut for declaring a request header [Parameter].
+class Header extends Parameter {
+  const Header(String header, {match, defaultValue, bool required: true})
+      : super(
+            header: header,
+            match: match,
+            defaultValue: defaultValue,
+            required: required);
+}
+
+/// Shortcut for declaring a request session [Parameter].
+class Session extends Parameter {
+  const Session(String session, {match, defaultValue, bool required: true})
+      : super(
+            session: session,
+            match: match,
+            defaultValue: defaultValue,
+            required: required);
+}
+
+/// Shortcut for declaring a request query [Parameter].
+class Query extends Parameter {
+  const Query(String query, {match, defaultValue, bool required: true})
+      : super(
+            query: query,
+            match: match,
+            defaultValue: defaultValue,
+            required: required);
+}
+
+/// Shortcut for declaring a request cookie [Parameter].
+class CookieValue extends Parameter {
+  const CookieValue(String cookie, {match, defaultValue, bool required: true})
+      : super(
+            cookie: cookie,
+            match: match,
+            defaultValue: defaultValue,
+            required: required);
+}
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index f200d3c3..886b30ba 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -3,8 +3,10 @@ library angel_framework.http.request_context;
 import 'dart:async';
 import 'dart:io';
 import 'dart:mirrors';
+import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:body_parser/body_parser.dart';
 import 'package:charcode/charcode.dart';
+import 'metadata.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'server.dart' show Angel;
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 1c2f1b9c..240aaf5c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -347,7 +347,8 @@ class Angel extends AngelBase {
     }
 
     res.statusCode = e.statusCode;
-    await errorHandler(e, req, res);
+    var result = await errorHandler(e, req, res);
+    await executeHandler(result, req, res);
     res.end();
     return await sendResponse(request, req, res,
         ignoreFinalizers: ignoreFinalizers == true);
@@ -360,7 +361,7 @@ class Angel extends AngelBase {
     var zoneSpec = await createZoneForRequest(request, req, res);
     var zone = Zone.current.fork(specification: zoneSpec);
 
-    return zone.run(() async {
+    return zone.runGuarded(() async {
       String requestedUrl;
 
       // Faster way to get path
@@ -387,6 +388,7 @@ class Angel extends AngelBase {
         Router r = isProduction ? (_flattened ??= flatten(this)) : this;
         var resolved =
             r.resolveAll(requestedUrl, requestedUrl, method: req.method);
+
         return new Tuple3(
           new MiddlewarePipeline(resolved),
           resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
@@ -425,6 +427,15 @@ class Angel extends AngelBase {
           ignoreFinalizers: true,
         );
       }
+    }).catchError((error, stackTrace) {
+      var e = new AngelHttpException(error,
+          stackTrace: stackTrace, message: error?.toString());
+
+      if (logger != null) {
+        logger.severe(e.message ?? e.toString(), error, stackTrace);
+      }
+
+      return handleAngelHttpException(e, stackTrace, req, res, request);
     });
   }
 
@@ -612,19 +623,6 @@ class Angel extends AngelBase {
 
     createZoneForRequest = (request, req, res) async {
       return new ZoneSpecification(
-        handleUncaughtError: (Zone self, ZoneDelegate parent, Zone zone, error,
-            StackTrace stackTrace) {
-          var e = new AngelHttpException(error,
-              stackTrace: stackTrace, message: error?.toString());
-          return handleAngelHttpException(
-            e,
-            stackTrace,
-            req,
-            res,
-            request,
-            ignoreFinalizers: true,
-          );
-        },
         print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
           if (logger != null) {
             logger.info(line);
diff --git a/pubspec.yaml b/pubspec.yaml
index 04bc9c56..08125bb7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,13 +15,13 @@ dependencies:
   flatten: ^1.0.0
   json_god: ^2.0.0-beta
   logging: ">=0.11.3 <1.0.0"
+  matcher: ^0.12.0
   merge_map: ^1.0.0
   meta: ^1.0.0
   mime: ^0.9.3
   random_string: ^0.0.1
   tuple: ^1.0.0
 dev_dependencies:
-  matcher: ^0.12.0
   mock_request: ^1.0.0
   http: ^0.11.3
   test: ^0.12.13
diff --git a/test/all.dart b/test/all.dart
index 0dbf6604..2cddc867 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -6,6 +6,7 @@ import 'encoders_buffer_test.dart' as encoders_buffer;
 import 'exception_test.dart' as exception;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
+import 'parameter_meta_test.dart' as parameter_meta;
 import 'precontained_test.dart' as precontained;
 import 'primitives_test.dart' as primitives;
 import 'repeat_request_test.dart' as repeat_request;
@@ -28,6 +29,7 @@ main() {
   group('exception', exception.main);
   group('general', general.main);
   group('hooked', hooked.main);
+  group('parameter_meta', parameter_meta.main);
   group('precontained', precontained.main);
   group('primitives', primitives.main);
   group('repeat request', repeat_request.main);
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
new file mode 100644
index 00000000..aa6009de
--- /dev/null
+++ b/test/parameter_meta_test.dart
@@ -0,0 +1,131 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:logging/logging.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+Future<String> readResponse(MockHttpResponse rs) {
+  return rs.transform(UTF8.decoder).join();
+}
+
+Future printResponse(MockHttpResponse rs) {
+  return readResponse(rs).then((text) {
+    print(text.isEmpty ? '<empty response>' : text);
+  });
+}
+
+main() {
+  Angel app;
+
+  setUp(() {
+    app = new Angel()..lazyParseBodies = true;
+
+    app.get('/cookie', (@CookieValue('token') String jwt) {
+      return jwt;
+    });
+
+    app.get('/header', (@Header('x-foo') String header) {
+      return header;
+    });
+
+    app.get('/query', (@Query('q') String query) {
+      return query;
+    });
+
+    app.get('/session', (@Session('foo') String foo) {
+      return foo;
+    });
+
+    app.get('/match', (@Query('mode', match: 'pos') String mode) {
+      return 'YES $mode';
+    });
+
+    app.get('/match', (@Query('mode', match: 'neg') String mode) {
+      return 'NO $mode';
+    });
+
+    app.get('/match', (@Query('mode') String mode) {
+      return 'DEFAULT $mode';
+    });
+
+    app.logger = new Logger('parameter_meta_test')
+      ..onRecord.listen((rec) {
+        print(rec);
+        if (rec.error != null) print(rec.error);
+        if (rec.stackTrace != null) print(rec.stackTrace);
+      });
+  });
+
+  test('injects header or throws', () async {
+    // Invalid request
+    var rq = new MockHttpRequest('GET', Uri.parse('/header'))..close();
+    var rs = rq.response;
+    await app.handleRequest(rq);
+
+    await printResponse(rs);
+    expect(rs.statusCode, 400);
+
+    // Valid request
+    rq = new MockHttpRequest('GET', Uri.parse('/header'))
+      ..headers.add('x-foo', 'bar')
+      ..close();
+    rs = rq.response;
+    await app.handleRequest(rq);
+
+    var body = await readResponse(rs);
+    print('Body: $body');
+    expect(rs.statusCode, 200);
+    expect(body, JSON.encode('bar'));
+  });
+
+  test('injects session or throws', () async {
+    // Invalid request
+    var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
+    var rs = rq.response;
+    await app.handleRequest(rq);
+
+    await printResponse(rs);
+    expect(rs.statusCode, 500);
+
+    rq = new MockHttpRequest('GET', Uri.parse('/session'));
+    rq.session['foo'] = 'bar';
+    rq.close();
+    rs = rq.response;
+    await app.handleRequest(rq);
+
+    await printResponse(rs);
+    expect(rs.statusCode, 200);
+  });
+
+  // Originally, the plan was to test cookie, session, header, etc.,
+  // but that behavior has been consolidated into `getValue`. Thus,
+  // they will all function the same way.
+
+  test('pattern matching', () async {
+    var rq = new MockHttpRequest('GET', Uri.parse('/match?mode=pos'))..close();
+    var rs = rq.response;
+    await app.handleRequest(rq);
+    var body = await readResponse(rs);
+    print('Body: $body');
+    expect(rs.statusCode, 200);
+    expect(body, JSON.encode('YES pos'));
+
+    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=neg'))..close();
+    rs = rq.response;
+    await app.handleRequest(rq);
+    body = await readResponse(rs);
+    print('Body: $body');
+    expect(rs.statusCode, 200);
+    expect(body, JSON.encode('NO neg'));
+
+    // Fallback
+    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=ambi'))..close();
+    rs = rq.response;
+    await app.handleRequest(rq);
+    body = await readResponse(rs);
+    print('Body: $body');
+    expect(rs.statusCode, 200);
+    expect(body, JSON.encode('DEFAULT ambi'));
+  });
+}
diff --git a/test/routing_test.dart b/test/routing_test.dart
index f96f7b7e..5cd54d78 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -79,6 +79,15 @@ main() {
 
     app.use('/query', new QueryService());
 
+    RequestMiddleware write(String message) {
+      return (req, res) async {
+        res.write(message);
+        return true;
+      };
+    }
+
+    app.chain(write('a')).chain([write('b'), write('c')]).get('/chained', () => false);
+
     app.use('MJ');
 
     app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
@@ -112,6 +121,11 @@ main() {
     expect(json['last'], equals('WORLD'));
   });
 
+  test('Chained routes', () async {
+    var response = await client.get("$url/chained");
+    expect(response.body, equals('abc'));
+  });
+
   test('Can nest another Angel instance', () async {
     var response = await client.post('$url/nes/ted/foo');
     var json = JSON.decode(response.body);

From 1e8cb87e18807666603086b97efbf74aaf5702d3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 10 Oct 2017 12:56:20 -0400
Subject: [PATCH 159/414] +6

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 08125bb7..27409656 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+5
+version: 1.1.0-alpha+6
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 77a5cec9c0752a5ca11b0af3b7d886bd253f515f Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 28 Oct 2017 04:50:16 -0400
Subject: [PATCH 160/414] working on metrics

---
 .idea/libraries/Dart_Packages.xml             |   8 +-
 ...hello.xml => performance__hello__DEV_.xml} |   3 +-
 .../performance__hello__PRODUCTION_.xml       |  11 +
 .idea/workspace.xml                           | 854 +++++++++---------
 lib/metrics.dart                              |   2 +
 lib/src/http/angel_base.dart                  |  13 +-
 lib/src/http/hooked_service.dart              |   1 +
 lib/src/http/request_context.dart             |  21 +-
 lib/src/http/response_context.dart            |  69 +-
 lib/src/http/routable.dart                    |   7 +
 lib/src/http/server.dart                      |  61 +-
 lib/src/stats/metric_server.dart              | 155 ++++
 lib/src/stats/stats.dart                      |  49 +
 performance/hello/main.dart                   |  16 +-
 pubspec.yaml                                  |   2 +-
 15 files changed, 777 insertions(+), 495 deletions(-)
 rename .idea/runConfigurations/{performance__hello.xml => performance__hello__DEV_.xml} (50%)
 create mode 100644 .idea/runConfigurations/performance__hello__PRODUCTION_.xml
 create mode 100644 lib/metrics.dart
 create mode 100644 lib/src/stats/metric_server.dart
 create mode 100644 lib/src/stats/stats.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 98dd117d..6be5cc17 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -26,7 +26,7 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.7/lib" />
             </list>
           </value>
         </entry>
@@ -54,7 +54,7 @@
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib" />
             </list>
           </value>
         </entry>
@@ -435,11 +435,11 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+13/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
diff --git a/.idea/runConfigurations/performance__hello.xml b/.idea/runConfigurations/performance__hello__DEV_.xml
similarity index 50%
rename from .idea/runConfigurations/performance__hello.xml
rename to .idea/runConfigurations/performance__hello__DEV_.xml
index 910062a6..1925a88c 100644
--- a/.idea/runConfigurations/performance__hello.xml
+++ b/.idea/runConfigurations/performance__hello__DEV_.xml
@@ -1,6 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="performance::hello" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true">
-    <option name="checkedMode" value="false" />
+  <configuration default="false" name="performance::hello (DEV)" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true">
     <option name="filePath" value="$PROJECT_DIR$/performance/hello/main.dart" />
     <option name="workingDirectory" value="$PROJECT_DIR$" />
     <method />
diff --git a/.idea/runConfigurations/performance__hello__PRODUCTION_.xml b/.idea/runConfigurations/performance__hello__PRODUCTION_.xml
new file mode 100644
index 00000000..56888d49
--- /dev/null
+++ b/.idea/runConfigurations/performance__hello__PRODUCTION_.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="performance::hello (PRODUCTION)" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true">
+    <option name="checkedMode" value="false" />
+    <option name="envs">
+      <entry key="ANGEL_ENV" value="production" />
+    </option>
+    <option name="filePath" value="$PROJECT_DIR$/performance/hello/main.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 51b975ac..830e9bea 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/injects_session_or_throws_in_parameter_meta_test_dart.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello__PRODUCTION_.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/metrics.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/stats/stats.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello__DEV_.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/injection.dart" afterPath="$PROJECT_DIR$/lib/src/http/injection.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/http/metadata.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -36,22 +39,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-323">
-              <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
-              <folding />
+            <state relative-caret-position="80">
+              <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
+              <folding>
+                <element signature="e#75#92#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -59,8 +54,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
-              <caret line="480" column="23" lean-forward="false" selection-start-line="480" selection-start-column="13" selection-end-line="480" selection-end-column="23" />
+            <state relative-caret-position="175">
+              <caret line="430" column="33" lean-forward="true" selection-start-line="430" selection-start-column="33" selection-end-line="430" selection-end-column="33" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -68,46 +63,44 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="73" column="28" lean-forward="false" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
+            <state relative-caret-position="15">
+              <caret line="180" column="28" lean-forward="false" selection-start-line="180" selection-start-column="28" selection-end-line="180" selection-end-column="28" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="12" column="13" lean-forward="true" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+            <state relative-caret-position="15">
+              <caret line="355" column="28" lean-forward="false" selection-start-line="355" selection-start-column="28" selection-end-line="355" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="107">
+              <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#42#62#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="615">
-              <caret line="100" column="8" lean-forward="false" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
-              <folding>
-                <element signature="e#40#101#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <file leaf-file-name="angel.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="15">
-                <caret line="1" column="70" lean-forward="false" selection-start-line="1" selection-start-column="70" selection-end-line="1" selection-end-column="70" />
+              <first_editor relative-caret-position="150">
+                <caret line="10" column="8" lean-forward="false" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -115,18 +108,48 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="all.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="140">
-              <caret line="31" column="23" lean-forward="false" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
+            <state relative-caret-position="138">
+              <caret line="16" column="10" lean-forward="true" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="311">
+              <caret line="32" column="10" lean-forward="false" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
               <folding>
-                <element signature="e#0#38#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="zone.dart" pinned="false" current-in-tab="false">
+        <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-590">
+              <caret line="105" column="17" lean-forward="false" selection-start-line="105" selection-start-column="17" selection-end-line="105" selection-end-column="17" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="stats.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="146">
+              <caret line="37" column="0" lean-forward="true" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -138,36 +161,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>.name</find>
-      <find>logger</find>
-      <find>handleRequ</find>
-      <find>aNGEL(</find>
-      <find>Routa</find>
-      <find>properties</find>
-      <find>noSuchM</find>
-      <find>preInj</find>
-      <find>REQU</find>
-      <find>registermid</find>
-      <find>custom(</find>
-      <find>errorHand</find>
-      <find>god.deserialize</find>
-      <find>registerMi</find>
-      <find>addStr</find>
-      <find>Stopwatc</find>
-      <find>_controllers</find>
-      <find>pipeline</find>
-      <find>handle</find>
-      <find>uncaught</find>
-      <find>header</find>
-      <find>creat</find>
       <find>crea</find>
       <find>run(</find>
       <find>/*</find>
       <find>runG</find>
-      <find>catchError</find>
       <find>query</find>
       <find>value == n</find>
       <find>handleCont</find>
+      <find>streamcontroller</find>
+      <find>from(</find>
+      <find>gua</find>
+      <find>_buf</find>
+      <find>sendRes</find>
+      <find>Stopwatc</find>
+      <find>toByt</find>
+      <find>toBy</find>
+      <find>listen</find>
+      <find>this.</find>
+      <find>close()</find>
+      <find>dispose</find>
+      <find>beforeAllStream</find>
+      <find>handleRequest</find>
+      <find>catchError</find>
+      <find>dispose(</find>
+      <find>putIf</find>
+      <find>putif</find>
+      <find>ANGEL_E</find>
+      <find>custom(</find>
+      <find>_sub?.c</find>
+      <find>pipe</find>
+      <find>pipeline</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -191,9 +214,9 @@
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
-      <dir>$PROJECT_DIR$/lib</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
       <dir>$PROJECT_DIR$/test</dir>
+      <dir>$PROJECT_DIR$/lib</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -207,9 +230,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/test/anonymous_service_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/common.dart" />
@@ -229,28 +249,20 @@
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
@@ -258,6 +270,17 @@
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/metrics.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
       </list>
     </option>
   </component>
@@ -268,9 +291,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="45" />
+    <option name="x" value="19" />
     <option name="y" value="23" />
-    <option name="width" value="1395" />
+    <option name="width" value="1396" />
     <option name="height" value="797" />
   </component>
   <component name="ProjectLevelVcsManager">
@@ -291,10 +314,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -323,12 +342,23 @@
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="test" type="cbb8eebc:String" user="test" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="stats" type="cbb8eebc:String" user="stats" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -361,7 +391,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.performance::hello (DEV)">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -541,41 +571,42 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="34">
-      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="29" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="30" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="31" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="32" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="33" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+    <list size="35">
+      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="28" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="29" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="30" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="31" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="32" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="33" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="34" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -630,7 +661,11 @@
       <workItem from="1507496428508" duration="1038000" />
       <workItem from="1507502664740" duration="80000" />
       <workItem from="1507556590639" duration="230000" />
-      <workItem from="1507641822711" duration="7922000" />
+      <workItem from="1507641822711" duration="9103000" />
+      <workItem from="1507683296351" duration="15215000" />
+      <workItem from="1507775636910" duration="962000" />
+      <workItem from="1508004276122" duration="3000" />
+      <workItem from="1509177543314" duration="3026000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -898,7 +933,14 @@
       <option name="project" value="LOCAL" />
       <updated>1506282194150</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="+6">
+      <created>1507654580167</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1507654580167</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -934,7 +976,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="68760000" />
+    <option name="totallyTimeSpent" value="89147000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -946,31 +988,30 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="45" y="23" width="1395" height="797" extended-state="0" />
+    <frame x="19" y="23" width="1396" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31438935" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3133903" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4814815" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25055432" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2141802" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -979,6 +1020,7 @@
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -991,7 +1033,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.0.3" />
     <MESSAGE value="+1" />
     <MESSAGE value="1.0.4" />
     <MESSAGE value="Patch" />
@@ -1016,152 +1057,14 @@
     <MESSAGE value="+2" />
     <MESSAGE value="+3" />
     <MESSAGE value="+4" />
-    <option name="LAST_COMMIT_MESSAGE" value="+4" />
+    <MESSAGE value="+6" />
+    <option name="LAST_COMMIT_MESSAGE" value="+6" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/stream.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="574" column="9" lean-forward="false" selection-start-line="574" selection-start-column="9" selection-end-line="574" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="104">
-          <caret line="255" column="1" lean-forward="false" selection-start-line="255" selection-start-column="1" selection-end-line="255" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/errors.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="77" column="40" lean-forward="false" selection-start-line="77" selection-start-column="40" selection-end-line="77" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/lockable_headers.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="16" column="6" lean-forward="false" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="19" lean-forward="false" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="0">
-            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="7" lean-forward="false" selection-start-line="1" selection-start-column="7" selection-end-line="1" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-9109">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="27" column="52" lean-forward="false" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="137">
-          <caret line="78" column="18" lean-forward="false" selection-start-line="78" selection-start-column="17" selection-end-line="78" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="37" lean-forward="true" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="32" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib/logging.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="271">
-          <caret line="361" column="0" lean-forward="true" selection-start-line="361" selection-start-column="0" selection-end-line="361" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="14" column="20" lean-forward="false" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/bytes_builder.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="57" column="12" lean-forward="false" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="903">
-          <caret line="84" column="18" lean-forward="false" selection-start-line="84" selection-start-column="18" selection-end-line="84" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="251" column="41" lean-forward="true" selection-start-line="251" selection-start-column="41" selection-end-line="251" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart" />
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1171,37 +1074,10 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/util_test.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="42" lean-forward="false" selection-start-line="3" selection-start-column="42" selection-end-line="3" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#39#59#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3825">
-          <caret line="264" column="63" lean-forward="false" selection-start-line="264" selection-start-column="63" selection-end-line="264" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1320">
           <caret line="95" column="61" lean-forward="false" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="61" />
-          <folding>
-            <element signature="e#0#20#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1209,9 +1085,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
           <caret line="28" column="62" lean-forward="false" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1219,7 +1092,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
           <caret line="11" column="8" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1234,17 +1106,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1404">
           <caret line="105" column="18" lean-forward="true" selection-start-line="105" selection-start-column="18" selection-end-line="105" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="30" lean-forward="true" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1253,9 +1114,6 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="285">
             <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
-            <folding>
-              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
-            </folding>
           </first_editor>
           <second_editor />
         </state>
@@ -1265,9 +1123,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
           <caret line="17" column="24" lean-forward="false" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1275,7 +1130,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="15" column="21" lean-forward="false" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1283,114 +1137,37 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#20#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="47">
-          <caret line="1433" column="2" lean-forward="false" selection-start-line="1433" selection-start-column="2" selection-end-line="1433" selection-end-column="2" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="33" column="13" lean-forward="false" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
-          <folding>
-            <element signature="e#47#67#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="23" lean-forward="false" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="480" column="23" lean-forward="false" selection-start-line="480" selection-start-column="13" selection-end-line="480" selection-end-column="23" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="615">
+        <state relative-caret-position="1470">
           <caret line="100" column="8" lean-forward="false" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
-          <folding>
-            <element signature="e#40#101#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
+        <state relative-caret-position="1095">
           <caret line="73" column="28" lean-forward="false" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-323">
-          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/pattern_matcher.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="13" lean-forward="true" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/pattern_matcher_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="59" column="40" lean-forward="true" selection-start-line="59" selection-start-column="40" selection-end-line="78" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="23" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
-          <folding />
+        <state relative-caret-position="0">
+          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
+    <entry file="file://$PROJECT_DIR$/test/pattern_matcher_test.dart" />
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="15">
             <caret line="1" column="70" lean-forward="false" selection-start-line="1" selection-start-column="70" selection-end-line="1" selection-end-column="70" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
@@ -1398,10 +1175,255 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
+        <state relative-caret-position="180">
           <caret line="31" column="23" lean-forward="false" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="227">
+          <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/string_buffer.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/bytes_builder.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2055">
+          <caret line="139" column="64" lean-forward="false" selection-start-line="139" selection-start-column="64" selection-end-line="139" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/timeline.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="311">
+          <caret line="96" column="65" lean-forward="false" selection-start-line="96" selection-start-column="65" selection-end-line="96" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="8" column="71" lean-forward="true" selection-start-line="8" selection-start-column="71" selection-end-line="8" selection-end-column="71" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/profiler.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1404">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/extension.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2001">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/developer.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/expando.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="12" column="24" lean-forward="true" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="292">
+          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="339" column="48" lean-forward="true" selection-start-line="339" selection-start-column="48" selection-end-line="339" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/schedule_microtask.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="131" column="5" lean-forward="false" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/isolate/isolate.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="80" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="291">
+          <caret line="343" column="3" lean-forward="true" selection-start-line="343" selection-start-column="3" selection-end-line="343" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="25" column="78" lean-forward="true" selection-start-line="25" selection-start-column="78" selection-end-line="25" selection-end-column="78" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib/src/middleware_pipeline.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/map.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="193" column="4" lean-forward="false" selection-start-line="193" selection-start-column="4" selection-end-line="193" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib/src/tuple.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="78" column="21" lean-forward="false" selection-start-line="78" selection-start-column="21" selection-end-line="78" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib/src/parse_body.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="90" column="7" lean-forward="true" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="23" lean-forward="false" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="16" column="10" lean-forward="true" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="107">
+          <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
           <folding>
-            <element signature="e#0#38#0" expanded="true" />
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="150">
+            <caret line="10" column="8" lean-forward="false" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="355" column="28" lean-forward="false" selection-start-line="355" selection-start-column="28" selection-end-line="355" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/metrics.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="29" lean-forward="true" selection-start-line="0" selection-start-column="29" selection-end-line="0" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-590">
+          <caret line="105" column="17" lean-forward="false" selection-start-line="105" selection-start-column="17" selection-end-line="105" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="430" column="33" lean-forward="true" selection-start-line="430" selection-start-column="33" selection-end-line="430" selection-end-column="33" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="180" column="28" lean-forward="false" selection-start-line="180" selection-start-column="28" selection-end-line="180" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
+          <folding>
+            <element signature="e#75#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="37" column="0" lean-forward="true" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="311">
+          <caret line="32" column="10" lean-forward="false" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/lib/metrics.dart b/lib/metrics.dart
new file mode 100644
index 00000000..f373795f
--- /dev/null
+++ b/lib/metrics.dart
@@ -0,0 +1,2 @@
+export 'src/stats/metric_server.dart';
+export 'src/stats/stats.dart';
\ No newline at end of file
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index 7c232526..eeddffb0 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -9,6 +9,9 @@ typedef Future<String> ViewGenerator(String path, [Map data]);
 
 /// Base class for Angel servers. Do not bother extending this.
 class AngelBase extends Routable {
+  static ViewGenerator noViewEngineConfigured =(String view, [Map data]) async =>
+  "No view engine has been configured yet.";
+
   Container _container = new Container();
 
   final Map configuration = {};
@@ -28,6 +31,12 @@ class AngelBase extends Routable {
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
-  ViewGenerator viewGenerator = (String view, [Map data]) async =>
-      "No view engine has been configured yet.";
+  ViewGenerator viewGenerator = noViewEngineConfigured;
+
+  /// Closes this instance, rendering it **COMPLETELY DEFUNCT**.
+  Future close() async {
+    await super.close();
+    _container = null;
+    viewGenerator = noViewEngineConfigured;
+  }
 }
diff --git a/lib/src/http/hooked_service.dart b/lib/src/http/hooked_service.dart
index 067fb45a..51580c8c 100644
--- a/lib/src/http/hooked_service.dart
+++ b/lib/src/http/hooked_service.dart
@@ -686,6 +686,7 @@ class HookedServiceEventDispatcher {
 
   void _close() {
     _ctrl.forEach((c) => c.close());
+    listeners.clear();
   }
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 886b30ba..1ea30dc9 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -3,7 +3,6 @@ library angel_framework.http.request_context;
 import 'dart:async';
 import 'dart:io';
 import 'dart:mirrors';
-import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:body_parser/body_parser.dart';
 import 'package:charcode/charcode.dart';
 import 'metadata.dart';
@@ -214,6 +213,11 @@ class RequestContext {
 
   /// Shorthand to add to [_injections].
   void inject(type, value) {
+    if (!app.isProduction && type is Type) {
+      if (!reflect(value).type.isAssignableTo(reflectType(type)))
+        throw new ArgumentError('Cannot inject $value (${value.runtimeType}) as an instance of $type.');
+    }
+
     _injections[type] = value;
   }
 
@@ -278,4 +282,19 @@ class RequestContext {
     return _body = await parseBody(io,
         storeOriginalBuffer: app.storeOriginalBuffer == true);
   }
+
+  /// Disposes of all resources.
+  Future close() async {
+    _body = null;
+    _acceptsAllCache = null;
+    _acceptHeaderCache = null;
+    _io = null;
+    _override = _path = null;
+    _contentType = null;
+    _provisionalQuery?.clear();
+    properties.clear();
+    _injections.clear();
+    serviceParams.clear();
+    params.clear();
+  }
 }
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index e4c8689f..0abe6747 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -3,7 +3,6 @@ library angel_framework.http.response_context;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
@@ -158,11 +157,24 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
     return f;
   }
 
+  /// Disposes of all resources.
+  Future dispose() async {
+    await close();
+    properties.clear();
+    encoders.clear();
+    _buffer.clear();
+    cookies.clear();
+    app = null;
+    _headers.clear();
+    serializer = null;
+  }
+
   /// Prevents further request handlers from running on the response, except for response finalizers.
   ///
   /// To disable response finalizers, see [willCloseItself].
   void end() {
     _isOpen = false;
+    if (_done?.isCompleted == false) _done.complete();
   }
 
   /// Serializes JSON to the response.
@@ -434,14 +446,16 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 }
 
 abstract class _LockableBytesBuilder extends BytesBuilder {
-  factory _LockableBytesBuilder() => new _LockableBytesBuilderImpl();
+  factory _LockableBytesBuilder() {
+    return new _LockableBytesBuilderImpl();
+  }
 
   void _lock();
 }
 
 class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
+  final BytesBuilder _buf = new BytesBuilder(copy: false);
   bool _closed = false;
-  Uint8List _data = new Uint8List(0);
 
   StateError _deny() =>
       new StateError('Cannot modified a closed response\'s buffer.');
@@ -455,70 +469,37 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
   void add(List<int> bytes) {
     if (_closed)
       throw _deny();
-    else if (bytes.isNotEmpty) {
-      int len = _data.length + bytes.length;
-      var d = new Uint8List(len);
-
-      for (int i = 0; i < _data.length; i++) {
-        d[i] = _data[i];
-      }
-
-      for (int i = 0; i < bytes.length; i++) {
-        d[i + _data.length] = bytes[i];
-      }
-
-      _data = d;
-    }
+    else _buf.add(bytes);
   }
 
   @override
   void addByte(int byte) {
     if (_closed)
       throw _deny();
-    else {
-      int len = _data.length + 1;
-      var d = new Uint8List(len);
-
-      for (int i = 0; i < _data.length; i++) {
-        d[i] = _data[i];
-      }
-
-      d[_data.length] = byte;
-      _data = d;
-    }
+    else _buf.addByte(byte);
   }
 
   @override
   void clear() {
-    if (_closed)
-      throw _deny();
-    else {
-      for (int i = 0; i < _data.length; i++) _data[i] = 0;
-    }
+    _buf.clear();
   }
 
   @override
-  bool get isEmpty => _data.isEmpty;
+  bool get isEmpty => _buf.isEmpty;
 
   @override
-  bool get isNotEmpty => _data.isNotEmpty;
+  bool get isNotEmpty => _buf.isNotEmpty;
 
   @override
-  int get length => _data.length;
+  int get length => _buf.length;
 
   @override
   List<int> takeBytes() {
-    if (_closed)
-      return toBytes();
-    else {
-      var r = new Uint8List.fromList(_data);
-      clear();
-      return r;
-    }
+    return _buf.takeBytes();
   }
 
   @override
   List<int> toBytes() {
-    return _data;
+    return _buf.toBytes();
   }
 }
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index f5c3f696..44a01c0b 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -39,6 +39,13 @@ class Routable extends Router {
 
   Routable() : super();
 
+  Future close() async {
+    _services.clear();
+    configuration.clear();
+    requestMiddleware.clear();
+    _onService.close();
+  }
+
   /// Additional filters to be run on designated requests.
   @override
   final Map<String, RequestHandler> requestMiddleware = {};
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 240aaf5c..30489a89 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -30,11 +30,12 @@ typedef Future AngelConfigurer(Angel app);
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
   final List<Angel> _children = [];
-  final Map<String, Tuple3<MiddlewarePipeline, Map, Match>> _handlerCache = {};
+  final Map<String, Tuple3<List, Map, Match>> _handlerCache = {};
 
   Router _flattened;
-  bool _isProduction;
+  bool _isProduction = false;
   Angel _parent;
+  StreamSubscription<HttpRequest> _sub;
   ServerGenerator _serverGenerator = HttpServer.bind;
 
   /// A global Map of converters that can transform responses bodies.
@@ -74,10 +75,7 @@ class Angel extends AngelBase {
   /// This value is memoized the first time you call it, so do not change environment
   /// configuration at runtime!
   bool get isProduction {
-    if (_isProduction != null)
-      return _isProduction;
-    else
-      return _isProduction = Platform.environment['ANGEL_ENV'] == 'production';
+    return _isProduction ??= (Platform.environment['ANGEL_ENV'] == 'production');
   }
 
   /// The function used to bind this instance to an HTTP server.
@@ -158,7 +156,8 @@ class Angel extends AngelBase {
     }
 
     optimizeForProduction();
-    return httpServer..listen(handleRequest);
+    _sub = httpServer.listen(handleRequest);
+    return httpServer;
   }
 
   @override
@@ -196,9 +195,13 @@ class Angel extends AngelBase {
   }
 
   /// Shuts down the server, and closes any open [StreamController]s.
+  ///
+  /// The server will be **COMPLETE DEFUNCT** after this operation!
   Future<HttpServer> close() async {
     HttpServer server;
 
+    _sub?.cancel();
+
     if (httpServer != null) {
       server = httpServer;
       await httpServer.close(force: true);
@@ -210,6 +213,20 @@ class Angel extends AngelBase {
 
     for (var plugin in shutdownHooks) await plugin(this);
 
+    await super.close();
+    _preContained.clear();
+    _handlerCache.clear();
+    _injections.clear();
+    encoders.clear();
+    _serializer = god.serialize;
+    _children.clear();
+    _parent = null;
+    logger = null;
+    startupHooks.clear();
+    shutdownHooks.clear();
+    responseFinalizers.clear();
+    _flattened = null;
+
     return server;
   }
 
@@ -291,9 +308,12 @@ class Angel extends AngelBase {
   /// Runs some [handler]. Returns `true` if request execution should continue.
   Future<bool> executeHandler(
       handler, RequestContext req, ResponseContext res) async {
+    if (handler == null) return false;
     var result = await getHandlerResult(handler, req, res);
 
-    if (result is bool) {
+    if (result == null)
+      return false;
+    else if (result is bool) {
       return result;
     } else if (result != null) {
       res.serialize(result,
@@ -384,30 +404,36 @@ class Angel extends AngelBase {
 
       if (requestedUrl.isEmpty) requestedUrl = '/';
 
-      var tuple = _handlerCache.putIfAbsent('${req.method}:$requestedUrl', () {
+      Tuple3<List, Map, Match> resolveTuple() {
         Router r = isProduction ? (_flattened ??= flatten(this)) : this;
         var resolved =
             r.resolveAll(requestedUrl, requestedUrl, method: req.method);
 
         return new Tuple3(
-          new MiddlewarePipeline(resolved),
+          new MiddlewarePipeline(resolved).handlers,
           resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
           resolved.isEmpty ? null : resolved.first.route.match(requestedUrl),
         );
-      });
+      }
+
+      var tuple = isProduction
+          ? _handlerCache.putIfAbsent(
+              '${req.method}:$requestedUrl', resolveTuple)
+          : resolveTuple();
 
       req.inject(Zone, zone);
       req.inject(ZoneSpecification, zoneSpec);
-      req.inject(MiddlewarePipeline, tuple.item1);
       req.params.addAll(tuple.item2);
       req.inject(Match, tuple.item3);
-      req.inject(Stopwatch, new Stopwatch()..start());
 
-      var pipeline = tuple.item1.handlers;
+      if (logger != null) req.inject(Stopwatch, new Stopwatch()..start());
+
+      var pipeline = tuple.item1;
 
       for (var handler in pipeline) {
         try {
-          if (!await executeHandler(handler, req, res)) break;
+          if (handler == null || !await executeHandler(handler, req, res))
+            break;
         } on AngelHttpException catch (e, st) {
           e.stackTrace ??= st;
           return await handleAngelHttpException(e, st, req, res, request);
@@ -436,6 +462,11 @@ class Angel extends AngelBase {
       }
 
       return handleAngelHttpException(e, stackTrace, req, res, request);
+    }).whenComplete(() {
+      scheduleMicrotask(() {
+        req.close();
+        res.dispose();
+      });
     });
   }
 
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
new file mode 100644
index 00000000..69b7f472
--- /dev/null
+++ b/lib/src/stats/metric_server.dart
@@ -0,0 +1,155 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:logging/logging.dart';
+import '../http/http.dart';
+import 'stats.dart';
+
+/// A variant of an [Angel] server that records performance metrics.
+class AngelMetrics extends Angel {
+  Angel _inner;
+  HttpServer _server;
+  StreamSubscription<HttpRequest> _sub;
+
+  AngelMetrics() : super() {
+    var zoneBuilder = createZoneForRequest;
+    createZoneForRequest = (request, req, res) async {
+      var spec = await zoneBuilder(request, req, res);
+      return new ZoneSpecification.from(
+        spec,
+        run: (Zone self, ZoneDelegate parent, Zone zone, f()) {
+          var sw = new Stopwatch();
+          //print('--- ${req.method} ${req.uri}: $f');
+          sw.start();
+
+          void whenDone() {
+            sw.stop();
+            var ms = sw.elapsedMilliseconds;
+            parent.print(
+                zone, '--- ${req.method} ${req.uri} DONE after ${ms}ms: $f');
+          }
+
+          var r = parent.run(zone, f);
+
+          if (r is Future) {
+            return r.then((x) {
+              whenDone();
+              return x;
+            });
+          }
+
+          whenDone();
+          return r;
+        },
+      );
+    };
+
+    logger = new Logger('angel_metrics')
+      ..onRecord.listen((rec) {
+        print(rec);
+
+        if (rec.error != null) {
+          print(rec.error);
+          print(rec.stackTrace);
+        }
+      });
+  }
+
+  factory AngelMetrics.custom(ServerGenerator serverGenerator) {
+    return new AngelMetrics().._inner = new Angel.custom(serverGenerator);
+  }
+
+  @override
+  HttpServer get httpServer => _server ?? super.httpServer;
+
+  final AngelMetricsStats stats = new AngelMetricsStats._();
+
+  @override
+  Future<HttpServer> startServer([address, int port]) async {
+    if (_inner == null) return await super.startServer(address, port);
+
+    var host = address ?? InternetAddress.LOOPBACK_IP_V4;
+    _server = await _inner.serverGenerator(host, port ?? 0);
+
+    for (var configurer in startupHooks) {
+      await configure(configurer);
+    }
+
+    optimizeForProduction();
+    _sub = _server.listen(handleRequest);
+    return _server;
+  }
+
+  @override
+  Future<HttpServer> close() async {
+    _sub?.cancel();
+    await _inner.close();
+    return await super.close();
+  }
+
+  @override
+  Future<RequestContext> createRequestContext(HttpRequest request) {
+    return stats.createRequestContext
+        .run<RequestContext>(() => super.createRequestContext(request));
+  }
+
+  @override
+  Future<ResponseContext> createResponseContext(HttpResponse response,
+      [RequestContext correspondingRequest]) {
+    return stats.createResponseContext.run<ResponseContext>(
+        () => super.createResponseContext(response, correspondingRequest));
+  }
+
+  @override
+  Future handleRequest(HttpRequest request) {
+    return stats.handleRequest.run(() => super.handleRequest(request));
+  }
+
+  @override
+  Future<bool> executeHandler(
+      handler, RequestContext req, ResponseContext res) {
+    return stats.executeHandler
+        .run<bool>(() => super.executeHandler(handler, req, res));
+  }
+
+  @override
+  Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
+    return stats.getHandlerResult
+        .run(() => super.getHandlerResult(handler, req, res));
+  }
+
+  @override
+  Future runContained(
+      Function handler, RequestContext req, ResponseContext res) {
+    return stats.runContained.run(() => super.runContained(handler, req, res));
+  }
+
+  @override
+  Future sendResponse(
+      HttpRequest request, RequestContext req, ResponseContext res,
+      {bool ignoreFinalizers: false}) {
+    return stats.sendResponse.run(() => super.sendResponse(request, req, res));
+  }
+}
+
+class AngelMetricsStats {
+  AngelMetricsStats._() {
+    all = [
+      createRequestContext,
+      createResponseContext,
+    ];
+  }
+
+  final Stats createRequestContext = new Stats('createRequestContext');
+  final Stats createResponseContext = new Stats('createResponseContext');
+  final Stats handleRequest = new Stats('handleRequest');
+  final Stats executeHandler = new Stats('executeHandler');
+  final Stats getHandlerResult = new Stats('getHandlerResult');
+  final Stats runContained = new Stats('runContained');
+  final Stats sendResponse = new Stats('sendResponse');
+
+  List<Stats> all;
+
+  void log() {
+    all.forEach((s) => s.log());
+  }
+}
diff --git a/lib/src/stats/stats.dart b/lib/src/stats/stats.dart
new file mode 100644
index 00000000..c13125cd
--- /dev/null
+++ b/lib/src/stats/stats.dart
@@ -0,0 +1,49 @@
+/// Computes averages progressively.
+
+import 'dart:async';
+
+class Stats {
+  final String name;
+
+  int _total = 0, _count = 0;
+  double _average = 0.0;
+
+  Stats(this.name);
+
+  double get average => _average ?? (_total / _count);
+
+  void log() {
+    print('$name: $average avg.');
+  }
+
+  void add(int value) {
+    _average = null;
+    _total += value;
+    _count++;
+  }
+
+  FutureOr<T> run<T>(FutureOr<T> f()) {
+    var sw = new Stopwatch();
+    //print('--- $name START');
+    sw.start();
+
+    void whenDone() {
+      sw.stop();
+      var ms = sw.elapsedMilliseconds;
+      add(ms);
+      print('--- $name DONE after ${ms}ms');
+    }
+
+    var r = f();
+
+    if (r is Future) {
+      return (r as Future).then((x) {
+        whenDone();
+        return x;
+      });
+    }
+
+    whenDone();
+    return r;
+  }
+}
\ No newline at end of file
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 7c2b2602..e8d8bff4 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -4,24 +4,20 @@ library performance.hello;
 import 'dart:io';
 import 'dart:isolate';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:logging/logging.dart';
+import 'package:angel_framework/metrics.dart';
 
 main() {
-  for (int i = 0; i < Platform.numberOfProcessors - 1; i++)
+  for (int i = 0; i < Platform.numberOfProcessors - 1; i++) {
     Isolate.spawn(start, i + 1);
+  }
+
   start(0);
 }
 
 void start(int id) {
-  var app = new Angel.custom(startShared)
+  var app = new AngelMetrics.custom(startShared)
     ..lazyParseBodies = true
-    ..get('/', (req, res) => res.write('Hello, world!'))
-    ..optimizeForProduction(force: true)
-    ..logger = (new Logger('streaming_test')
-      ..onRecord.listen((rec) {
-        print(rec);
-        if (rec.stackTrace != null) print(rec.stackTrace);
-      }));
+    ..get('/', (req, res) => res.write('Hello, world!'));
 
   var oldHandler = app.errorHandler;
   app.errorHandler = (e, req, res) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 27409656..13c0d258 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
-  sdk: ">=1.19.0"
+  sdk: ">=1.19.0 <2.0.0"
 dependencies:
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0

From 416fb40b82697481b45ea080b6c881f324a70460 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 18 Nov 2017 12:42:31 -0500
Subject: [PATCH 161/414] autoIdAndDateFields in MapService

---
 .idea/libraries/Dart_Packages.xml |  44 +--
 .idea/workspace.xml               | 507 +++++++++++++++---------------
 CHANGELOG.md                      |   7 +
 lib/src/http/map_service.dart     |  39 ++-
 lib/src/http/server.dart          |   8 +-
 lib/src/stats/metric_server.dart  |  87 +++--
 lib/src/stats/stats.dart          |   6 +-
 performance/hello/main.dart       |   3 +-
 pubspec.yaml                      |   2 +-
 test/controller_test.dart         |  12 +-
 test/di_test.dart                 |   3 +-
 11 files changed, 386 insertions(+), 332 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 6be5cc17..c7ee0131 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -26,14 +26,14 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.2/lib" />
             </list>
           </value>
         </entry>
@@ -145,7 +145,7 @@
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+15/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
             </list>
           </value>
         </entry>
@@ -170,6 +170,13 @@
             </list>
           </value>
         </entry>
+        <entry key="io">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="isolate">
           <value>
             <list>
@@ -229,7 +236,7 @@
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.4/lib" />
             </list>
           </value>
         </entry>
@@ -264,7 +271,7 @@
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.0/lib" />
             </list>
           </value>
         </entry>
@@ -306,7 +313,7 @@
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.1/lib" />
             </list>
           </value>
         </entry>
@@ -320,7 +327,7 @@
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.6/lib" />
             </list>
           </value>
         </entry>
@@ -355,7 +362,7 @@
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.8.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.1/lib" />
             </list>
           </value>
         </entry>
@@ -383,7 +390,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+8/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.28/lib" />
             </list>
           </value>
         </entry>
@@ -435,8 +442,8 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+13/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib" />
@@ -452,10 +459,11 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+15/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
@@ -464,29 +472,29 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.1+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.4.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.8.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.24+8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.28/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 830e9bea..cf8b969f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,21 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello__PRODUCTION_.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/metrics.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/stats/stats.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/performance__hello__DEV_.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" afterPath="$PROJECT_DIR$/lib/src/stats/stats.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -42,10 +38,32 @@
       <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
+            <state relative-caret-position="345">
+              <caret line="23" column="35" lean-forward="false" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
               <folding>
-                <element signature="e#75#92#0" expanded="true" />
+                <element signature="e#75#95#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="245">
+              <caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -54,8 +72,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="175">
-              <caret line="430" column="33" lean-forward="true" selection-start-line="430" selection-start-column="33" selection-end-line="430" selection-end-column="33" />
+            <state relative-caret-position="9900">
+              <caret line="677" column="5" lean-forward="false" selection-start-line="677" selection-start-column="5" selection-end-line="677" selection-end-column="5" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -63,44 +81,55 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1110">
+              <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="21" column="40" lean-forward="true" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="15">
+                <caret line="1" column="63" lean-forward="false" selection-start-line="1" selection-start-column="63" selection-end-line="1" selection-end-column="63" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="180" column="28" lean-forward="false" selection-start-line="180" selection-start-column="28" selection-end-line="180" selection-end-column="28" />
+            <state relative-caret-position="690">
+              <caret line="54" column="36" lean-forward="false" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="355" column="28" lean-forward="false" selection-start-line="355" selection-start-column="28" selection-end-line="355" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="107">
-              <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
-              <folding>
-                <element signature="e#42#62#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="angel.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="150">
-                <caret line="10" column="8" lean-forward="false" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
+              <first_editor relative-caret-position="225">
+                <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="84" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -108,48 +137,19 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="138">
-              <caret line="16" column="10" lean-forward="true" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="311">
-              <caret line="32" column="10" lean-forward="false" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
+            <state relative-caret-position="1125">
+              <caret line="78" column="30" lean-forward="false" selection-start-line="78" selection-start-column="30" selection-end-line="78" selection-end-column="30" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
+                <marker date="1509213215000" expanded="true" signature="664:857" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="zone.dart" pinned="false" current-in-tab="false">
-        <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-590">
-              <caret line="105" column="17" lean-forward="false" selection-start-line="105" selection-start-column="17" selection-end-line="105" selection-end-column="17" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="stats.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="37" column="0" lean-forward="true" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -161,10 +161,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>crea</find>
-      <find>run(</find>
-      <find>/*</find>
-      <find>runG</find>
       <find>query</find>
       <find>value == n</find>
       <find>handleCont</find>
@@ -191,6 +187,10 @@
       <find>_sub?.c</find>
       <find>pipe</find>
       <find>pipeline</find>
+      <find>&lt;BR&gt;</find>
+      <find>extend(</find>
+      <find>handleReq</find>
+      <find>STARTS</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -230,8 +230,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
-        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/common.dart" />
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
@@ -249,7 +247,6 @@
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
@@ -257,8 +254,6 @@
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
@@ -268,19 +263,24 @@
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/metrics.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
+        <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -291,9 +291,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="19" />
-    <option name="y" value="23" />
-    <option name="width" value="1396" />
+    <option name="x" value="270" />
+    <option name="y" value="64" />
+    <option name="width" value="1278" />
     <option name="height" value="797" />
   </component>
   <component name="ProjectLevelVcsManager">
@@ -314,6 +314,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -339,26 +342,11 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="http" type="cbb8eebc:String" user="http" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="stats" type="cbb8eebc:String" user="stats" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane" />
       <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -379,6 +367,12 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
   </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/lib/src/http" />
+      <recent name="$PROJECT_DIR$/lib/src/util" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -391,7 +385,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.performance::hello (DEV)">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -517,6 +511,11 @@
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="injects header or throws" />
     </configuration>
+    <configuration name="middleware in controller_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/controller_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="middleware" />
+    </configuration>
     <configuration name="only match route with matching method in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -571,42 +570,43 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="35">
-      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="29" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="30" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="31" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="32" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="33" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="34" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+    <list size="36">
+      <item index="0" class="java.lang.String" itemvalue="Dart Test.middleware in controller_test.dart" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="28" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="29" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="30" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="31" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="32" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="33" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="34" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="35" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -665,7 +665,8 @@
       <workItem from="1507683296351" duration="15215000" />
       <workItem from="1507775636910" duration="962000" />
       <workItem from="1508004276122" duration="3000" />
-      <workItem from="1509177543314" duration="3026000" />
+      <workItem from="1509177543314" duration="8319000" />
+      <workItem from="1511026448813" duration="486000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -944,23 +945,23 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.10.10 at 12h 54m 58s.xml">
+    <history-entry file="All_Tests - 2017.11.18 at 12h 37m 43s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 48m 40s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.11.18 at 12h 38m 02s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 48m 52s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2017.11.18 at 12h 40m 26s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 49m 07s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="Controller_Tests - 2017.11.18 at 12h 40m 14s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 18s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="middleware_in_controller_test_dart - 2017.11.18 at 12h 39m 15s.xml">
+      <configuration name="middleware in controller_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 23s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="middleware_in_controller_test_dart - 2017.11.18 at 12h 40m 04s.xml">
+      <configuration name="middleware in controller_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 40s.xml">
       <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
@@ -976,7 +977,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="89147000" />
+    <option name="totallyTimeSpent" value="94926000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -988,39 +989,39 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="19" y="23" width="1396" height="797" extended-state="0" />
+    <frame x="270" y="64" width="1278" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3133903" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4814815" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6196581" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2141802" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23624596" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1065,29 +1066,7 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/http/base_plugin.dart" />
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="45" column="37" lean-forward="true" selection-start-line="45" selection-start-column="37" selection-end-line="45" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/util_test.dart" />
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1320">
-          <caret line="95" column="61" lean-forward="false" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="28" column="62" lean-forward="false" selection-start-line="28" selection-start-column="62" selection-end-line="28" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
@@ -1163,16 +1142,6 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
     <entry file="file://$PROJECT_DIR$/test/pattern_matcher_test.dart" />
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="15">
-            <caret line="1" column="70" lean-forward="false" selection-start-line="1" selection-start-column="70" selection-end-line="1" selection-end-column="70" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -1198,7 +1167,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2055">
           <caret line="139" column="64" lean-forward="false" selection-start-line="139" selection-start-column="64" selection-end-line="139" selection-end-column="64" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1287,20 +1255,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="78" lean-forward="true" selection-start-line="25" selection-start-column="78" selection-end-line="25" selection-end-column="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib/src/middleware_pipeline.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="20" lean-forward="true" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib/src/middleware_pipeline.dart" />
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/map.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
@@ -1322,18 +1277,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="23" lean-forward="false" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
           <caret line="16" column="10" lean-forward="true" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1341,26 +1288,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="107">
           <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="150">
-            <caret line="10" column="8" lean-forward="false" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
-            <folding />
-          </first_editor>
-          <second_editor />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
+        <state relative-caret-position="5205">
           <caret line="355" column="28" lean-forward="false" selection-start-line="355" selection-start-column="28" selection-end-line="355" selection-end-column="28" />
           <folding />
         </state>
@@ -1370,64 +1303,126 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="29" lean-forward="true" selection-start-line="0" selection-start-column="29" selection-end-line="0" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="690">
+          <caret line="54" column="36" lean-forward="false" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-590">
-          <caret line="105" column="17" lean-forward="false" selection-start-line="105" selection-start-column="17" selection-end-line="105" selection-end-column="17" />
-          <folding />
+        <state relative-caret-position="131">
+          <caret line="103" column="28" lean-forward="false" selection-start-line="103" selection-start-column="28" selection-end-line="103" selection-end-column="28" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="225">
+            <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="84" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="430" column="33" lean-forward="true" selection-start-line="430" selection-start-column="33" selection-end-line="430" selection-end-column="33" />
+        <state relative-caret-position="9900">
+          <caret line="677" column="5" lean-forward="false" selection-start-line="677" selection-start-column="5" selection-end-line="677" selection-end-column="5" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="180" column="28" lean-forward="false" selection-start-line="180" selection-start-column="28" selection-end-line="180" selection-end-column="28" />
+        <state relative-caret-position="1110">
+          <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
-          <folding>
-            <element signature="e#75#92#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="37" column="0" lean-forward="true" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="180">
+          <caret line="30" column="76" lean-forward="false" selection-start-line="30" selection-start-column="76" selection-end-line="30" selection-end-column="76" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="311">
-          <caret line="32" column="10" lean-forward="false" selection-start-line="32" selection-start-column="10" selection-end-line="32" selection-end-column="10" />
+        <state relative-caret-position="1125">
+          <caret line="78" column="30" lean-forward="false" selection-start-line="78" selection-start-column="30" selection-end-line="78" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+            <marker date="1509213215000" expanded="true" signature="664:857" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="23" column="35" lean-forward="false" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
+          <folding>
+            <element signature="e#75#95#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="245">
+          <caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="21" column="40" lean-forward="true" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="15">
+            <caret line="1" column="63" lean-forward="false" selection-start-line="1" selection-start-column="63" selection-end-line="1" selection-end-column="63" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8acd86f..dfad1d05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.1.0-alpha+8
+* Added an `autoIdAndDateFields` flag to `MapService`. Finally.
+
+# 1.1.0-alpha+7
+* Made `handlerCache` public.
+* Added `AngelMetrics`.
+
 # 1.1.0-alpha+6
 * Added `@Parameter()` annotations, with support for pattern matching.
 
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index 8e539f5e..be6e2f26 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -12,9 +12,16 @@ class MapService extends Service {
   /// If set to `true`, parameters in `req.query` are applied to the database query.
   final bool allowQuery;
 
+  /// If set to `true` (default), then the service will manage an `id` string and `createdAt` and `updatedAt` fields.
+  final bool autoIdAndDateFields;
+
   final List<Map<String, dynamic>> items = [];
 
-  MapService({this.allowRemoveAll: false, this.allowQuery: true}) : super();
+  MapService(
+      {this.allowRemoveAll: false,
+      this.allowQuery: true,
+      this.autoIdAndDateFields: true})
+      : super();
 
   _matchesId(id) {
     return (Map item) => item['id'] != null && item['id'] == id?.toString();
@@ -53,10 +60,14 @@ class MapService extends Service {
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
     var now = new DateTime.now();
-    var result = data
-      ..['id'] = items.length.toString()
-      ..['createdAt'] = now
-      ..['updatedAt'] = now;
+    var result = data;
+
+    if (autoIdAndDateFields == true) {
+      result
+        ..['id'] = items.length.toString()
+        ..['createdAt'] = now
+        ..['updatedAt'] = now;
+    }
     items.add(result);
     return result;
   }
@@ -70,9 +81,10 @@ class MapService extends Service {
     if (!items.any(_matchesId(id))) return await create(data, params);
 
     var item = await read(id);
-    return item
-      ..addAll(data)
-      ..['updatedAt'] = new DateTime.now();
+    var result = item..addAll(data);
+
+    if (autoIdAndDateFields == true) result..['updatedAt'] = new DateTime.now();
+    return result;
   }
 
   @override
@@ -89,10 +101,13 @@ class MapService extends Service {
       throw new AngelHttpException.notFound(
           message: 'No record found for ID $id');
 
-    var result = data
-      ..['id'] = id?.toString()
-      ..['createdAt'] = old['createdAt']
-      ..['updatedAt'] = new DateTime.now();
+    var result = data;
+    if (autoIdAndDateFields == true) {
+      result
+        ..['id'] = id?.toString()
+        ..['createdAt'] = old['createdAt']
+        ..['updatedAt'] = new DateTime.now();
+    }
     items.add(result);
     return result;
   }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 30489a89..75975441 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -30,7 +30,7 @@ typedef Future AngelConfigurer(Angel app);
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
   final List<Angel> _children = [];
-  final Map<String, Tuple3<List, Map, Match>> _handlerCache = {};
+  final Map<String, Tuple3<List, Map, Match>> handlerCache = {};
 
   Router _flattened;
   bool _isProduction = false;
@@ -215,7 +215,7 @@ class Angel extends AngelBase {
 
     await super.close();
     _preContained.clear();
-    _handlerCache.clear();
+    handlerCache.clear();
     _injections.clear();
     encoders.clear();
     _serializer = god.serialize;
@@ -417,7 +417,7 @@ class Angel extends AngelBase {
       }
 
       var tuple = isProduction
-          ? _handlerCache.putIfAbsent(
+          ? handlerCache.putIfAbsent(
               '${req.method}:$requestedUrl', resolveTuple)
           : resolveTuple();
 
@@ -696,4 +696,4 @@ class Angel extends AngelBase {
 
     return new Angel.fromSecurityContext(serverContext);
   }
-}
+}
\ No newline at end of file
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
index 69b7f472..0af63505 100644
--- a/lib/src/stats/metric_server.dart
+++ b/lib/src/stats/metric_server.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'package:logging/logging.dart';
 import '../http/http.dart';
 import 'stats.dart';
 
@@ -16,42 +15,51 @@ class AngelMetrics extends Angel {
       var spec = await zoneBuilder(request, req, res);
       return new ZoneSpecification.from(
         spec,
-        run: (Zone self, ZoneDelegate parent, Zone zone, f()) {
-          var sw = new Stopwatch();
-          //print('--- ${req.method} ${req.uri}: $f');
-          sw.start();
-
-          void whenDone() {
-            sw.stop();
-            var ms = sw.elapsedMilliseconds;
-            parent.print(
-                zone, '--- ${req.method} ${req.uri} DONE after ${ms}ms: $f');
-          }
-
-          var r = parent.run(zone, f);
-
-          if (r is Future) {
-            return r.then((x) {
-              whenDone();
-              return x;
-            });
-          }
-
-          whenDone();
-          return r;
-        },
       );
     };
 
-    logger = new Logger('angel_metrics')
-      ..onRecord.listen((rec) {
-        print(rec);
+    get('/metrics', (req, res) {
+      res.contentType = ContentType.HTML;
 
-        if (rec.error != null) {
-          print(rec.error);
-          print(rec.stackTrace);
-        }
-      });
+      var rows = stats.all.map((stat) {
+        return '''<tr>
+              <td>${stat.name}</td>
+              <td>${stat.iterations}</td>
+              <td>${stat.sum}ms</td>
+              <td>${stat.average.toStringAsFixed(2)}ms</td>
+            </tr>''';
+      }).join();
+
+      res.write('''
+        <!DOCTYPE html>
+        <html>
+          <head>
+            <meta name="viewport" content="width=device-width, initial-scale=1">
+            <title>Metrics</title>
+          </head>
+          <body>
+            <h1>Metrics</h1>
+            <i>Updated every 5 seconds</i>
+            <table>
+              <thead>
+                <tr>
+                  <th>Stat</th>
+                  <th># Iterations</th>
+                  <th>Total (ms)</th>
+                  <th>Average (ms)</th>
+                </tr>
+              </thead>
+              <tbody>$rows</tbody>
+            </table>
+            <script>
+              window.setTimeout(function() {
+                window.location.reload();
+              }, 5000);
+            </script>
+          </body>
+        </html>
+        ''');
+    });
   }
 
   factory AngelMetrics.custom(ServerGenerator serverGenerator) {
@@ -101,7 +109,9 @@ class AngelMetrics extends Angel {
 
   @override
   Future handleRequest(HttpRequest request) {
-    return stats.handleRequest.run(() => super.handleRequest(request));
+    return stats.handleRequest.run(() async {
+      await super.handleRequest(request);
+    });
   }
 
   @override
@@ -136,6 +146,11 @@ class AngelMetricsStats {
     all = [
       createRequestContext,
       createResponseContext,
+      executeHandler,
+      getHandlerResult,
+      runContained,
+      sendResponse,
+      handleRequest,
     ];
   }
 
@@ -149,6 +164,10 @@ class AngelMetricsStats {
 
   List<Stats> all;
 
+  void add(Stats stats) {
+    all.add(stats);
+  }
+
   void log() {
     all.forEach((s) => s.log());
   }
diff --git a/lib/src/stats/stats.dart b/lib/src/stats/stats.dart
index c13125cd..0d7730bb 100644
--- a/lib/src/stats/stats.dart
+++ b/lib/src/stats/stats.dart
@@ -12,6 +12,10 @@ class Stats {
 
   double get average => _average ?? (_total / _count);
 
+  int get iterations => _count;
+
+  int get sum => _total;
+
   void log() {
     print('$name: $average avg.');
   }
@@ -31,7 +35,7 @@ class Stats {
       sw.stop();
       var ms = sw.elapsedMilliseconds;
       add(ms);
-      print('--- $name DONE after ${ms}ms');
+      //print('--- $name DONE after ${ms}ms');
     }
 
     var r = f();
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index e8d8bff4..33e6ba40 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -1,13 +1,14 @@
 /// A basic server that prints "Hello, world!"
 library performance.hello;
 
+import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/metrics.dart';
 
 main() {
-  for (int i = 0; i < Platform.numberOfProcessors - 1; i++) {
+  for (int i = 0; i < Platform.numberOfProcessors; i++) {
     Isolate.spawn(start, i + 1);
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 13c0d258..f7a3c714 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+6
+version: 1.1.0-alpha+7
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/controller_test.dart b/test/controller_test.dart
index e8cace1a..e24a81fd 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -43,8 +43,14 @@ main() {
 
   setUp(() async {
     app = new Angel();
-    app.requestMiddleware["foo"] = (req, res) async => res.write("Hello, ");
-    app.requestMiddleware["bar"] = (req, res) async => res.write("world!");
+    app.requestMiddleware["foo"] = (req, res) async {
+      res.write("Hello, ");
+      return true;
+    };
+    app.requestMiddleware["bar"] = (req, res) async {
+      res.write("world!");
+      return true;
+    };
     app.get(
         "/redirect",
         (req, ResponseContext res) async =>
@@ -102,7 +108,7 @@ main() {
     var response = await client.get("$url/todos/0");
     print('Response: ${response.body}');
 
-    expect(rgx.firstMatch(response.body).start, equals(0));
+    expect(rgx.firstMatch(response.body)?.start, equals(0));
 
     Map todo = JSON.decode(response.body.replaceAll(rgx, ""));
     print("Todo: $todo");
diff --git a/test/di_test.dart b/test/di_test.dart
index 179e890f..56c0d469 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -78,8 +78,7 @@ class SingletonController extends Controller {
 @Expose("/errands4")
 class ErrandController extends Controller {
   @Expose("/")
-  errand(Errand errand, MiddlewarePipeline pipeline) {
-    expect(pipeline, isNotNull);
+  errand(Errand errand) {
     return errand.text;
   }
 }

From 2c846ae4495fb73b79723ce779d759c21fec5a69 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 18 Nov 2017 12:43:10 -0500
Subject: [PATCH 162/414] +8

---
 .idea/workspace.xml | 64 ++++++++++++++++++++++-----------------------
 pubspec.yaml        |  2 +-
 2 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cf8b969f..5a6d97d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" afterPath="$PROJECT_DIR$/lib/src/stats/stats.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -47,11 +38,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="15">
+              <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
               <folding />
             </state>
           </provider>
@@ -101,7 +92,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
@@ -277,10 +268,10 @@
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -291,8 +282,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="270" />
-    <option name="y" value="64" />
+    <option name="x" value="88" />
+    <option name="y" value="23" />
     <option name="width" value="1278" />
     <option name="height" value="797" />
   </component>
@@ -666,7 +657,7 @@
       <workItem from="1507775636910" duration="962000" />
       <workItem from="1508004276122" duration="3000" />
       <workItem from="1509177543314" duration="8319000" />
-      <workItem from="1511026448813" duration="486000" />
+      <workItem from="1511026448813" duration="536000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -941,7 +932,14 @@
       <option name="project" value="LOCAL" />
       <updated>1507654580167</updated>
     </task>
-    <option name="localTasksCounter" value="40" />
+    <task id="LOCAL-00040" summary="autoIdAndDateFields in MapService">
+      <created>1511026951368</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1511026951368</updated>
+    </task>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -977,7 +975,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="94926000" />
+    <option name="totallyTimeSpent" value="94976000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -989,13 +987,12 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="270" y="64" width="1278" height="797" extended-state="0" />
-    <editor active="true" />
+    <frame x="88" y="23" width="1278" height="797" extended-state="0" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1003,7 +1000,7 @@
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3133903" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6196581" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1034,7 +1031,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="+1" />
     <MESSAGE value="1.0.4" />
     <MESSAGE value="Patch" />
     <MESSAGE value="Added more tests." />
@@ -1059,7 +1055,8 @@
     <MESSAGE value="+3" />
     <MESSAGE value="+4" />
     <MESSAGE value="+6" />
-    <option name="LAST_COMMIT_MESSAGE" value="+6" />
+    <MESSAGE value="autoIdAndDateFields in MapService" />
+    <option name="LAST_COMMIT_MESSAGE" value="autoIdAndDateFields in MapService" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1336,6 +1333,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1386,14 +1384,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
@@ -1423,6 +1413,14 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/pubspec.yaml b/pubspec.yaml
index f7a3c714..c56a9bb7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+7
+version: 1.1.0-alpha+8
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 2d87631e8d75de186f671d11d6cd01c02f944558 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 28 Nov 2017 13:14:50 -0500
Subject: [PATCH 163/414] +9

---
 .idea/libraries/Dart_Packages.xml             |  28 +-
 ...h_matching_method_in_routing_test_dart.xml |  11 +
 .../runConfigurations/tests_in_framework.xml  |   8 +
 .idea/workspace.xml                           | 943 ++++++++++--------
 CHANGELOG.md                                  |  12 +
 lib/src/http/request_context.dart             |  24 +-
 lib/src/http/response_context.dart            |  42 +-
 lib/src/http/routable.dart                    |   1 +
 lib/src/http/server.dart                      | 217 ++--
 lib/src/http/service.dart                     |   5 +
 lib/src/stats/metric_server.dart              |  12 +-
 lib/src/util.dart                             |   2 +
 performance/hello/main.dart                   |  33 +-
 pubspec.yaml                                  |   6 +-
 test/accepts_test.dart                        |   6 +
 test/all.dart                                 |   2 +
 test/di_test.dart                             |   1 -
 test/extension_test.dart                      |  29 +
 test/routing_test.dart                        |  12 +-
 19 files changed, 808 insertions(+), 586 deletions(-)
 create mode 100644 .idea/runConfigurations/only_match_route_with_matching_method_in_routing_test_dart.xml
 create mode 100644 .idea/runConfigurations/tests_in_framework.xml
 create mode 100644 test/extension_test.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index c7ee0131..f73ff04c 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -26,14 +26,14 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.8/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.1.0/lib" />
             </list>
           </value>
         </entry>
@@ -86,6 +86,13 @@
             </list>
           </value>
         </entry>
+        <entry key="combinator">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="container">
           <value>
             <list>
@@ -114,13 +121,6 @@
             </list>
           </value>
         </entry>
-        <entry key="flatten">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="front_end">
           <value>
             <list>
@@ -271,7 +271,7 @@
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
             </list>
           </value>
         </entry>
@@ -442,8 +442,8 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.8/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+13/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib" />
@@ -451,11 +451,11 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/flatten-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
@@ -477,7 +477,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
diff --git a/.idea/runConfigurations/only_match_route_with_matching_method_in_routing_test_dart.xml b/.idea/runConfigurations/only_match_route_with_matching_method_in_routing_test_dart.xml
new file mode 100644
index 00000000..f030feb7
--- /dev/null
+++ b/.idea/runConfigurations/only_match_route_with_matching_method_in_routing_test_dart.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="only match route with matching method in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="envs">
+      <entry key="ANGEL_ENV" value="production" />
+    </option>
+    <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="only match route with matching method" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/tests_in_framework.xml b/.idea/runConfigurations/tests_in_framework.xml
new file mode 100644
index 00000000..4278d0e6
--- /dev/null
+++ b/.idea/runConfigurations/tests_in_framework.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tests in framework" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$" />
+    <option name="scope" value="FOLDER" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5a6d97d1..1a80a1ac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,25 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/only_match_route_with_matching_method_in_routing_test_dart.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/tests_in_framework.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/extension_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/util.dart" afterPath="$PROJECT_DIR$/lib/src/util.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/accepts_test.dart" afterPath="$PROJECT_DIR$/test/accepts_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,36 +43,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="23" column="35" lean-forward="false" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
-              <folding>
-                <element signature="e#75#95#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="15">
-              <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+              <caret line="1" column="22" lean-forward="true" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="245">
-              <caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="168">
+              <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -63,8 +66,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="9900">
-              <caret line="677" column="5" lean-forward="false" selection-start-line="677" selection-start-column="5" selection-end-line="677" selection-end-column="5" />
+            <state relative-caret-position="53">
+              <caret line="392" column="20" lean-forward="false" selection-start-line="392" selection-start-column="20" selection-end-line="392" selection-end-column="20" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -72,32 +75,12 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1110">
-              <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="21" column="40" lean-forward="true" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="15">
-                <caret line="1" column="63" lean-forward="false" selection-start-line="1" selection-start-column="63" selection-end-line="1" selection-end-column="63" />
+              <first_editor relative-caret-position="135">
+                <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -105,37 +88,67 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="690">
-              <caret line="54" column="36" lean-forward="false" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
+            <state relative-caret-position="-261">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1980">
+              <caret line="137" column="62" lean-forward="true" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="225">
-                <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="84" />
-                <folding />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="router.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="132">
+              <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1125">
-              <caret line="78" column="30" lean-forward="false" selection-start-line="78" selection-start-column="30" selection-end-line="78" selection-end-column="30" />
+            <state relative-caret-position="2095">
+              <caret line="195" column="25" lean-forward="false" selection-start-line="195" selection-start-column="25" selection-end-line="195" selection-end-column="25" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="extension_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="225">
+              <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
-                <marker date="1509213215000" expanded="true" signature="664:857" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/all.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="364">
+              <caret line="30" column="37" lean-forward="false" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" />
+              <folding>
+                <element signature="e#0#38#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -152,36 +165,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>query</find>
-      <find>value == n</find>
-      <find>handleCont</find>
-      <find>streamcontroller</find>
-      <find>from(</find>
-      <find>gua</find>
-      <find>_buf</find>
-      <find>sendRes</find>
-      <find>Stopwatc</find>
-      <find>toByt</find>
-      <find>toBy</find>
-      <find>listen</find>
-      <find>this.</find>
-      <find>close()</find>
-      <find>dispose</find>
-      <find>beforeAllStream</find>
-      <find>handleRequest</find>
-      <find>catchError</find>
-      <find>dispose(</find>
-      <find>putIf</find>
-      <find>putif</find>
-      <find>ANGEL_E</find>
-      <find>custom(</find>
-      <find>_sub?.c</find>
-      <find>pipe</find>
-      <find>pipeline</find>
-      <find>&lt;BR&gt;</find>
-      <find>extend(</find>
       <find>handleReq</find>
       <find>STARTS</find>
+      <find>list</find>
+      <find>sendRes</find>
+      <find>handleRequ</find>
+      <find>sendRespon</find>
+      <find>inject(</find>
+      <find>sendRe</find>
+      <find>sendResponse</find>
+      <find>addStream</find>
+      <find>Lo</find>
+      <find>useStr</find>
+      <find>_injections?</find>
+      <find>createRes</find>
+      <find>requestedUrl</find>
+      <find>cacheK</find>
+      <find>resolveAl</find>
+      <find>path</find>
+      <find>handleRequest</find>
+      <find>flatten</find>
+      <find>pipeline</find>
+      <find>pat</find>
+      <find>createR</find>
+      <find>print</find>
+      <find>dispos</find>
+      <find>handleRe</find>
+      <find>xhr</find>
+      <find>accepts</find>
+      <find>cacheKey</find>
+      <find>testing</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -200,14 +213,16 @@
       <replace>JSON.decode</replace>
       <replace>query</replace>
       <replace>cookie</replace>
+      <replace>req.path</replace>
+      <replace>req.path`</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
-      <dir>$PROJECT_DIR$/test</dir>
       <dir>$PROJECT_DIR$/lib</dir>
+      <dir>$PROJECT_DIR$/test</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -221,9 +236,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/common.dart" />
-        <option value="$PROJECT_DIR$/analysis_options.yaml" />
-        <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
@@ -238,15 +250,12 @@
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
@@ -254,24 +263,30 @@
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/metrics.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/util.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
+        <option value="$PROJECT_DIR$/test/extension_test.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -282,10 +297,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="88" />
-    <option name="y" value="23" />
+    <option name="x" value="46" />
+    <option name="y" value="27" />
     <option name="width" value="1278" />
-    <option name="height" value="797" />
+    <option name="height" value="799" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -305,9 +320,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scratches" />
       <pane id="ProjectPane" />
-      <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -333,11 +348,16 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="http" type="cbb8eebc:String" user="http" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="test" type="cbb8eebc:String" user="test" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -357,6 +377,7 @@
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
+    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/thosakwe/Source/Dart/framework/lib/src/http/request_context.dart" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -376,7 +397,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -497,6 +518,12 @@
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="default view generator" />
     </configuration>
+    <configuration name="global injection added to injection map in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="global injection added to injection map" />
+      <option name="testRunnerOptions" value="-j 4" />
+    </configuration>
     <configuration name="injects header or throws in parameter_meta_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -507,11 +534,6 @@
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="middleware" />
     </configuration>
-    <configuration name="only match route with matching method in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
-      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
-      <option name="testName" value="only match route with matching method" />
-    </configuration>
     <configuration name="only uses one encoder in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -533,6 +555,10 @@
       <option name="filePath" value="$PROJECT_DIR$/test/exception_test.dart" />
       <option name="testName" value="exception_test.dart" />
     </configuration>
+    <configuration name="tests in extension_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/extension_test.dart" />
+      <option name="testName" value="extension_test.dart" />
+    </configuration>
     <configuration name="tests in parameter_meta_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
       <option name="testName" value="parameter_meta_test.dart" />
@@ -561,44 +587,52 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="36">
-      <item index="0" class="java.lang.String" itemvalue="Dart Test.middleware in controller_test.dart" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="29" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="30" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="31" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="32" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="33" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="34" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="35" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+    <list size="39">
+      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
+      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
+      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in extension_test.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.middleware in controller_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="28" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="29" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="30" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="31" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="32" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="33" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="34" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="35" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="36" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="37" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+      <item index="38" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
     </list>
+    <recent_temporary>
+      <list size="1">
+        <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
@@ -657,7 +691,13 @@
       <workItem from="1507775636910" duration="962000" />
       <workItem from="1508004276122" duration="3000" />
       <workItem from="1509177543314" duration="8319000" />
-      <workItem from="1511026448813" duration="536000" />
+      <workItem from="1511026448813" duration="1268000" />
+      <workItem from="1511549258198" duration="9423000" />
+      <workItem from="1511567573554" duration="731000" />
+      <workItem from="1511569587672" duration="606000" />
+      <workItem from="1511642216372" duration="531000" />
+      <workItem from="1511674447575" duration="576000" />
+      <workItem from="1511749291765" duration="5830000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -939,43 +979,50 @@
       <option name="project" value="LOCAL" />
       <updated>1511026951368</updated>
     </task>
-    <option name="localTasksCounter" value="41" />
+    <task id="LOCAL-00041" summary="+8">
+      <created>1511026990202</created>
+      <option name="number" value="00041" />
+      <option name="presentableId" value="LOCAL-00041" />
+      <option name="project" value="LOCAL" />
+      <updated>1511026990202</updated>
+    </task>
+    <option name="localTasksCounter" value="42" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.11.18 at 12h 37m 43s.xml">
+    <history-entry file="All_Tests - 2017.11.28 at 13h 08m 16s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.11.18 at 12h 38m 02s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 04m 45s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.11.18 at 12h 40m 26s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 08m 04s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2017.11.18 at 12h 40m 14s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 08m 27s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="middleware_in_controller_test_dart - 2017.11.18 at 12h 39m 15s.xml">
-      <configuration name="middleware in controller_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 22s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="middleware_in_controller_test_dart - 2017.11.18 at 12h 40m 04s.xml">
-      <configuration name="middleware in controller_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 52s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 40s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 05m 10s.xml">
+      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 50m 57s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 05m 25s.xml">
+      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="pattern_matching_in_parameter_meta_test_dart - 2017.10.10 at 12h 52m 21s.xml">
-      <configuration name="pattern matching in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 06m 00s.xml">
+      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_parameter_meta_test_dart - 2017.10.10 at 12h 45m 38s.xml">
-      <configuration name="tests in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 07m 52s.xml">
+      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="94976000" />
+    <option name="totallyTimeSpent" value="113405000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -987,32 +1034,33 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="88" y="23" width="1278" height="797" extended-state="0" />
+    <frame x="46" y="27" width="1278" height="799" extended-state="0" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32478634" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3133903" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6196581" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3125" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23624596" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32386363" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4005682" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48011363" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2394822" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1021,7 +1069,6 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1031,7 +1078,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.0.4" />
     <MESSAGE value="Patch" />
     <MESSAGE value="Added more tests." />
     <MESSAGE value="Still adding more tests, fixed exception-handling bug." />
@@ -1056,131 +1102,14 @@
     <MESSAGE value="+4" />
     <MESSAGE value="+6" />
     <MESSAGE value="autoIdAndDateFields in MapService" />
-    <option name="LAST_COMMIT_MESSAGE" value="autoIdAndDateFields in MapService" />
+    <MESSAGE value="+8" />
+    <option name="LAST_COMMIT_MESSAGE" value="+8" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/util_test.dart" />
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="11" column="8" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.5/lib/src/middleware_pipeline.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="11" lean-forward="false" selection-start-line="8" selection-start-column="11" selection-end-line="8" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1404">
-          <caret line="105" column="18" lean-forward="true" selection-start-line="105" selection-start-column="18" selection-end-line="105" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="285">
-            <caret line="19" column="6" lean-forward="false" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="24" lean-forward="false" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="15" column="21" lean-forward="false" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1470">
-          <caret line="100" column="8" lean-forward="false" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1095">
-          <caret line="73" column="28" lean-forward="false" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
-    <entry file="file://$PROJECT_DIR$/test/pattern_matcher_test.dart" />
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="31" column="23" lean-forward="false" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="26" column="0" lean-forward="true" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/string_buffer.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/bytes_builder.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2055">
-          <caret line="139" column="64" lean-forward="false" selection-start-line="139" selection-start-column="64" selection-end-line="139" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/timeline.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="311">
-          <caret line="96" column="65" lean-forward="false" selection-start-line="96" selection-start-column="65" selection-end-line="96" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" column="71" lean-forward="true" selection-start-line="8" selection-start-column="71" selection-end-line="8" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/profiler.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1404">
@@ -1209,13 +1138,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="243">
@@ -1223,14 +1145,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/schedule_microtask.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="242">
@@ -1238,28 +1152,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/isolate/isolate.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="80" column="4" lean-forward="true" selection-start-line="80" selection-start-column="4" selection-end-line="80" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="343" column="3" lean-forward="true" selection-start-line="343" selection-start-column="3" selection-end-line="343" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib/src/middleware_pipeline.dart" />
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/map.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="193" column="4" lean-forward="false" selection-start-line="193" selection-start-column="4" selection-end-line="193" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib/src/tuple.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="131">
@@ -1274,13 +1167,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="16" column="10" lean-forward="true" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="107">
@@ -1288,36 +1174,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5205">
-          <caret line="355" column="28" lean-forward="false" selection-start-line="355" selection-start-column="28" selection-end-line="355" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/metrics.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="29" lean-forward="true" selection-start-line="0" selection-start-column="29" selection-end-line="0" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
-          <caret line="54" column="36" lean-forward="false" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="103" column="28" lean-forward="false" selection-start-line="103" selection-start-column="28" selection-end-line="103" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1333,71 +1189,312 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="211">
+          <caret line="78" column="18" lean-forward="true" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/metrics.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/isolate/isolate.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="315" column="38" lean-forward="true" selection-start-line="315" selection-start-column="38" selection-end-line="315" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="152" column="66" lean-forward="true" selection-start-line="152" selection-start-column="66" selection-end-line="152" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib/pool.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="258" column="13" lean-forward="true" selection-start-line="258" selection-start-column="13" selection-end-line="258" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="25" column="66" lean-forward="true" selection-start-line="25" selection-start-column="66" selection-end-line="25" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.1/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="267" column="7" lean-forward="false" selection-start-line="267" selection-start-column="7" selection-end-line="267" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="113" column="27" lean-forward="true" selection-start-line="113" selection-start-column="27" selection-end-line="113" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="210">
+            <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
+            <folding>
+              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="54" lean-forward="false" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="36" column="4" lean-forward="false" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/pattern.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="73" column="15" lean-forward="false" selection-start-line="73" selection-start-column="15" selection-end-line="73" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="26" column="50" lean-forward="false" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="85" column="32" lean-forward="false" selection-start-line="85" selection-start-column="32" selection-end-line="85" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="392">
+          <caret line="493" column="16" lean-forward="false" selection-start-line="493" selection-start-column="16" selection-end-line="493" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="85" column="23" lean-forward="false" selection-start-line="85" selection-start-column="23" selection-end-line="85" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/map.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2658">
+          <caret line="193" column="4" lean-forward="false" selection-start-line="193" selection-start-column="4" selection-end-line="193" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="233">
+          <caret line="399" column="63" lean-forward="true" selection-start-line="399" selection-start-column="63" selection-end-line="399" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="26">
+          <caret line="142" column="9" lean-forward="false" selection-start-line="142" selection-start-column="9" selection-end-line="142" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-254">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="158">
+          <caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
+          <folding>
+            <element signature="e#75#95#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="249" column="30" lean-forward="true" selection-start-line="249" selection-start-column="30" selection-end-line="249" selection-end-column="30" />
+          <folding>
+            <element signature="e#47#67#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="32" lean-forward="false" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="33" lean-forward="true" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="30" column="37" lean-forward="false" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2095">
+          <caret line="195" column="25" lean-forward="false" selection-start-line="195" selection-start-column="25" selection-end-line="195" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="9900">
-          <caret line="677" column="5" lean-forward="false" selection-start-line="677" selection-start-column="5" selection-end-line="677" selection-end-column="5" />
+        <state relative-caret-position="53">
+          <caret line="392" column="20" lean-forward="false" selection-start-line="392" selection-start-column="20" selection-end-line="392" selection-end-column="20" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1110">
-          <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
+        <state relative-caret-position="132">
+          <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="30" column="76" lean-forward="false" selection-start-line="30" selection-start-column="76" selection-end-line="30" selection-end-column="76" />
+        <state relative-caret-position="168">
+          <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1125">
-          <caret line="78" column="30" lean-forward="false" selection-start-line="78" selection-start-column="30" selection-end-line="78" selection-end-column="30" />
+        <state relative-caret-position="-261">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
-            <marker date="1509213215000" expanded="true" signature="664:857" ph="..." />
+            <element signature="e#0#22#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="35" lean-forward="false" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
-          <folding>
-            <element signature="e#75#95#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="1980">
+          <caret line="137" column="62" lean-forward="true" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="21" column="40" lean-forward="true" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
+        <state relative-caret-position="15">
+          <caret line="1" column="22" lean-forward="true" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
           <folding />
         </state>
       </provider>
@@ -1405,22 +1502,14 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="15">
-            <caret line="1" column="63" lean-forward="false" selection-start-line="1" selection-start-column="63" selection-end-line="1" selection-end-column="63" />
+          <first_editor relative-caret-position="135">
+            <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfad1d05..df66e68c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 1.1.0-alpha+9
+* Fixed a bug that prevented `isProduction` from ever returning `true`.
+    * This enabled caching, which greatly improved performance.
+* Requests no longer have independent zones, which greatly improved performance.
+* `FormatException`, when caught, is automatically transformed in a `400` error response.
+* Added `extension` to `RequestContext`.
+* Added `strict` to `RequestContext#accepts`.
+* Added a `toString` override for the `Providers` class.
+* Returned to `RegExp` for stripping stray slashes.
+* The request path is now only parsed once.
+* Optimized the parsing of the `ACCEPT_ENCODING` header.
+
 # 1.1.0-alpha+8
 * Added an `autoIdAndDateFields` flag to `MapService`. Finally.
 
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 1ea30dc9..730076bd 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -4,7 +4,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:mirrors';
 import 'package:body_parser/body_parser.dart';
-import 'package:charcode/charcode.dart';
+import 'package:path/path.dart' as p;
 import 'metadata.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -13,7 +13,7 @@ part 'injection.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
 class RequestContext {
-  String _acceptHeaderCache;
+  String _acceptHeaderCache, _extensionCache;
   bool _acceptsAllCache;
   BodyParseResult _body;
   ContentType _contentType;
@@ -39,9 +39,10 @@ class RequestContext {
   String get hostname => io.headers.value(HttpHeaders.HOST);
 
   final Map _injections = {};
+  Map _injectionsCache;
 
   /// A [Map] of singletons injected via [inject]. *Read-only*.
-  Map get injections => new Map.unmodifiable(_injections);
+  Map get injections => _injectionsCache ??= new Map.unmodifiable(_injections);
 
   /// The underlying [HttpRequest] instance underneath this context.
   HttpRequest get io => _io;
@@ -135,8 +136,13 @@ class RequestContext {
       io.headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
       'xmlhttprequest';
 
+  /// Returns the file extension of the requested path, if any.
+  ///
+  /// Includes the leading `.`, if there is one.
+  String get extension => _extensionCache ??= p.extension(uri.path);
+
   /// Magically transforms an [HttpRequest] into a [RequestContext].
-  static Future<RequestContext> from(HttpRequest request, Angel app) async {
+  static Future<RequestContext> from(HttpRequest request, Angel app, String path) async {
     RequestContext ctx = new RequestContext();
 
     String override = request.method;
@@ -150,6 +156,7 @@ class RequestContext {
     ctx._contentType = request.headers.contentType;
     ctx._override = override;
 
+    /*
     // Faster way to get path
     List<int> _path = [];
 
@@ -175,6 +182,9 @@ class RequestContext {
       ctx._path = new String.fromCharCodes(_path.take(lastSlash));
     else
       ctx._path = new String.fromCharCodes(_path);
+      */
+
+    ctx._path = path;
     ctx._io = request;
 
     if (app.lazyParseBodies != true) {
@@ -219,17 +229,19 @@ class RequestContext {
     }
 
     _injections[type] = value;
+    _injectionsCache = null;
   }
 
   /// Returns `true` if the client's `Accept` header indicates that the given [contentType] is considered a valid response.
   ///
   /// You cannot provide a `null` [contentType].
   /// If the `Accept` header's value is `*/*`, this method will always return `true`.
+  /// To ignore the wildcard (`*/*`), pass [strict] as `true`.
   ///
   /// [contentType] can be either of the following:
   /// * A [ContentType], in which case the `Accept` header will be compared against its `mimeType` property.
   /// * Any other Dart value, in which case the `Accept` header will be compared against the result of a `toString()` call.
-  bool accepts(contentType) {
+  bool accepts(contentType, {bool strict: false}) {
     var contentTypeString = contentType is ContentType
         ? contentType.mimeType
         : contentType?.toString();
@@ -242,7 +254,7 @@ class RequestContext {
 
     if (_acceptHeaderCache == null)
       return false;
-    else if (_acceptHeaderCache.contains('*/*'))
+    else if (strict != true && _acceptHeaderCache.contains('*/*'))
       return true;
     else
       return _acceptHeaderCache.contains(contentTypeString);
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 0abe6747..d3f64103 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -6,6 +6,7 @@ import 'dart:io';
 import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
+import 'package:pool/pool.dart';
 import 'server.dart' show Angel;
 import 'controller.dart';
 import 'request_context.dart';
@@ -337,6 +338,31 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
       buffer.add(data);
   }
 
+  /// Configure the response to write directly to the output stream, instead of buffering.
+  bool useStream() {
+    if (!_useStream) {
+      // If this is the first stream added to this response,
+      // then add headers, status code, etc.
+      io
+        ..statusCode = statusCode
+        ..cookies.addAll(cookies);
+      headers.forEach(io.headers.set);
+      willCloseItself = _useStream = _isClosed = true;
+
+      if (_correspondingRequest?.injections?.containsKey(Stopwatch) == true) {
+        (_correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
+      }
+
+      if (_correspondingRequest?.injections?.containsKey(PoolResource) == true) {
+        (_correspondingRequest.injections[PoolResource] as PoolResource).release();
+      }
+
+      return true;
+    }
+
+    return false;
+  }
+
   /// Adds a stream directly the underlying dart:[io] response.
   ///
   /// This will also set [willCloseItself] to `true`, thus canceling out response finalizers.
@@ -346,24 +372,10 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   @override
   Future addStream(Stream<List<int>> stream) {
     if (_isClosed && !_useStream) throw _closed();
-    bool firstStream = _useStream == false;
-    willCloseItself = _useStream = _isClosed = true;
-
-    if (_correspondingRequest?.injections?.containsKey(Stopwatch) == true) {
-      (_correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
-    }
+    var firstStream = useStream();
 
     Stream<List<int>> output = stream;
 
-    if (firstStream) {
-      // If this is the first stream added to this response,
-      // then add headers, status code, etc.
-      io
-        ..statusCode = statusCode
-        ..cookies.addAll(cookies);
-      headers.forEach(io.headers.set);
-    }
-
     if (encoders.isNotEmpty && correspondingRequest != null) {
       var allowedEncodings =
           (correspondingRequest.headers[HttpHeaders.ACCEPT_ENCODING] ?? [])
diff --git a/lib/src/http/routable.dart b/lib/src/http/routable.dart
index 44a01c0b..1b46fd2a 100644
--- a/lib/src/http/routable.dart
+++ b/lib/src/http/routable.dart
@@ -64,6 +64,7 @@ class Routable extends Router {
   /// Assigns a middleware to a name for convenience.
   @override
   registerMiddleware(String name, @checked RequestHandler middleware) =>
+      // ignore: deprecated_member_use
       super.registerMiddleware(name, middleware);
 
   /// Retrieves the service assigned to the given path.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 75975441..54237e16 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -1,16 +1,17 @@
 library angel_framework.http.server;
 
 import 'dart:async';
+import 'dart:collection' show HashMap;
 import 'dart:convert';
 import 'dart:io';
 import 'package:angel_http_exception/angel_http_exception.dart';
-import 'package:angel_route/angel_route.dart' hide Extensible;
-import 'package:charcode/charcode.dart';
+import 'package:angel_route/angel_route.dart';
+import 'package:combinator/combinator.dart';
 export 'package:container/container.dart';
-import 'package:flatten/flatten.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
+import 'package:pool/pool.dart';
 import 'package:tuple/tuple.dart';
 import 'angel_base.dart';
 import 'controller.dart';
@@ -30,11 +31,13 @@ typedef Future AngelConfigurer(Angel app);
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
   final List<Angel> _children = [];
-  final Map<String, Tuple3<List, Map, Match>> handlerCache = {};
+  final Map<String, Tuple3<List, Map, ParseResult<Map<String, String>>>>
+      handlerCache = new HashMap();
 
   Router _flattened;
-  bool _isProduction = false;
+  bool _isProduction;
   Angel _parent;
+  Pool _pool;
   StreamSubscription<HttpRequest> _sub;
   ServerGenerator _serverGenerator = HttpServer.bind;
 
@@ -75,7 +78,8 @@ class Angel extends AngelBase {
   /// This value is memoized the first time you call it, so do not change environment
   /// configuration at runtime!
   bool get isProduction {
-    return _isProduction ??= (Platform.environment['ANGEL_ENV'] == 'production');
+    return _isProduction ??=
+        (Platform.environment['ANGEL_ENV'] == 'production');
   }
 
   /// The function used to bind this instance to an HTTP server.
@@ -237,7 +241,7 @@ class Angel extends AngelBase {
       String tab: '  ',
       bool showMatchers: false}) {
     if (isProduction) {
-      if (_flattened == null) _flattened = flatten(this);
+      _flattened ??= flatten(this);
 
       _flattened.dumpTree(
           callback: callback,
@@ -246,8 +250,7 @@ class Angel extends AngelBase {
               : (isProduction
                   ? 'Dumping flattened route tree:'
                   : 'Dumping route tree:'),
-          tab: tab ?? '  ',
-          showMatchers: showMatchers == true);
+          tab: tab ?? '  ');
     } else {
       super.dumpTree(
           callback: callback,
@@ -256,8 +259,7 @@ class Angel extends AngelBase {
               : (isProduction
                   ? 'Dumping flattened route tree:'
                   : 'Dumping route tree:'),
-          tab: tab ?? '  ',
-          showMatchers: showMatchers == true);
+          tab: tab ?? '  ');
     }
   }
 
@@ -308,7 +310,6 @@ class Angel extends AngelBase {
   /// Runs some [handler]. Returns `true` if request execution should continue.
   Future<bool> executeHandler(
       handler, RequestContext req, ResponseContext res) async {
-    if (handler == null) return false;
     var result = await getHandlerResult(handler, req, res);
 
     if (result == null)
@@ -325,8 +326,11 @@ class Angel extends AngelBase {
   }
 
   Future<RequestContext> createRequestContext(HttpRequest request) {
-    return RequestContext.from(request, this).then((req) {
-      _injections.forEach(req.inject);
+    var path = request.uri.path.replaceAll(_straySlashes, '');
+    if (path.length == 0) path = '/';
+    return RequestContext.from(request, this, path).then((req) async {
+      if (_pool != null) req.inject(PoolResource, await _pool.request());
+      if (_injections.isNotEmpty) _injections.forEach(req.inject);
       return req;
     });
   }
@@ -378,53 +382,32 @@ class Angel extends AngelBase {
   Future handleRequest(HttpRequest request) async {
     var req = await createRequestContext(request);
     var res = await createResponseContext(request.response, req);
-    var zoneSpec = await createZoneForRequest(request, req, res);
-    var zone = Zone.current.fork(specification: zoneSpec);
 
-    return zone.runGuarded(() async {
-      String requestedUrl;
+    try {
+      var path = req.path;
+      if (path == '/') path = '';
 
-      // Faster way to get path
-      List<int> _path = request.uri.path.codeUnits;
-
-      // Remove trailing slashes
-      int lastSlash = -1;
-
-      for (int i = _path.length - 1; i >= 0; i--) {
-        if (_path[i] == $slash)
-          lastSlash = i;
-        else
-          break;
-      }
-
-      if (lastSlash > -1)
-        requestedUrl = new String.fromCharCodes(_path.take(lastSlash));
-      else
-        requestedUrl = new String.fromCharCodes(_path);
-
-      if (requestedUrl.isEmpty) requestedUrl = '/';
-
-      Tuple3<List, Map, Match> resolveTuple() {
-        Router r = isProduction ? (_flattened ??= flatten(this)) : this;
+      Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
+        Router r = _flattened ?? this;
         var resolved =
-            r.resolveAll(requestedUrl, requestedUrl, method: req.method);
+            r.resolveAbsolute(path, method: req.method, strip: false);
 
         return new Tuple3(
           new MiddlewarePipeline(resolved).handlers,
           resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
-          resolved.isEmpty ? null : resolved.first.route.match(requestedUrl),
+          resolved.isEmpty ? null : resolved.first.parseResult,
         );
       }
 
+      var cacheKey = req.method + path;
       var tuple = isProduction
-          ? handlerCache.putIfAbsent(
-              '${req.method}:$requestedUrl', resolveTuple)
+          ? handlerCache.putIfAbsent(cacheKey, resolveTuple)
           : resolveTuple();
 
-      req.inject(Zone, zone);
-      req.inject(ZoneSpecification, zoneSpec);
+      //req.inject(Zone, zone);
+      //req.inject(ZoneSpecification, zoneSpec);
       req.params.addAll(tuple.item2);
-      req.inject(Match, tuple.item3);
+      req.inject(ParseResult, tuple.item3);
 
       if (logger != null) req.inject(Stopwatch, new Stopwatch()..start());
 
@@ -453,7 +436,15 @@ class Angel extends AngelBase {
           ignoreFinalizers: true,
         );
       }
-    }).catchError((error, stackTrace) {
+    } on FormatException catch (error, stackTrace) {
+      var e = new AngelHttpException.badRequest(message: error.message);
+
+      if (logger != null) {
+        logger.severe(e.message ?? e.toString(), error, stackTrace);
+      }
+
+      return await handleAngelHttpException(e, stackTrace, req, res, request);
+    } catch (error, stackTrace) {
       var e = new AngelHttpException(error,
           stackTrace: stackTrace, message: error?.toString());
 
@@ -461,13 +452,10 @@ class Angel extends AngelBase {
         logger.severe(e.message ?? e.toString(), error, stackTrace);
       }
 
-      return handleAngelHttpException(e, stackTrace, req, res, request);
-    }).whenComplete(() {
-      scheduleMicrotask(() {
-        req.close();
-        res.dispose();
-      });
-    });
+      return await handleAngelHttpException(e, stackTrace, req, res, request);
+    } finally {
+      res.dispose();
+    }
   }
 
   /// Runs several optimizations, *if* [isProduction] is `true`.
@@ -495,7 +483,7 @@ class Angel extends AngelBase {
         });
       }
 
-      if (_flattened == null) _flattened = flatten(this);
+      _flattened ??= flatten(this);
 
       _walk(_flattened);
 
@@ -528,34 +516,34 @@ class Angel extends AngelBase {
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
-    if (res.willCloseItself) {
-      return new Future.value();
-    } else {
-      Future finalizers = ignoreFinalizers == true
-          ? new Future.value()
-          : responseFinalizers.fold<Future>(
-              new Future.value(), (out, f) => out.then((_) => f(req, res)));
+    if (res.willCloseItself) return new Future.value();
 
-      if (res.isOpen) res.end();
+    Future finalizers = ignoreFinalizers == true
+        ? new Future.value()
+        : responseFinalizers.fold<Future>(
+            new Future.value(), (out, f) => out.then((_) => f(req, res)));
 
-      for (var key in res.headers.keys) {
-        request.response.headers.add(key, res.headers[key]);
-      }
+    if (res.isOpen) res.end();
 
-      request.response.contentLength = res.buffer.length;
-      request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
+    for (var key in res.headers.keys) {
+      request.response.headers.add(key, res.headers[key]);
+    }
 
-      List<int> outputBuffer = res.buffer.toBytes();
+    request.response.contentLength = res.buffer.length;
+    request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
 
-      if (res.encoders.isNotEmpty) {
-        var allowedEncodings =
-            (req.headers[HttpHeaders.ACCEPT_ENCODING] ?? []).map((str) {
-          // Ignore quality specifications in accept-encoding
-          // ex. gzip;q=0.8
-          if (!str.contains(';')) return str;
-          return str.split(';')[0];
-        });
+    List<int> outputBuffer = res.buffer.toBytes();
 
+    if (res.encoders.isNotEmpty) {
+      var allowedEncodings =
+          req.headers[HttpHeaders.ACCEPT_ENCODING]?.map((str) {
+        // Ignore quality specifications in accept-encoding
+        // ex. gzip;q=0.8
+        if (!str.contains(';')) return str;
+        return str.split(';')[0];
+      });
+
+      if (allowedEncodings != null) {
         for (var encodingName in allowedEncodings) {
           Converter<List<int>, List<int>> encoder;
           String key = encodingName;
@@ -574,24 +562,38 @@ class Angel extends AngelBase {
           }
         }
       }
-
-      request.response
-        ..statusCode = res.statusCode
-        ..cookies.addAll(res.cookies)
-        ..add(outputBuffer);
-
-      return finalizers.then((_) => request.response.close()).then((_) {
-        if (logger != null) {
-          var sw = req.grab<Stopwatch>(Stopwatch);
-
-          if (sw.isRunning) {
-            sw?.stop();
-            logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
-                    ?.elapsedMilliseconds ?? 'unknown'} ms)");
-          }
-        }
-      });
     }
+
+    request.response
+      ..statusCode = res.statusCode
+      ..cookies.addAll(res.cookies)
+      ..add(outputBuffer);
+
+    return finalizers.then((_) async {
+      request.response.close();
+
+      if (req.injections.containsKey(PoolResource)) {
+        req.injections[PoolResource].release();
+      }
+
+      if (logger != null) {
+        var sw = req.grab<Stopwatch>(Stopwatch);
+
+        if (sw.isRunning) {
+          sw?.stop();
+          logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
+              ?.elapsedMilliseconds ?? 'unknown'} ms)");
+        }
+      }
+    });
+  }
+
+  /// Limits the maximum number of requests to be handled concurrently by this instance.
+  ///
+  /// You can optionally provide a [timeout] to limit the amount of time a request can be
+  /// handled before.
+  void throttle(int maxConcurrentRequests, {Duration timeout}) {
+    _pool = new Pool(maxConcurrentRequests, timeout: timeout);
   }
 
   /// Applies an [AngelConfigurer] to this instance.
@@ -651,18 +653,19 @@ class Angel extends AngelBase {
   /// Default constructor. ;)
   Angel() : super() {
     bootstrapContainer();
+    createZoneForRequest = defaultZoneCreator;
+  }
 
-    createZoneForRequest = (request, req, res) async {
-      return new ZoneSpecification(
-        print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
-          if (logger != null) {
-            logger.info(line);
-          } else {
-            return parent.print(zone, line);
-          }
-        },
-      );
-    };
+  Future<ZoneSpecification> defaultZoneCreator(request, req, res) async {
+    return new ZoneSpecification(
+      print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
+        if (logger != null) {
+          logger.info(line);
+        } else {
+          return parent.print(zone, line);
+        }
+      },
+    );
   }
 
   /// An instance mounted on a server started by the [serverGenerator].
@@ -696,4 +699,4 @@ class Angel extends AngelBase {
 
     return new Angel.fromSecurityContext(serverContext);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/service.dart b/lib/src/http/service.dart
index c8124817..66def09c 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/http/service.dart
@@ -35,6 +35,11 @@ class Providers {
 
   @override
   bool operator ==(other) => other is Providers && other.via == via;
+
+  @override
+  String toString() {
+    return 'via:$via';
+  }
 }
 
 /// A front-facing interface that can present data to and operate on data on behalf of the user.
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
index 0af63505..67736d59 100644
--- a/lib/src/stats/metric_server.dart
+++ b/lib/src/stats/metric_server.dart
@@ -22,7 +22,8 @@ class AngelMetrics extends Angel {
       res.contentType = ContentType.HTML;
 
       var rows = stats.all.map((stat) {
-        return '''<tr>
+        return '''
+          <tr>
               <td>${stat.name}</td>
               <td>${stat.iterations}</td>
               <td>${stat.sum}ms</td>
@@ -107,6 +108,13 @@ class AngelMetrics extends Angel {
         () => super.createResponseContext(response, correspondingRequest));
   }
 
+  @override
+  Iterable<RoutingResult> resolveAll(String absolute, String relative,
+      {String method: 'GET', bool strip: true}) {
+    return stats.resolveAll
+        .run(() => super.resolveAll(absolute, relative, method: method, strip: strip));
+  }
+
   @override
   Future handleRequest(HttpRequest request) {
     return stats.handleRequest.run(() async {
@@ -146,6 +154,7 @@ class AngelMetricsStats {
     all = [
       createRequestContext,
       createResponseContext,
+      resolveAll,
       executeHandler,
       getHandlerResult,
       runContained,
@@ -156,6 +165,7 @@ class AngelMetricsStats {
 
   final Stats createRequestContext = new Stats('createRequestContext');
   final Stats createResponseContext = new Stats('createResponseContext');
+  final Stats resolveAll = new Stats('resolveAll');
   final Stats handleRequest = new Stats('handleRequest');
   final Stats executeHandler = new Stats('executeHandler');
   final Stats getHandlerResult = new Stats('getHandlerResult');
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 59c3cb50..9586611c 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:mirrors';
 
+final RegExp straySlashes = new RegExp(r'(^/+)|(/+$)');
+
 matchingAnnotation(List<InstanceMirror> metadata, Type T) {
   for (InstanceMirror metaDatum in metadata) {
     if (metaDatum.hasReflectee) {
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 33e6ba40..a776e60a 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -5,20 +5,39 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/metrics.dart';
 
-main() {
+main() async {
+  var isolates = <Isolate>[];
+
   for (int i = 0; i < Platform.numberOfProcessors; i++) {
-    Isolate.spawn(start, i + 1);
+    isolates.add(await Isolate.spawn(start, i + 1));
   }
 
-  start(0);
+  await Future.wait(isolates.map((i) {
+    var rcv = new ReceivePort();
+    i.addOnExitListener(rcv.sendPort);
+    return rcv.first;
+  }));
+  //start(0);
 }
 
 void start(int id) {
-  var app = new AngelMetrics.custom(startShared)
-    ..lazyParseBodies = true
-    ..get('/', (req, res) => res.write('Hello, world!'));
+  var app = new Angel.custom(startShared)..lazyParseBodies = true;
+
+  if (true) {
+    app.get('/', (req, ResponseContext res) {
+      res.willCloseItself = true;
+      res.io
+        ..write('Hello, world!')
+        ..close();
+      return false;
+    });
+  } else {
+    app.get('/', (req, ResponseContext res) {
+      res.useStream();
+      res.write('Hello, world!');
+    });
+  }
 
   var oldHandler = app.errorHandler;
   app.errorHandler = (e, req, res) {
diff --git a/pubspec.yaml b/pubspec.yaml
index c56a9bb7..f57441af 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+8
+version: 1.1.0-alpha+9
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -8,17 +8,17 @@ environment:
 dependencies:
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0
-  angel_route: ">=1.0.5 <2.0.0"
+  angel_route: ^2.0.0
   body_parser: ^1.0.0-dev
   charcode: ^1.0.0
   container: ^0.1.2
-  flatten: ^1.0.0
   json_god: ^2.0.0-beta
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
   merge_map: ^1.0.0
   meta: ^1.0.0
   mime: ^0.9.3
+  pool: ^1.0.0
   random_string: ^0.0.1
   tuple: ^1.0.0
 dev_dependencies:
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index 3afcaa18..d6c811cb 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -34,6 +34,12 @@ main() {
     expect(req.accepts('text/html'), isTrue);
   });
 
+  test('strict', () async {
+    var req = await acceptContentTypes(['text/html', "*/*"]);
+    expect(req.accepts(ContentType.HTML), isTrue);
+    expect(req.accepts(ContentType.JSON, strict: true), isFalse);
+  });
+
   group('disallow null', () {
     RequestContext req;
 
diff --git a/test/all.dart b/test/all.dart
index 2cddc867..a2fa8822 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -4,6 +4,7 @@ import 'controller_test.dart' as controller;
 import 'di_test.dart' as di;
 import 'encoders_buffer_test.dart' as encoders_buffer;
 import 'exception_test.dart' as exception;
+import 'extension_test.dart' as extension;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
 import 'parameter_meta_test.dart' as parameter_meta;
@@ -27,6 +28,7 @@ main() {
   group('di', di.main);
   group('encoders_buffer', encoders_buffer.main);
   group('exception', exception.main);
+  group('extension', extension.main);
   group('general', general.main);
   group('hooked', hooked.main);
   group('parameter_meta', parameter_meta.main);
diff --git a/test/di_test.dart b/test/di_test.dart
index 56c0d469..c309fe68 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_route/angel_route.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 import 'common.dart';
diff --git a/test/extension_test.dart b/test/extension_test.dart
new file mode 100644
index 00000000..c10603ec
--- /dev/null
+++ b/test/extension_test.dart
@@ -0,0 +1,29 @@
+import 'dart:async';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+final Uri ENDPOINT = Uri.parse('http://example.com');
+
+main() {
+  test('single extension', () async {
+    var req = await makeRequest('foo.js');
+    expect(req.extension, '.js');
+  });
+
+  test('multiple extensions', () async {
+    var req = await makeRequest('foo.min.js');
+    expect(req.extension, '.js');
+  });
+
+  test('no extension', () async {
+    var req = await makeRequest('foo');
+    expect(req.extension, '');
+  });
+}
+
+Future<RequestContext> makeRequest(String path) {
+  var rq = new MockHttpRequest('GET', ENDPOINT.replace(path: path))..close();
+  var app = new Angel();
+  return app.createRequestContext(rq);
+}
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 5cd54d78..02fb3b13 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -49,8 +49,8 @@ main() {
 
     ted = nested.post('/ted/:route', (RequestContext req, res) {
       print('Params: ${req.params}');
-      print(
-          'Path: ${ted.path}, matcher: ${ted.matcher.pattern}, uri: ${req.path}');
+      print('Path: ${ted.path}, uri: ${req.path}');
+      print('matcher: ${ted.parser}');
       return req.params;
     });
 
@@ -65,7 +65,7 @@ main() {
     app
         .get('/greet/:name',
             (RequestContext req, res) async => "Hello ${req.params['name']}")
-        .as('Named routes');
+        .name = 'Named routes';
     app.get('/named', (req, ResponseContext res) async {
       res.redirectTo('Named routes', {'name': 'tests'});
     });
@@ -86,7 +86,9 @@ main() {
       };
     }
 
-    app.chain(write('a')).chain([write('b'), write('c')]).get('/chained', () => false);
+    app
+        .chain(write('a'))
+        .chain([write('b'), write('c')]).get('/chained', () => false);
 
     app.use('MJ');
 
@@ -165,7 +167,7 @@ main() {
   });
 
   test('Can name routes', () {
-    Route foo = new Route('/framework/:id', name: 'frm');
+    Route foo = app.get('/framework/:id', [])..name = 'frm';
     print('Foo: $foo');
     String uri = foo.makeUri({'id': 'angel'});
     print(uri);

From eb58b20a0fe549cedf1d39e4767176aa1f4a2041 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 6 Dec 2017 09:46:35 -0500
Subject: [PATCH 164/414] Close #178, bump to 1.1.0

---
 .idea/workspace.xml                | 287 +++++++++++++----------------
 CHANGELOG.md                       |   3 +
 lib/metrics.dart                   |   2 +-
 lib/src/http/angel_base.dart       |   5 +-
 lib/src/http/injection.dart        |   8 +-
 lib/src/http/request_context.dart  |   6 +-
 lib/src/http/response_context.dart |  12 +-
 lib/src/http/server.dart           |   2 +-
 lib/src/stats/metric_server.dart   |   4 +-
 lib/src/stats/stats.dart           |   2 +-
 pubspec.yaml                       |   2 +-
 11 files changed, 158 insertions(+), 175 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1a80a1ac..8a80ba6a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,26 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/only_match_route_with_matching_method_in_routing_test_dart.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/tests_in_framework.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/extension_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="1.0.11">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/metrics.dart" afterPath="$PROJECT_DIR$/lib/metrics.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/injection.dart" afterPath="$PROJECT_DIR$/lib/src/http/injection.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/http/routable.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/http/service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/util.dart" afterPath="$PROJECT_DIR$/lib/src/util.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" afterPath="$PROJECT_DIR$/lib/src/stats/stats.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/accepts_test.dart" afterPath="$PROJECT_DIR$/test/accepts_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/all.dart" afterPath="$PROJECT_DIR$/test/all.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -43,34 +35,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="22" lean-forward="true" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
+            <state relative-caret-position="420">
               <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="53">
-              <caret line="392" column="20" lean-forward="false" selection-start-line="392" selection-start-column="20" selection-end-line="392" selection-end-column="20" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -79,8 +59,8 @@
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="135">
-                <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />
+              <first_editor relative-caret-position="-40">
+                <caret line="1" column="83" lean-forward="false" selection-start-line="1" selection-start-column="83" selection-end-line="1" selection-end-column="83" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -88,13 +68,26 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-8529">
+              <caret line="113" column="21" lean-forward="true" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-261">
+            <state relative-caret-position="0">
               <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding>
                 <element signature="e#0#22#0" expanded="true" />
+                <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
               </folding>
             </state>
           </provider>
@@ -104,7 +97,7 @@
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="1980">
-              <caret line="137" column="62" lean-forward="true" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
+              <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
               <folding />
             </state>
           </provider>
@@ -113,7 +106,7 @@
       <file leaf-file-name="router.dart" pinned="false" current-in-tab="false">
         <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
+            <state relative-caret-position="4815">
               <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
               <folding />
             </state>
@@ -123,20 +116,11 @@
       <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2095">
-              <caret line="195" column="25" lean-forward="false" selection-start-line="195" selection-start-column="25" selection-end-line="195" selection-end-column="25" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="extension_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
+            <state relative-caret-position="3015">
+              <caret line="205" column="5" lean-forward="false" selection-start-line="205" selection-start-column="5" selection-end-line="205" selection-end-column="5" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <marker date="1511894754000" expanded="false" signature="7:13" ph="..." />
+                <marker date="1511894754000" expanded="true" signature="6165:6175" ph="{...}" />
               </folding>
             </state>
           </provider>
@@ -145,10 +129,11 @@
       <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/all.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="364">
-              <caret line="30" column="37" lean-forward="false" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" />
+            <state relative-caret-position="165">
+              <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
               <folding>
                 <element signature="e#0#38#0" expanded="true" />
+                <marker date="1511894754000" expanded="true" signature="1709:1766" ph="{...}" />
               </folding>
             </state>
           </provider>
@@ -165,8 +150,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>handleReq</find>
-      <find>STARTS</find>
       <find>list</find>
       <find>sendRes</find>
       <find>handleRequ</find>
@@ -195,6 +178,8 @@
       <find>accepts</find>
       <find>cacheKey</find>
       <find>testing</find>
+      <find>cache</find>
+      <find>errorHan</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -227,6 +212,11 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="1.0.0" />
+      </map>
+    </option>
   </component>
   <component name="GradleLocalSettings">
     <option name="externalProjectsViewState">
@@ -275,7 +265,6 @@
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
@@ -284,8 +273,9 @@
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -297,12 +287,12 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="46" />
-    <option name="y" value="27" />
+    <option name="x" value="126" />
+    <option name="y" value="23" />
     <option name="width" value="1278" />
-    <option name="height" value="799" />
+    <option name="height" value="797" />
   </component>
-  <component name="ProjectLevelVcsManager">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
@@ -320,9 +310,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -348,23 +336,20 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="http" type="cbb8eebc:String" user="http" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="test" type="cbb8eebc:String" user="test" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="options.lastSelected" value="preferences.externalResources" />
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../route" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path" value="C:/Program Files (x86)/nodejs/node" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="dart.analysis.tool.window.force.activate" value="false" />
@@ -628,11 +613,6 @@
       <item index="37" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
       <item index="38" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
     </list>
-    <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
@@ -697,7 +677,8 @@
       <workItem from="1511569587672" duration="606000" />
       <workItem from="1511642216372" duration="531000" />
       <workItem from="1511674447575" duration="576000" />
-      <workItem from="1511749291765" duration="5830000" />
+      <workItem from="1511749291765" duration="8015000" />
+      <workItem from="1512570822083" duration="445000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -986,19 +967,27 @@
       <option name="project" value="LOCAL" />
       <updated>1511026990202</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="+9">
+      <created>1511892890049</created>
+      <option name="number" value="00042" />
+      <option name="presentableId" value="LOCAL-00042" />
+      <option name="project" value="LOCAL" />
+      <updated>1511892890049</updated>
+    </task>
+    <task id="LOCAL-00043" summary="1.0.11">
+      <created>1511893540118</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1511893540118</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.11.28 at 13h 08m 16s.xml">
+    <history-entry file="All_Tests - 2017.12.06 at 09h 45m 17s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 04m 45s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 08m 04s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 08m 27s.xml">
       <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1008,6 +997,12 @@
     <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 52s.xml">
       <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 46m 37s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.12.06 at 09h 45m 26s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 05m 10s.xml">
       <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1022,7 +1017,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="113405000" />
+    <option name="totallyTimeSpent" value="116035000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1034,33 +1029,32 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="46" y="27" width="1278" height="799" extended-state="0" />
+    <frame x="126" y="23" width="1278" height="797" extended-state="0" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3125" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2394822" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32386363" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4005682" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48011363" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2394822" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1069,6 +1063,7 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1078,8 +1073,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Patch" />
-    <MESSAGE value="Added more tests." />
     <MESSAGE value="Still adding more tests, fixed exception-handling bug." />
     <MESSAGE value="Updated Travis script" />
     <MESSAGE value="1.0.6" />
@@ -1103,7 +1096,9 @@
     <MESSAGE value="+6" />
     <MESSAGE value="autoIdAndDateFields in MapService" />
     <MESSAGE value="+8" />
-    <option name="LAST_COMMIT_MESSAGE" value="+8" />
+    <MESSAGE value="+9" />
+    <MESSAGE value="1.0.11" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.0.11" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1179,7 +1174,6 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="225">
             <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="84" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
@@ -1211,7 +1205,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1261,7 +1254,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="267" column="7" lean-forward="false" selection-start-line="267" selection-start-column="7" selection-end-line="267" selection-end-column="7" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1277,9 +1269,6 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="210">
             <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
-            <folding>
-              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
-            </folding>
           </first_editor>
           <second_editor />
         </state>
@@ -1289,7 +1278,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="54" lean-forward="false" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1297,7 +1285,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="36" column="4" lean-forward="false" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1305,7 +1292,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
           <caret line="73" column="15" lean-forward="false" selection-start-line="73" selection-start-column="15" selection-end-line="73" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1313,7 +1299,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="26" column="50" lean-forward="false" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1321,7 +1306,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="109">
           <caret line="85" column="32" lean-forward="false" selection-start-line="85" selection-start-column="32" selection-end-line="85" selection-end-column="32" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1329,7 +1313,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="392">
           <caret line="493" column="16" lean-forward="false" selection-start-line="493" selection-start-column="16" selection-end-line="493" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1337,7 +1320,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1345,7 +1327,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
           <caret line="85" column="23" lean-forward="false" selection-start-line="85" selection-start-column="23" selection-end-line="85" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1353,7 +1334,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2658">
           <caret line="193" column="4" lean-forward="false" selection-start-line="193" selection-start-column="4" selection-end-line="193" selection-end-column="4" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1361,7 +1341,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="233">
           <caret line="399" column="63" lean-forward="true" selection-start-line="399" selection-start-column="63" selection-end-line="399" selection-end-column="63" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1369,7 +1348,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="26">
           <caret line="142" column="9" lean-forward="false" selection-start-line="142" selection-start-column="9" selection-end-line="142" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1377,7 +1355,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-254">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1385,9 +1362,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="158">
           <caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
-          <folding>
-            <element signature="e#75#95#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1395,9 +1369,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="316">
           <caret line="249" column="30" lean-forward="true" selection-start-line="249" selection-start-column="30" selection-end-line="249" selection-end-column="30" />
-          <folding>
-            <element signature="e#47#67#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1405,9 +1376,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="12" column="32" lean-forward="false" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1415,7 +1383,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="33" lean-forward="true" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1423,62 +1390,46 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
           <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="364">
-          <caret line="30" column="37" lean-forward="false" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" />
+        <state relative-caret-position="165">
+          <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
           <folding>
             <element signature="e#0#38#0" expanded="true" />
+            <marker date="1511894754000" expanded="true" signature="1709:1766" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2095">
-          <caret line="195" column="25" lean-forward="false" selection-start-line="195" selection-start-column="25" selection-end-line="195" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="53">
-          <caret line="392" column="20" lean-forward="false" selection-start-line="392" selection-start-column="20" selection-end-line="392" selection-end-column="20" />
+        <state relative-caret-position="3015">
+          <caret line="205" column="5" lean-forward="false" selection-start-line="205" selection-start-column="5" selection-end-line="205" selection-end-column="5" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <marker date="1511894754000" expanded="false" signature="7:13" ph="..." />
+            <marker date="1511894754000" expanded="true" signature="6165:6175" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
+        <state relative-caret-position="4815">
           <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-261">
+        <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="e#0#22#0" expanded="true" />
+            <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
           </folding>
         </state>
       </provider>
@@ -1486,15 +1437,33 @@
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1980">
-          <caret line="137" column="62" lean-forward="true" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
+          <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-8529">
+          <caret line="113" column="21" lean-forward="true" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="22" lean-forward="true" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -1502,8 +1471,8 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="135">
-            <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />
+          <first_editor relative-caret-position="-40">
+            <caret line="1" column="83" lean-forward="false" selection-start-line="1" selection-start-column="83" selection-end-line="1" selection-end-column="83" />
             <folding />
           </first_editor>
           <second_editor />
@@ -1539,6 +1508,7 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
+          <last-edited>jquery</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -1550,6 +1520,7 @@
       </state>
       <state key="JdkListConfigurable.UI">
         <settings>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df66e68c..63cf2c50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.0
+* The default `errorHandler` now only sends HTML if the user explicitly accepts it.
+
 # 1.1.0-alpha+9
 * Fixed a bug that prevented `isProduction` from ever returning `true`.
     * This enabled caching, which greatly improved performance.
diff --git a/lib/metrics.dart b/lib/metrics.dart
index f373795f..b4ecfdf1 100644
--- a/lib/metrics.dart
+++ b/lib/metrics.dart
@@ -1,2 +1,2 @@
 export 'src/stats/metric_server.dart';
-export 'src/stats/stats.dart';
\ No newline at end of file
+export 'src/stats/stats.dart';
diff --git a/lib/src/http/angel_base.dart b/lib/src/http/angel_base.dart
index eeddffb0..3bc8c7b6 100644
--- a/lib/src/http/angel_base.dart
+++ b/lib/src/http/angel_base.dart
@@ -9,8 +9,9 @@ typedef Future<String> ViewGenerator(String path, [Map data]);
 
 /// Base class for Angel servers. Do not bother extending this.
 class AngelBase extends Routable {
-  static ViewGenerator noViewEngineConfigured =(String view, [Map data]) async =>
-  "No view engine has been configured yet.";
+  static ViewGenerator noViewEngineConfigured = (String view,
+          [Map data]) async =>
+      "No view engine has been configured yet.";
 
   Container _container = new Container();
 
diff --git a/lib/src/http/injection.dart b/lib/src/http/injection.dart
index 7f4e5f39..fba314ab 100644
--- a/lib/src/http/injection.dart
+++ b/lib/src/http/injection.dart
@@ -67,7 +67,8 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
 }
 
 /// Checks if an [InjectionRequest] can be sufficiently executed within the current request/response context.
-bool suitableForInjection(RequestContext req, ResponseContext res, InjectionRequest injection) {
+bool suitableForInjection(
+    RequestContext req, ResponseContext res, InjectionRequest injection) {
   return injection.parameters.values.any((p) {
     if (p.match == null) return false;
     var value = p.getValue(req);
@@ -78,8 +79,9 @@ bool suitableForInjection(RequestContext req, ResponseContext res, InjectionRequ
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(handler, InjectionRequest injection) {
   return (RequestContext req, ResponseContext res) async {
-    if (injection.parameters.isNotEmpty && injection.parameters.values.any((p) => p.match != null) && !suitableForInjection(req, res, injection))
-      return true;
+    if (injection.parameters.isNotEmpty &&
+        injection.parameters.values.any((p) => p.match != null) &&
+        !suitableForInjection(req, res, injection)) return true;
 
     List args = [];
 
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 730076bd..41fbe2ca 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -142,7 +142,8 @@ class RequestContext {
   String get extension => _extensionCache ??= p.extension(uri.path);
 
   /// Magically transforms an [HttpRequest] into a [RequestContext].
-  static Future<RequestContext> from(HttpRequest request, Angel app, String path) async {
+  static Future<RequestContext> from(
+      HttpRequest request, Angel app, String path) async {
     RequestContext ctx = new RequestContext();
 
     String override = request.method;
@@ -225,7 +226,8 @@ class RequestContext {
   void inject(type, value) {
     if (!app.isProduction && type is Type) {
       if (!reflect(value).type.isAssignableTo(reflectType(type)))
-        throw new ArgumentError('Cannot inject $value (${value.runtimeType}) as an instance of $type.');
+        throw new ArgumentError(
+            'Cannot inject $value (${value.runtimeType}) as an instance of $type.');
     }
 
     _injections[type] = value;
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index d3f64103..60c04251 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -353,8 +353,10 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
         (_correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
       }
 
-      if (_correspondingRequest?.injections?.containsKey(PoolResource) == true) {
-        (_correspondingRequest.injections[PoolResource] as PoolResource).release();
+      if (_correspondingRequest?.injections?.containsKey(PoolResource) ==
+          true) {
+        (_correspondingRequest.injections[PoolResource] as PoolResource)
+            .release();
       }
 
       return true;
@@ -481,14 +483,16 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
   void add(List<int> bytes) {
     if (_closed)
       throw _deny();
-    else _buf.add(bytes);
+    else
+      _buf.add(bytes);
   }
 
   @override
   void addByte(int byte) {
     if (_closed)
       throw _deny();
-    else _buf.addByte(byte);
+    else
+      _buf.addByte(byte);
   }
 
   @override
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 54237e16..89f530fc 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -125,7 +125,7 @@ class Angel extends AngelBase {
   Function(AngelHttpException e, RequestContext req, ResponseContext res)
       errorHandler =
       (AngelHttpException e, RequestContext req, ResponseContext res) {
-    if (!req.accepts('text/html') &&
+    if (!req.accepts('text/html', strict: true) &&
         (req.accepts('application/json') ||
             req.accepts('application/javascript'))) {
       res.json(e.toJson());
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
index 67736d59..2c810391 100644
--- a/lib/src/stats/metric_server.dart
+++ b/lib/src/stats/metric_server.dart
@@ -111,8 +111,8 @@ class AngelMetrics extends Angel {
   @override
   Iterable<RoutingResult> resolveAll(String absolute, String relative,
       {String method: 'GET', bool strip: true}) {
-    return stats.resolveAll
-        .run(() => super.resolveAll(absolute, relative, method: method, strip: strip));
+    return stats.resolveAll.run(() =>
+        super.resolveAll(absolute, relative, method: method, strip: strip));
   }
 
   @override
diff --git a/lib/src/stats/stats.dart b/lib/src/stats/stats.dart
index 0d7730bb..2c42a5dc 100644
--- a/lib/src/stats/stats.dart
+++ b/lib/src/stats/stats.dart
@@ -50,4 +50,4 @@ class Stats {
     whenDone();
     return r;
   }
-}
\ No newline at end of file
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index f57441af..8cf5b0ed 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0-alpha+9
+version: 1.1.0
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From dc3c67b28d1cbb0bcd4eff12653c23f50c0334bc Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 10 Dec 2017 00:05:59 -0500
Subject: [PATCH 165/414] Patched _matchesId, bump to 1.1.0+1

---
 .idea/workspace.xml           | 120 ++++++++++++++++++----------------
 CHANGELOG.md                  |   3 +
 lib/src/http/map_service.dart |  11 +++-
 pubspec.yaml                  |   2 +-
 4 files changed, 75 insertions(+), 61 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8a80ba6a..68dab61d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="1.0.11">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/metrics.dart" afterPath="$PROJECT_DIR$/lib/metrics.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/injection.dart" afterPath="$PROJECT_DIR$/lib/src/http/injection.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" afterPath="$PROJECT_DIR$/lib/src/stats/stats.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -38,32 +31,31 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
+            <state relative-caret-position="0">
               <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="15">
+              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="-40">
-                <caret line="1" column="83" lean-forward="false" selection-start-line="1" selection-start-column="83" selection-end-line="1" selection-end-column="83" />
-                <folding />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="360">
+              <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -71,8 +63,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-8529">
-              <caret line="113" column="21" lean-forward="true" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
+            <state relative-caret-position="1425">
+              <caret line="113" column="21" lean-forward="false" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -259,7 +251,6 @@
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
@@ -274,9 +265,10 @@
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -310,6 +302,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane" />
+      <pane id="Scratches" />
       <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -340,9 +334,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="PackagesPane" />
-      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -382,7 +374,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -678,7 +670,8 @@
       <workItem from="1511642216372" duration="531000" />
       <workItem from="1511674447575" duration="576000" />
       <workItem from="1511749291765" duration="8015000" />
-      <workItem from="1512570822083" duration="445000" />
+      <workItem from="1512570822083" duration="1079000" />
+      <workItem from="1512882177311" duration="166000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -981,7 +974,14 @@
       <option name="project" value="LOCAL" />
       <updated>1511893540118</updated>
     </task>
-    <option name="localTasksCounter" value="44" />
+    <task id="LOCAL-00044" summary="Close #178, bump to 1.1.0">
+      <created>1512571595293</created>
+      <option name="number" value="00044" />
+      <option name="presentableId" value="LOCAL-00044" />
+      <option name="project" value="LOCAL" />
+      <updated>1512571595293</updated>
+    </task>
+    <option name="localTasksCounter" value="45" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1017,7 +1017,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="116035000" />
+    <option name="totallyTimeSpent" value="116835000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1030,6 +1030,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="126" y="23" width="1278" height="797" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -1040,10 +1041,10 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3125" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2394822" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1053,8 +1054,8 @@
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1073,7 +1074,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Still adding more tests, fixed exception-handling bug." />
     <MESSAGE value="Updated Travis script" />
     <MESSAGE value="1.0.6" />
     <MESSAGE value="Add stackTrace" />
@@ -1098,7 +1098,8 @@
     <MESSAGE value="+8" />
     <MESSAGE value="+9" />
     <MESSAGE value="1.0.11" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.0.11" />
+    <MESSAGE value="Close #178, bump to 1.1.0" />
+    <option name="LAST_COMMIT_MESSAGE" value="Close #178, bump to 1.1.0" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1194,13 +1195,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="211">
-          <caret line="78" column="18" lean-forward="true" selection-start-line="78" selection-start-column="18" selection-end-line="78" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/metrics.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1444,7 +1438,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
+        <state relative-caret-position="0">
           <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
           <folding />
         </state>
@@ -1452,33 +1446,43 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-8529">
-          <caret line="113" column="21" lean-forward="true" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
+        <state relative-caret-position="1425">
+          <caret line="113" column="21" lean-forward="false" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="-40">
-            <caret line="1" column="83" lean-forward="false" selection-start-line="1" selection-start-column="83" selection-end-line="1" selection-end-column="83" />
+          <first_editor relative-caret-position="15">
+            <caret line="1" column="68" lean-forward="false" selection-start-line="1" selection-start-column="68" selection-end-line="1" selection-end-column="68" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63cf2c50..77f87173 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.0+1
+* Modified `_matchesId` in `MapService` to support custom ID fields.
+
 # 1.1.0
 * The default `errorHandler` now only sends HTML if the user explicitly accepts it.
 
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index be6e2f26..e07c87b1 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -23,8 +23,15 @@ class MapService extends Service {
       this.autoIdAndDateFields: true})
       : super();
 
-  _matchesId(id) {
-    return (Map item) => item['id'] != null && item['id'] == id?.toString();
+  bool Function(Map) _matchesId(id) {
+    return (Map item) {
+      if (item['id'] == null)
+        return false;
+      else if (autoIdAndDateFields != false)
+        return item['id'] == id?.toString();
+      else
+        return item['id'] == id;
+    };
   }
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
index 8cf5b0ed..38448f8e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0
+version: 1.1.0+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 4657342569952aee4c00c676a6096d5f4984209f Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 12 Dec 2017 13:28:52 -0500
Subject: [PATCH 166/414] Patched handleAngelHttpException, bump to 1.1.0+2

---
 .idea/workspace.xml      | 96 ++++++++++++++++++++++++----------------
 CHANGELOG.md             |  4 ++
 lib/src/http/server.dart | 11 +++--
 pubspec.yaml             |  2 +-
 4 files changed, 70 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 68dab61d..38fd72e0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -31,7 +31,7 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
+            <state relative-caret-position="420">
               <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
               <folding />
             </state>
@@ -51,8 +51,8 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+            <state relative-caret-position="330">
+              <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -63,8 +63,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1425">
-              <caret line="113" column="21" lean-forward="false" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
+            <state relative-caret-position="287">
+              <caret line="370" column="5" lean-forward="true" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -72,6 +72,19 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="75">
+                <caret line="5" column="32" lean-forward="false" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -265,8 +278,8 @@
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
@@ -302,8 +315,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane" />
-      <pane id="Scratches" />
       <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -334,6 +345,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="Scratches" />
       <pane id="PackagesPane" />
     </panes>
   </component>
@@ -374,7 +387,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -671,7 +684,8 @@
       <workItem from="1511674447575" duration="576000" />
       <workItem from="1511749291765" duration="8015000" />
       <workItem from="1512570822083" duration="1079000" />
-      <workItem from="1512882177311" duration="166000" />
+      <workItem from="1512882177311" duration="187000" />
+      <workItem from="1513103172812" duration="146000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -981,16 +995,20 @@
       <option name="project" value="LOCAL" />
       <updated>1512571595293</updated>
     </task>
-    <option name="localTasksCounter" value="45" />
+    <task id="LOCAL-00045" summary="Patched _matchesId, bump to 1.1.0+1">
+      <created>1512882359925</created>
+      <option name="number" value="00045" />
+      <option name="presentableId" value="LOCAL-00045" />
+      <option name="project" value="LOCAL" />
+      <updated>1512882359925</updated>
+    </task>
+    <option name="localTasksCounter" value="46" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.12.06 at 09h 45m 17s.xml">
+    <history-entry file="All_Tests - 2017.12.12 at 13h 27m 57s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 08m 27s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 22s.xml">
       <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1003,6 +1021,9 @@
     <history-entry file="All_Tests_(PRODUCTION) - 2017.12.06 at 09h 45m 26s.xml">
       <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.12.12 at 13h 28m 22s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 05m 10s.xml">
       <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1017,7 +1038,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="116835000" />
+    <option name="totallyTimeSpent" value="117002000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1030,7 +1051,6 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="126" y="23" width="1278" height="797" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -1042,12 +1062,12 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2394822" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2435275" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1074,7 +1094,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Updated Travis script" />
     <MESSAGE value="1.0.6" />
     <MESSAGE value="Add stackTrace" />
     <MESSAGE value="1.0.6+2" />
@@ -1099,7 +1118,8 @@
     <MESSAGE value="+9" />
     <MESSAGE value="1.0.11" />
     <MESSAGE value="Close #178, bump to 1.1.0" />
-    <option name="LAST_COMMIT_MESSAGE" value="Close #178, bump to 1.1.0" />
+    <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
+    <option name="LAST_COMMIT_MESSAGE" value="Patched _matchesId, bump to 1.1.0+1" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1438,16 +1458,26 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="420">
           <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1425">
-          <caret line="113" column="21" lean-forward="false" selection-start-line="113" selection-start-column="21" selection-end-line="113" selection-end-column="21" />
+        <state relative-caret-position="287">
+          <caret line="370" column="5" lean-forward="true" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
@@ -1457,24 +1487,14 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="15">
-            <caret line="1" column="68" lean-forward="false" selection-start-line="1" selection-start-column="68" selection-end-line="1" selection-end-column="68" />
+          <first_editor relative-caret-position="75">
+            <caret line="5" column="32" lean-forward="false" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77f87173..18525337 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.0+2
+* Modified `handleAngelHttpException` to only run rescue code
+if the response is still open. Prevents application crashes.
+
 # 1.1.0+1
 * Modified `_matchesId` in `MapService` to support custom ID fields.
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 89f530fc..f79239e4 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -370,10 +370,13 @@ class Angel extends AngelBase {
       }
     }
 
-    res.statusCode = e.statusCode;
-    var result = await errorHandler(e, req, res);
-    await executeHandler(result, req, res);
-    res.end();
+    if (res.isOpen) {
+      res.statusCode = e.statusCode;
+      var result = await errorHandler(e, req, res);
+      await executeHandler(result, req, res);
+      res.end();
+    }
+
     return await sendResponse(request, req, res,
         ignoreFinalizers: ignoreFinalizers == true);
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 38448f8e..76253c2c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0+1
+version: 1.1.0+2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From c79de1050c6551c7232ddddc7ddb299bea3db7d2 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 12 Dec 2017 13:33:58 -0500
Subject: [PATCH 167/414] Patched ResponseContext#isOpen, bump to 1.1.0+3

---
 .idea/workspace.xml                | 133 ++++++++++++++---------------
 CHANGELOG.md                       |  51 +----------
 lib/src/http/response_context.dart |   2 +-
 pubspec.yaml                       |   2 +-
 4 files changed, 71 insertions(+), 117 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 38fd72e0..6d676c6e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -31,18 +31,18 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
+            <state relative-caret-position="120">
+              <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+            <state relative-caret-position="44">
+              <caret line="341" column="7" lean-forward="false" selection-start-line="341" selection-start-column="7" selection-end-line="341" selection-end-column="7" />
               <folding />
             </state>
           </provider>
@@ -51,7 +51,7 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
+            <state relative-caret-position="360">
               <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
@@ -60,11 +60,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="287">
-              <caret line="370" column="5" lean-forward="true" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
+            <state relative-caret-position="366">
+              <caret line="370" column="5" lean-forward="false" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -72,19 +72,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="75">
-                <caret line="5" column="32" lean-forward="false" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -134,7 +121,7 @@
       <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/all.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
+            <state relative-caret-position="465">
               <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
               <folding>
                 <element signature="e#0#38#0" expanded="true" />
@@ -155,7 +142,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>list</find>
       <find>sendRes</find>
       <find>handleRequ</find>
       <find>sendRespon</find>
@@ -185,6 +171,7 @@
       <find>testing</find>
       <find>cache</find>
       <find>errorHan</find>
+      <find>addStre</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -265,7 +252,6 @@
         <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
@@ -280,8 +266,9 @@
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -315,7 +302,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -348,6 +334,7 @@
       <pane id="ProjectPane" />
       <pane id="Scratches" />
       <pane id="PackagesPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -685,7 +672,9 @@
       <workItem from="1511749291765" duration="8015000" />
       <workItem from="1512570822083" duration="1079000" />
       <workItem from="1512882177311" duration="187000" />
-      <workItem from="1513103172812" duration="146000" />
+      <workItem from="1513103172812" duration="165000" />
+      <workItem from="1513103483207" duration="18000" />
+      <workItem from="1513103506825" duration="121000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -1002,16 +991,20 @@
       <option name="project" value="LOCAL" />
       <updated>1512882359925</updated>
     </task>
-    <option name="localTasksCounter" value="46" />
+    <task id="LOCAL-00046" summary="Patched handleAngelHttpException, bump to 1.1.0+2">
+      <created>1513103332618</created>
+      <option name="number" value="00046" />
+      <option name="presentableId" value="LOCAL-00046" />
+      <option name="project" value="LOCAL" />
+      <updated>1513103332618</updated>
+    </task>
+    <option name="localTasksCounter" value="47" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.12.12 at 13h 27m 57s.xml">
+    <history-entry file="All_Tests - 2017.12.12 at 13h 32m 53s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 22s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 52s.xml">
       <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1024,6 +1017,9 @@
     <history-entry file="All_Tests_(PRODUCTION) - 2017.12.12 at 13h 28m 22s.xml">
       <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests_(PRODUCTION) - 2017.12.12 at 13h 33m 34s.xml">
+      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 05m 10s.xml">
       <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1038,7 +1034,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="117002000" />
+    <option name="totallyTimeSpent" value="117160000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1067,7 +1063,7 @@
       <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2435275" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20550162" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1094,7 +1090,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.0.6" />
     <MESSAGE value="Add stackTrace" />
     <MESSAGE value="1.0.6+2" />
     <MESSAGE value="Added RequestContext.accepts" />
@@ -1119,7 +1114,8 @@
     <MESSAGE value="1.0.11" />
     <MESSAGE value="Close #178, bump to 1.1.0" />
     <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
-    <option name="LAST_COMMIT_MESSAGE" value="Patched _matchesId, bump to 1.1.0+1" />
+    <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
+    <option name="LAST_COMMIT_MESSAGE" value="Patched handleAngelHttpException, bump to 1.1.0+2" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1358,13 +1354,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="26">
-          <caret line="142" column="9" lean-forward="false" selection-start-line="142" selection-start-column="9" selection-end-line="142" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-254">
@@ -1409,7 +1398,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
+        <state relative-caret-position="465">
           <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
           <folding>
             <element signature="e#0#38#0" expanded="true" />
@@ -1456,17 +1445,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="36" column="37" lean-forward="false" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
+        <state relative-caret-position="360">
           <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -1474,32 +1455,48 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="370" column="5" lean-forward="true" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="75">
+          <caret line="5" column="12" lean-forward="true" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="44">
+          <caret line="341" column="7" lean-forward="false" selection-start-line="341" selection-start-column="7" selection-end-line="341" selection-end-column="7" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="75">
-            <caret line="5" column="32" lean-forward="false" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
+          <first_editor relative-caret-position="15">
+            <caret line="1" column="74" lean-forward="false" selection-start-line="1" selection-start-column="74" selection-end-line="1" selection-end-column="74" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="16" lean-forward="false" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
-          <folding />
+        <state relative-caret-position="366">
+          <caret line="370" column="5" lean-forward="false" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18525337..c5c253e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.0+3
+* Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
+
 # 1.1.0+2
 * Modified `handleAngelHttpException` to only run rescue code
 if the response is still open. Prevents application crashes.
@@ -50,50 +53,4 @@ if the response is still open. Prevents application crashes.
 # 1.1.0-alpha
 * Removed `AngelFatalError`, and subsequently `fatalErrorStream`.
 * Removed all `@deprecated` members.
-* Removed `@Hooked`, `beforeProcessed`, and `afterProcessed`.
-
-# 1.0.10
-* Closed [#162](https://github.com/angel-dart/framework/issues/162), fixing a caching bug
-that would cause multiple requests to the same URL to fail.
-* Resolved dependency injection of primitives (namely `String`), no longer triggering
-errors about `String has no constructor`, etc.
-
-# 1.0.9
-* Closed [#161](https://github.com/angel-dart/framework/issues/161). `addCreated`/`addUpdatedAt` no longer
-crash when `serialize` is `false`.
-* Added an explicit on `charcode`, `path`, and others. Resolves
-[#160](https://github.com/angel-dart/framework/issues/160).
-* `ResponseContext` now implements `StreamSink<List<int>`, so data can be streamed directly to the
-underlying response.
-* You can now inject `encoders` into a `ResponseContext`, which takes care of `Accept-Encoding`.
-This will ultimately replace `package:angel_compress`.
-Resolves [#159](https://github.com/angel-dart/framework/issues/159).
-
-# 1.0.8
-* Changed `req.query` to use a modifiable Map if the body has not parsed. Resolves
-[#157](https://github.com/angel-dart/framework/issues/157).
-* Changed all constants to `camelCase`, and deprecated their `CONSTANT_CASE` counterparts. Resolves
-[#155](https://github.com/angel-dart/framework/issues/155).
-* Resolved [#156](https://github.com/angel-dart/framework/issues/156) by adding a `graphql` provider.
-* Added an `analysis-options.yaml` enabling strong mode. Preparing for Dart 2.0.
-* Added a dependency on `package:meta`, resolving [#154](https://github.com/angel-dart/framework/issues/154),
-and added corresponding annotations to make extending Angel easier.
-* Resolved [#158](https://github.com/angel-dart/framework/issues/158) by using proper `StreamController`
-patterns, to prevent memory leaks.
-* Route handler sequences are now cached in a Map, so repeat requests will be resolved faster.
-* A message is no longer printed in production mode.
-* Removed the inheritance on `Extensible` in many classes, and removed it from `angel_route`.
-Now, only `Angel` and `RequestContext` have `@proxy` annotations.
-* Deprecated passing `debug` to Angel.
-* `_LockableBytesBuilder` now uses `Uint8List`.
-* Removed `reopen` from `ResponseContext`.
-
-# 1.0.7+2
-Changed `ResponseContext.serialize`. The `contentType` is now set *before* serialization.
-
-# 1.0.7+1
-Moved the `Model` class into `package:angel_model`. No functionality was added or removed.
-
-# 1.0.7
-Added an `accepts` method to `RequestContext`. It's now a lot easier to tell which content types the
-user accepts via the `Accept` header.
\ No newline at end of file
+* Removed `@Hooked`, `beforeProcessed`, and `afterProcessed`.
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 60c04251..bde72914 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -84,7 +84,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Can we still write to this response?
-  bool get isOpen => _isOpen;
+  bool get isOpen => _isOpen && !_isClosed;
 
   /// A set of UTF-8 encoded bytes that will be written to the response.
   BytesBuilder get buffer => _buffer;
diff --git a/pubspec.yaml b/pubspec.yaml
index 76253c2c..6047fced 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0+2
+version: 1.1.0+3
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 333ba32dff5ac78a905814c382fa8b0f394e4256 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:16:52 -0500
Subject: [PATCH 168/414] Response no longer closes if `serialize` is called
 with an empty string

---
 .idea/libraries/Dart_Packages.xml  |  68 +++++++-----
 .idea/workspace.xml                | 165 +++++++++++++++--------------
 CHANGELOG.md                       |   4 +
 lib/src/http/response_context.dart |   6 +-
 pubspec.yaml                       |   1 +
 5 files changed, 138 insertions(+), 106 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index f73ff04c..576ef34c 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -26,14 +26,14 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.1.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.3.0/lib" />
             </list>
           </value>
         </entry>
@@ -47,7 +47,7 @@
         <entry key="barback">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+13/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+14/lib" />
             </list>
           </value>
         </entry>
@@ -82,7 +82,7 @@
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.5/lib" />
             </list>
           </value>
         </entry>
@@ -138,7 +138,7 @@
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2+2/lib" />
             </list>
           </value>
         </entry>
@@ -173,7 +173,7 @@
         <entry key="io">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
             </list>
           </value>
         </entry>
@@ -236,7 +236,7 @@
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.5/lib" />
             </list>
           </value>
         </entry>
@@ -247,6 +247,13 @@
             </list>
           </value>
         </entry>
+        <entry key="multi_server_socket">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="node_preamble">
           <value>
             <list>
@@ -285,7 +292,7 @@
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
             </list>
           </value>
         </entry>
@@ -310,10 +317,17 @@
             </list>
           </value>
         </entry>
+        <entry key="recase">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/recase-1.0.0+1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.2/lib" />
             </list>
           </value>
         </entry>
@@ -327,7 +341,7 @@
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
             </list>
           </value>
         </entry>
@@ -369,7 +383,7 @@
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.3/lib" />
             </list>
           </value>
         </entry>
@@ -390,7 +404,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.28/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.30+1/lib" />
             </list>
           </value>
         </entry>
@@ -418,7 +432,7 @@
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+6/lib" />
             </list>
           </value>
         </entry>
@@ -442,15 +456,15 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.1.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.3.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+13/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+14/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
@@ -458,12 +472,12 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
@@ -472,33 +486,35 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.1+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/recase-1.0.0+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.28/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.30+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
     </CLASSES>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6d676c6e..492c51a5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Response no longer closes if `serialize` is called with an empty string">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
@@ -31,7 +32,7 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
+            <state relative-caret-position="0">
               <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
               <folding />
             </state>
@@ -41,17 +42,30 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="44">
-              <caret line="341" column="7" lean-forward="false" selection-start-line="341" selection-start-column="7" selection-end-line="341" selection-end-column="7" />
+            <state relative-caret-position="371">
+              <caret line="310" column="28" lean-forward="false" selection-start-line="310" selection-start-column="28" selection-end-line="310" selection-end-column="28" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="30">
+                <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
+            <state relative-caret-position="15">
               <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
@@ -60,11 +74,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="366">
-              <caret line="370" column="5" lean-forward="false" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
+            <state relative-caret-position="1481">
+              <caret line="399" column="28" lean-forward="false" selection-start-line="399" selection-start-column="28" selection-end-line="399" selection-end-column="28" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -121,7 +135,7 @@
       <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/all.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="465">
+            <state relative-caret-position="165">
               <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
               <folding>
                 <element signature="e#0#38#0" expanded="true" />
@@ -279,9 +293,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="126" />
+    <option name="x" value="67" />
     <option name="y" value="23" />
-    <option name="width" value="1278" />
+    <option name="width" value="1337" />
     <option name="height" value="797" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -309,31 +323,13 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane" />
-      <pane id="Scratches" />
       <pane id="PackagesPane" />
+      <pane id="Scratches" />
+      <pane id="ProjectPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -674,7 +670,9 @@
       <workItem from="1512882177311" duration="187000" />
       <workItem from="1513103172812" duration="165000" />
       <workItem from="1513103483207" duration="18000" />
-      <workItem from="1513103506825" duration="121000" />
+      <workItem from="1513103506825" duration="139000" />
+      <workItem from="1517332581856" duration="858000" />
+      <workItem from="1517973177718" duration="223000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -998,7 +996,14 @@
       <option name="project" value="LOCAL" />
       <updated>1513103332618</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="Patched ResponseContext#isOpen, bump to 1.1.0+3">
+      <created>1513103639013</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1513103639013</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1034,7 +1039,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="117160000" />
+    <option name="totallyTimeSpent" value="118259000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1046,31 +1051,33 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="126" y="23" width="1278" height="797" extended-state="0" />
+    <frame x="67" y="23" width="1337" height="797" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20550162" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2023166" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1090,7 +1097,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Add stackTrace" />
     <MESSAGE value="1.0.6+2" />
     <MESSAGE value="Added RequestContext.accepts" />
     <MESSAGE value="Swapped to angel_model" />
@@ -1115,7 +1121,8 @@
     <MESSAGE value="Close #178, bump to 1.1.0" />
     <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
     <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
-    <option name="LAST_COMMIT_MESSAGE" value="Patched handleAngelHttpException, bump to 1.1.0+2" />
+    <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
+    <option name="LAST_COMMIT_MESSAGE" value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1398,7 +1405,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
+        <state relative-caret-position="165">
           <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
           <folding>
             <element signature="e#0#38#0" expanded="true" />
@@ -1445,9 +1452,35 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1481">
+          <caret line="399" column="28" lean-forward="false" selection-start-line="399" selection-start-column="28" selection-end-line="399" selection-end-column="28" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
+        <state relative-caret-position="15">
           <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -1455,26 +1488,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="12" lean-forward="true" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="341" column="7" lean-forward="false" selection-start-line="341" selection-start-column="7" selection-end-line="341" selection-end-column="7" />
+        <state relative-caret-position="371">
+          <caret line="310" column="28" lean-forward="false" selection-start-line="310" selection-start-column="28" selection-end-line="310" selection-end-column="28" />
           <folding />
         </state>
       </provider>
@@ -1482,24 +1499,14 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="15">
-            <caret line="1" column="74" lean-forward="false" selection-start-line="1" selection-start-column="74" selection-end-line="1" selection-end-column="74" />
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="370" column="5" lean-forward="false" selection-start-line="370" selection-start-column="5" selection-end-line="370" selection-end-column="5" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5c253e8..4377d9a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.1
+* `ResponseContext` no longer automatically closes if `serializer` returns an
+empty string.
+
 # 1.1.0+3
 * Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
 
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index bde72914..c6d80a0b 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -308,11 +308,15 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   void serialize(value, {contentType}) {
     if (_isClosed) throw _closed();
 
+    var text = serializer(value);
+
+    if (text.isEmpty)
+      return;
+
     if (contentType is String)
       headers[HttpHeaders.CONTENT_TYPE] = contentType;
     else if (contentType is ContentType) this.contentType = contentType;
 
-    var text = serializer(value);
     write(text);
 
     end();
diff --git a/pubspec.yaml b/pubspec.yaml
index 6047fced..7eca6daf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,6 +20,7 @@ dependencies:
   mime: ^0.9.3
   pool: ^1.0.0
   random_string: ^0.0.1
+  recase: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
   mock_request: ^1.0.0

From 56e1fc62d002fc2f9a06e5a82a5c43f0f5e0561a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:24:44 -0500
Subject: [PATCH 169/414] Added `autoSnakeCaseNames` to `MapService`

---
 .idea/libraries/Dart_Packages.xml |   8 --
 .idea/workspace.xml               | 154 ++++++++++++++++--------------
 CHANGELOG.md                      |   1 +
 lib/src/http/map_service.dart     |  27 ++++--
 pubspec.yaml                      |   1 -
 5 files changed, 106 insertions(+), 85 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 576ef34c..61931626 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -317,13 +317,6 @@
             </list>
           </value>
         </entry>
-        <entry key="recase">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/recase-1.0.0+1/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="shelf">
           <value>
             <list>
@@ -498,7 +491,6 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/recase-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 492c51a5..12a634ee 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Response no longer closes if `serialize` is called with an empty string">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -49,27 +49,42 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="245">
+              <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="30">
-                <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-                <folding />
+              <first_editor relative-caret-position="0">
+                <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+                <folding>
+                  <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
+                </folding>
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="45">
+                <caret line="3" column="45" lean-forward="false" selection-start-line="3" selection-start-column="45" selection-end-line="3" selection-end-column="45" />
+                <folding />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -132,19 +147,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/all.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
-              <folding>
-                <element signature="e#0#38#0" expanded="true" />
-                <marker date="1511894754000" expanded="true" signature="1709:1766" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -156,8 +158,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>sendRes</find>
-      <find>handleRequ</find>
       <find>sendRespon</find>
       <find>inject(</find>
       <find>sendRe</find>
@@ -186,6 +186,8 @@
       <find>cache</find>
       <find>errorHan</find>
       <find>addStre</find>
+      <find>((cre)|(upd))atedAt</find>
+      <find>'((cre)|(upd))atedAt'</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -206,6 +208,7 @@
       <replace>cookie</replace>
       <replace>req.path</replace>
       <replace>req.path`</replace>
+      <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -278,10 +281,10 @@
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -370,7 +373,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests (PRODUCTION)">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -672,7 +675,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="223000" />
+      <workItem from="1517973177718" duration="692000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -1003,11 +1006,18 @@
       <option name="project" value="LOCAL" />
       <updated>1513103639013</updated>
     </task>
-    <option name="localTasksCounter" value="48" />
+    <task id="LOCAL-00048" summary="Response no longer closes if `serialize` is called with an empty string">
+      <created>1517973412941</created>
+      <option name="number" value="00048" />
+      <option name="presentableId" value="LOCAL-00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1517973412941</updated>
+    </task>
+    <option name="localTasksCounter" value="49" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.12.12 at 13h 32m 53s.xml">
+    <history-entry file="All_Tests - 2018.02.06 at 22h 24m 09s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 52s.xml">
@@ -1039,7 +1049,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="118259000" />
+    <option name="totallyTimeSpent" value="118728000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1074,7 +1084,7 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2023166" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1097,7 +1107,7 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="1.0.6+2" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <MESSAGE value="Added RequestContext.accepts" />
     <MESSAGE value="Swapped to angel_model" />
     <MESSAGE value="1.0.7+2" />
@@ -1122,7 +1132,8 @@
     <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
     <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
     <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
-    <option name="LAST_COMMIT_MESSAGE" value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
+    <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
+    <option name="LAST_COMMIT_MESSAGE" value="Response no longer closes if `serialize` is called with an empty string" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1281,16 +1292,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="210">
-            <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -1460,14 +1461,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1481">
@@ -1478,16 +1471,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="371">
@@ -1496,11 +1479,42 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="21" column="23" lean-forward="false" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="245">
+          <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <folding>
+              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+          <first_editor relative-caret-position="45">
+            <caret line="3" column="45" lean-forward="false" selection-start-line="3" selection-start-column="45" selection-end-line="3" selection-end-column="45" />
             <folding />
           </first_editor>
           <second_editor />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4377d9a0..14fdff46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 1.1.1
 * `ResponseContext` no longer automatically closes if `serializer` returns an
 empty string.
+* Added `autoSnakeCaseNames` to `MapService`.
 
 # 1.1.0+3
 * Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
diff --git a/lib/src/http/map_service.dart b/lib/src/http/map_service.dart
index e07c87b1..ce2c409a 100644
--- a/lib/src/http/map_service.dart
+++ b/lib/src/http/map_service.dart
@@ -15,14 +15,24 @@ class MapService extends Service {
   /// If set to `true` (default), then the service will manage an `id` string and `createdAt` and `updatedAt` fields.
   final bool autoIdAndDateFields;
 
+  /// If set to `true` (default), then the keys `created_at` and `updated_at` will automatically be snake_cased.
+  final bool autoSnakeCaseNames;
+
   final List<Map<String, dynamic>> items = [];
 
   MapService(
       {this.allowRemoveAll: false,
       this.allowQuery: true,
-      this.autoIdAndDateFields: true})
+      this.autoIdAndDateFields: true,
+      this.autoSnakeCaseNames: true})
       : super();
 
+  String get createdAtKey =>
+      autoSnakeCaseNames == false ? 'createdAt' : 'created_at';
+
+  String get updatedAtKey =>
+      autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at';
+
   bool Function(Map) _matchesId(id) {
     return (Map item) {
       if (item['id'] == null)
@@ -72,8 +82,8 @@ class MapService extends Service {
     if (autoIdAndDateFields == true) {
       result
         ..['id'] = items.length.toString()
-        ..['createdAt'] = now
-        ..['updatedAt'] = now;
+        ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] = now
+        ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
     items.add(result);
     return result;
@@ -90,7 +100,10 @@ class MapService extends Service {
     var item = await read(id);
     var result = item..addAll(data);
 
-    if (autoIdAndDateFields == true) result..['updatedAt'] = new DateTime.now();
+    if (autoIdAndDateFields == true)
+      result
+        ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
+            new DateTime.now();
     return result;
   }
 
@@ -112,8 +125,10 @@ class MapService extends Service {
     if (autoIdAndDateFields == true) {
       result
         ..['id'] = id?.toString()
-        ..['createdAt'] = old['createdAt']
-        ..['updatedAt'] = new DateTime.now();
+        ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] =
+            old[autoSnakeCaseNames == false ? 'createdAt' : 'created_at']
+        ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
+            new DateTime.now();
     }
     items.add(result);
     return result;
diff --git a/pubspec.yaml b/pubspec.yaml
index 7eca6daf..6047fced 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,7 +20,6 @@ dependencies:
   mime: ^0.9.3
   pool: ^1.0.0
   random_string: ^0.0.1
-  recase: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
   mock_request: ^1.0.0

From 3527da6f4ba0081258582f0b0190855118089500 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:32:31 -0500
Subject: [PATCH 170/414] Created setup for AngelHttp

---
 .idea/workspace.xml          | 221 ++++++++++++++++++++++++++---------
 lib/src/http/angel_http.dart |   6 +
 lib/src/http/server.dart     |   4 +
 3 files changed, 179 insertions(+), 52 deletions(-)
 create mode 100644 lib/src/http/angel_http.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 12a634ee..1e138e4d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -76,7 +74,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
@@ -92,15 +90,73 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1481">
-              <caret line="399" column="28" lean-forward="false" selection-start-line="399" selection-start-column="28" selection-end-line="399" selection-end-column="28" />
+            <state relative-caret-position="409">
+              <caret line="464" column="0" lean-forward="true" selection-start-line="464" selection-start-column="0" selection-end-line="464" selection-end-column="0" />
               <folding>
-                <element signature="e#38#58#0" expanded="true" />
+                <element signature="e#1894#1949#0" expanded="false" />
+                <element signature="e#2304#2311#0" expanded="false" />
+                <element signature="e#2534#2611#0" expanded="false" />
+                <element signature="e#2869#2964#0" expanded="false" />
+                <element signature="e#3252#3306#0" expanded="false" />
+                <element signature="e#3430#3485#0" expanded="false" />
+                <element signature="e#3611#3652#0" expanded="false" />
+                <element signature="e#3866#4128#0" expanded="false" />
+                <element signature="e#5025#5047#0" expanded="false" />
+                <element signature="e#5175#5490#0" expanded="false" />
+                <element signature="e#5601#5948#0" expanded="false" />
+                <element signature="e#6038#6405#0" expanded="false" />
+                <element signature="e#6498#6736#0" expanded="false" />
+                <element signature="e#6740#6807#0" expanded="false" />
+                <element signature="e#6911#7587#0" expanded="false" />
+                <element signature="e#7749#8389#0" expanded="false" />
+                <element signature="e#8501#8536#0" expanded="false" />
+                <element signature="e#8709#8750#0" expanded="false" />
+                <element signature="e#8886#8921#0" expanded="false" />
+                <element signature="e#9006#9723#0" expanded="false" />
+                <element signature="e#9892#10283#0" expanded="false" />
+                <element signature="e#10352#10696#0" expanded="false" />
+                <element signature="e#10837#10854#0" expanded="false" />
+                <element signature="e#11138#11281#0" expanded="false" />
+                <element signature="e#11380#11513#0" expanded="false" />
+                <element signature="e#11731#12311#0" expanded="false" />
+                <element signature="e#12660#13030#0" expanded="false" />
+                <element signature="e#12899#12904#0" expanded="false" />
+                <element signature="e#13199#13224#0" expanded="false" />
+                <element signature="e#14842#14904#0" expanded="false" />
+                <element signature="e#15220#15852#0" expanded="false" />
+                <element signature="e#15313#15437#0" expanded="false" />
+                <element signature="e#15471#15716#0" expanded="false" />
+                <element signature="e#15856#15914#0" expanded="false" />
+                <element signature="e#16148#16323#0" expanded="false" />
+                <element signature="e#16479#16668#0" expanded="false" />
+                <element signature="e#16823#19001#0" expanded="false" />
+                <element signature="e#17538#17589#0" expanded="false" />
+                <element signature="e#19005#19091#0" expanded="false" />
+                <element signature="e#19273#19341#0" expanded="false" />
+                <element signature="e#19443#19482#0" expanded="false" />
+                <element signature="e#19486#19547#0" expanded="false" />
+                <element signature="e#19973#21048#0" expanded="false" />
+                <element signature="e#21100#21178#0" expanded="false" />
+                <element signature="e#21246#21508#0" expanded="false" />
+                <element signature="e#21638#21703#0" expanded="false" />
+                <element signature="e#21766#21960#0" expanded="false" />
+                <element signature="e#21964#21992#0" expanded="false" />
+                <element signature="e#22284#22703#0" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="30">
+              <caret line="2" column="51" lean-forward="false" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -134,19 +190,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3015">
-              <caret line="205" column="5" lean-forward="false" selection-start-line="205" selection-start-column="5" selection-end-line="205" selection-end-column="5" />
-              <folding>
-                <marker date="1511894754000" expanded="false" signature="7:13" ph="..." />
-                <marker date="1511894754000" expanded="true" signature="6165:6175" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -158,7 +201,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>sendRespon</find>
       <find>inject(</find>
       <find>sendRe</find>
       <find>sendResponse</find>
@@ -188,6 +230,7 @@
       <find>addStre</find>
       <find>((cre)|(upd))atedAt</find>
       <find>'((cre)|(upd))atedAt'</find>
+      <find>handleReque</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -235,7 +278,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/safe_stream_controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
@@ -281,11 +323,12 @@
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -296,9 +339,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="67" />
-    <option name="y" value="23" />
-    <option name="width" value="1337" />
+    <option name="x" value="39" />
+    <option name="y" value="25" />
+    <option name="width" value="1360" />
     <option name="height" value="797" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -326,6 +369,24 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -675,7 +736,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="692000" />
+      <workItem from="1517973177718" duration="1156000" />
     </task>
     <task id="LOCAL-00001" summary="Re-designed exception">
       <created>1481237183504</created>
@@ -1013,7 +1074,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517973412941</updated>
     </task>
-    <option name="localTasksCounter" value="49" />
+    <task id="LOCAL-00049" summary="Added `autoSnakeCaseNames` to `MapService`">
+      <created>1517973884510</created>
+      <option name="number" value="00049" />
+      <option name="presentableId" value="LOCAL-00049" />
+      <option name="project" value="LOCAL" />
+      <updated>1517973884510</updated>
+    </task>
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1049,7 +1117,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="118728000" />
+    <option name="totallyTimeSpent" value="119192000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1061,7 +1129,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="67" y="23" width="1337" height="797" extended-state="0" />
+    <frame x="39" y="25" width="1360" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1084,9 +1152,9 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2023166" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1108,7 +1176,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Added RequestContext.accepts" />
     <MESSAGE value="Swapped to angel_model" />
     <MESSAGE value="1.0.7+2" />
     <MESSAGE value="Working on 1.0.8, including performance tuning" />
@@ -1133,20 +1200,14 @@
     <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
     <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
     <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
-    <option name="LAST_COMMIT_MESSAGE" value="Response no longer closes if `serialize` is called with an empty string" />
+    <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added `autoSnakeCaseNames` to `MapService`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/profiler.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1404">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/extension.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2001">
@@ -1461,16 +1522,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1481">
-          <caret line="399" column="28" lean-forward="false" selection-start-line="399" selection-start-column="28" selection-end-line="399" selection-end-column="28" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="371">
@@ -1521,6 +1572,72 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="409">
+          <caret line="464" column="0" lean-forward="true" selection-start-line="464" selection-start-column="0" selection-end-line="464" selection-end-column="0" />
+          <folding>
+            <element signature="e#1894#1949#0" expanded="false" />
+            <element signature="e#2304#2311#0" expanded="false" />
+            <element signature="e#2534#2611#0" expanded="false" />
+            <element signature="e#2869#2964#0" expanded="false" />
+            <element signature="e#3252#3306#0" expanded="false" />
+            <element signature="e#3430#3485#0" expanded="false" />
+            <element signature="e#3611#3652#0" expanded="false" />
+            <element signature="e#3866#4128#0" expanded="false" />
+            <element signature="e#5025#5047#0" expanded="false" />
+            <element signature="e#5175#5490#0" expanded="false" />
+            <element signature="e#5601#5948#0" expanded="false" />
+            <element signature="e#6038#6405#0" expanded="false" />
+            <element signature="e#6498#6736#0" expanded="false" />
+            <element signature="e#6740#6807#0" expanded="false" />
+            <element signature="e#6911#7587#0" expanded="false" />
+            <element signature="e#7749#8389#0" expanded="false" />
+            <element signature="e#8501#8536#0" expanded="false" />
+            <element signature="e#8709#8750#0" expanded="false" />
+            <element signature="e#8886#8921#0" expanded="false" />
+            <element signature="e#9006#9723#0" expanded="false" />
+            <element signature="e#9892#10283#0" expanded="false" />
+            <element signature="e#10352#10696#0" expanded="false" />
+            <element signature="e#10837#10854#0" expanded="false" />
+            <element signature="e#11138#11281#0" expanded="false" />
+            <element signature="e#11380#11513#0" expanded="false" />
+            <element signature="e#11731#12311#0" expanded="false" />
+            <element signature="e#12660#13030#0" expanded="false" />
+            <element signature="e#12899#12904#0" expanded="false" />
+            <element signature="e#13199#13224#0" expanded="false" />
+            <element signature="e#14842#14904#0" expanded="false" />
+            <element signature="e#15220#15852#0" expanded="false" />
+            <element signature="e#15313#15437#0" expanded="false" />
+            <element signature="e#15471#15716#0" expanded="false" />
+            <element signature="e#15856#15914#0" expanded="false" />
+            <element signature="e#16148#16323#0" expanded="false" />
+            <element signature="e#16479#16668#0" expanded="false" />
+            <element signature="e#16823#19001#0" expanded="false" />
+            <element signature="e#17538#17589#0" expanded="false" />
+            <element signature="e#19005#19091#0" expanded="false" />
+            <element signature="e#19273#19341#0" expanded="false" />
+            <element signature="e#19443#19482#0" expanded="false" />
+            <element signature="e#19486#19547#0" expanded="false" />
+            <element signature="e#19973#21048#0" expanded="false" />
+            <element signature="e#21100#21178#0" expanded="false" />
+            <element signature="e#21246#21508#0" expanded="false" />
+            <element signature="e#21638#21703#0" expanded="false" />
+            <element signature="e#21766#21960#0" expanded="false" />
+            <element signature="e#21964#21992#0" expanded="false" />
+            <element signature="e#22284#22703#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="51" lean-forward="false" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
new file mode 100644
index 00000000..d4c217d9
--- /dev/null
+++ b/lib/src/http/angel_http.dart
@@ -0,0 +1,6 @@
+import 'dart:io';
+
+/// Adapts `dart:io`'s [HttpServer] to serve Angel.
+class AngelHttp {
+
+}
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index f79239e4..60fa04eb 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -461,6 +461,10 @@ class Angel extends AngelBase {
     }
   }
 
+  Future setupRequest(RequestContext req) async {
+
+  }
+
   /// Runs several optimizations, *if* [isProduction] is `true`.
   ///
   /// * Preprocesses all dependency injection, and eliminates the burden of reflecting handlers

From e2af07c813cb5b4550b80c30bb1da3546b2f35ed Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:46:52 -0500
Subject: [PATCH 171/414] Basic server methods transferred to AngelHttp

---
 .idea/workspace.xml          | 392 ++++++++++++++---------------------
 lib/src/http/angel_http.dart | 225 ++++++++++++++++++++
 lib/src/http/server.dart     | 220 +++-----------------
 3 files changed, 409 insertions(+), 428 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e138e4d..d2b51d8d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -26,171 +26,135 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="371">
-              <caret line="310" column="28" lean-forward="false" selection-start-line="310" selection-start-column="28" selection-end-line="310" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="245">
-              <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="0">
-                <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-                <folding>
-                  <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
-                </folding>
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="45">
-                <caret line="3" column="45" lean-forward="false" selection-start-line="3" selection-start-column="45" selection-end-line="3" selection-end-column="45" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="409">
-              <caret line="464" column="0" lean-forward="true" selection-start-line="464" selection-start-column="0" selection-end-line="464" selection-end-column="0" />
-              <folding>
-                <element signature="e#1894#1949#0" expanded="false" />
-                <element signature="e#2304#2311#0" expanded="false" />
-                <element signature="e#2534#2611#0" expanded="false" />
-                <element signature="e#2869#2964#0" expanded="false" />
-                <element signature="e#3252#3306#0" expanded="false" />
-                <element signature="e#3430#3485#0" expanded="false" />
-                <element signature="e#3611#3652#0" expanded="false" />
-                <element signature="e#3866#4128#0" expanded="false" />
-                <element signature="e#5025#5047#0" expanded="false" />
-                <element signature="e#5175#5490#0" expanded="false" />
-                <element signature="e#5601#5948#0" expanded="false" />
-                <element signature="e#6038#6405#0" expanded="false" />
-                <element signature="e#6498#6736#0" expanded="false" />
-                <element signature="e#6740#6807#0" expanded="false" />
-                <element signature="e#6911#7587#0" expanded="false" />
-                <element signature="e#7749#8389#0" expanded="false" />
-                <element signature="e#8501#8536#0" expanded="false" />
-                <element signature="e#8709#8750#0" expanded="false" />
-                <element signature="e#8886#8921#0" expanded="false" />
-                <element signature="e#9006#9723#0" expanded="false" />
-                <element signature="e#9892#10283#0" expanded="false" />
-                <element signature="e#10352#10696#0" expanded="false" />
-                <element signature="e#10837#10854#0" expanded="false" />
-                <element signature="e#11138#11281#0" expanded="false" />
-                <element signature="e#11380#11513#0" expanded="false" />
-                <element signature="e#11731#12311#0" expanded="false" />
-                <element signature="e#12660#13030#0" expanded="false" />
-                <element signature="e#12899#12904#0" expanded="false" />
-                <element signature="e#13199#13224#0" expanded="false" />
-                <element signature="e#14842#14904#0" expanded="false" />
-                <element signature="e#15220#15852#0" expanded="false" />
-                <element signature="e#15313#15437#0" expanded="false" />
-                <element signature="e#15471#15716#0" expanded="false" />
-                <element signature="e#15856#15914#0" expanded="false" />
-                <element signature="e#16148#16323#0" expanded="false" />
-                <element signature="e#16479#16668#0" expanded="false" />
-                <element signature="e#16823#19001#0" expanded="false" />
-                <element signature="e#17538#17589#0" expanded="false" />
-                <element signature="e#19005#19091#0" expanded="false" />
-                <element signature="e#19273#19341#0" expanded="false" />
-                <element signature="e#19443#19482#0" expanded="false" />
-                <element signature="e#19486#19547#0" expanded="false" />
-                <element signature="e#19973#21048#0" expanded="false" />
-                <element signature="e#21100#21178#0" expanded="false" />
-                <element signature="e#21246#21508#0" expanded="false" />
-                <element signature="e#21638#21703#0" expanded="false" />
-                <element signature="e#21766#21960#0" expanded="false" />
-                <element signature="e#21964#21992#0" expanded="false" />
-                <element signature="e#22284#22703#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="51" lean-forward="false" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#22#0" expanded="true" />
-                <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1980">
-              <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="router.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4815">
-              <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <splitter split-orientation="horizontal" split-proportion="0.5">
+      <split-first>
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+          <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="0">
+                  <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="371">
+                  <caret line="310" column="28" lean-forward="false" selection-start-line="310" selection-start-column="28" selection-end-line="310" selection-end-column="28" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="245">
+                  <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
+                  <folding>
+                    <element signature="e#0#20#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/README.md">
+              <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+                <state split_layout="SPLIT">
+                  <first_editor relative-caret-position="0">
+                    <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+                    <folding>
+                      <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
+                    </folding>
+                  </first_editor>
+                  <second_editor />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+              <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+                <state split_layout="SPLIT">
+                  <first_editor relative-caret-position="45">
+                    <caret line="3" column="45" lean-forward="false" selection-start-line="3" selection-start-column="45" selection-end-line="3" selection-end-column="45" />
+                    <folding />
+                  </first_editor>
+                  <second_editor />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="-1684">
+                  <caret line="380" column="7" lean-forward="false" selection-start-line="380" selection-start-column="7" selection-end-line="380" selection-end-column="7" />
+                  <folding>
+                    <element signature="e#38#58#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="0">
+                  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+                  <folding>
+                    <element signature="e#0#22#0" expanded="true" />
+                    <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="1980">
+                  <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="router.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="4815">
+                  <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="300">
+                  <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+                  <folding>
+                    <element signature="e#0#20#0" expanded="true" />
+                    <element signature="e#1190#1195#0" expanded="false" />
+                    <element signature="e#1498#1523#0" expanded="false" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -201,8 +165,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>inject(</find>
-      <find>sendRe</find>
       <find>sendResponse</find>
       <find>addStream</find>
       <find>Lo</find>
@@ -231,6 +193,8 @@
       <find>((cre)|(upd))atedAt</find>
       <find>'((cre)|(upd))atedAt'</find>
       <find>handleReque</find>
+      <find>injectSeri</find>
+      <find>optimize</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -327,8 +291,8 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
       </list>
     </option>
   </component>
@@ -736,14 +700,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="1156000" />
-    </task>
-    <task id="LOCAL-00001" summary="Re-designed exception">
-      <created>1481237183504</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1481237183504</updated>
+      <workItem from="1517973177718" duration="2011000" />
     </task>
     <task id="LOCAL-00002" summary="Core done?">
       <created>1481378740441</created>
@@ -1081,7 +1038,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517973884510</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="Created setup for AngelHttp">
+      <created>1517974351104</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1517974351105</updated>
+    </task>
+    <option name="localTasksCounter" value="51" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1117,7 +1081,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="119192000" />
+    <option name="totallyTimeSpent" value="120047000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1154,7 +1118,7 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1176,7 +1140,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Swapped to angel_model" />
     <MESSAGE value="1.0.7+2" />
     <MESSAGE value="Working on 1.0.8, including performance tuning" />
     <MESSAGE value="Remove reopen" />
@@ -1201,7 +1164,8 @@
     <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
     <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
     <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added `autoSnakeCaseNames` to `MapService`" />
+    <MESSAGE value="Created setup for AngelHttp" />
+    <option name="LAST_COMMIT_MESSAGE" value="Created setup for AngelHttp" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1574,67 +1538,23 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="409">
-          <caret line="464" column="0" lean-forward="true" selection-start-line="464" selection-start-column="0" selection-end-line="464" selection-end-column="0" />
+        <state relative-caret-position="-1684">
+          <caret line="380" column="7" lean-forward="false" selection-start-line="380" selection-start-column="7" selection-end-line="380" selection-end-column="7" />
           <folding>
-            <element signature="e#1894#1949#0" expanded="false" />
-            <element signature="e#2304#2311#0" expanded="false" />
-            <element signature="e#2534#2611#0" expanded="false" />
-            <element signature="e#2869#2964#0" expanded="false" />
-            <element signature="e#3252#3306#0" expanded="false" />
-            <element signature="e#3430#3485#0" expanded="false" />
-            <element signature="e#3611#3652#0" expanded="false" />
-            <element signature="e#3866#4128#0" expanded="false" />
-            <element signature="e#5025#5047#0" expanded="false" />
-            <element signature="e#5175#5490#0" expanded="false" />
-            <element signature="e#5601#5948#0" expanded="false" />
-            <element signature="e#6038#6405#0" expanded="false" />
-            <element signature="e#6498#6736#0" expanded="false" />
-            <element signature="e#6740#6807#0" expanded="false" />
-            <element signature="e#6911#7587#0" expanded="false" />
-            <element signature="e#7749#8389#0" expanded="false" />
-            <element signature="e#8501#8536#0" expanded="false" />
-            <element signature="e#8709#8750#0" expanded="false" />
-            <element signature="e#8886#8921#0" expanded="false" />
-            <element signature="e#9006#9723#0" expanded="false" />
-            <element signature="e#9892#10283#0" expanded="false" />
-            <element signature="e#10352#10696#0" expanded="false" />
-            <element signature="e#10837#10854#0" expanded="false" />
-            <element signature="e#11138#11281#0" expanded="false" />
-            <element signature="e#11380#11513#0" expanded="false" />
-            <element signature="e#11731#12311#0" expanded="false" />
-            <element signature="e#12660#13030#0" expanded="false" />
-            <element signature="e#12899#12904#0" expanded="false" />
-            <element signature="e#13199#13224#0" expanded="false" />
-            <element signature="e#14842#14904#0" expanded="false" />
-            <element signature="e#15220#15852#0" expanded="false" />
-            <element signature="e#15313#15437#0" expanded="false" />
-            <element signature="e#15471#15716#0" expanded="false" />
-            <element signature="e#15856#15914#0" expanded="false" />
-            <element signature="e#16148#16323#0" expanded="false" />
-            <element signature="e#16479#16668#0" expanded="false" />
-            <element signature="e#16823#19001#0" expanded="false" />
-            <element signature="e#17538#17589#0" expanded="false" />
-            <element signature="e#19005#19091#0" expanded="false" />
-            <element signature="e#19273#19341#0" expanded="false" />
-            <element signature="e#19443#19482#0" expanded="false" />
-            <element signature="e#19486#19547#0" expanded="false" />
-            <element signature="e#19973#21048#0" expanded="false" />
-            <element signature="e#21100#21178#0" expanded="false" />
-            <element signature="e#21246#21508#0" expanded="false" />
-            <element signature="e#21638#21703#0" expanded="false" />
-            <element signature="e#21766#21960#0" expanded="false" />
-            <element signature="e#21964#21992#0" expanded="false" />
-            <element signature="e#22284#22703#0" expanded="false" />
+            <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="51" lean-forward="false" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
-          <folding />
+        <state relative-caret-position="300">
+          <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#1190#1195#0" expanded="false" />
+            <element signature="e#1498#1523#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index d4c217d9..2b8f3da2 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -1,6 +1,231 @@
+import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
+import 'package:angel_http_exception/angel_http_exception.dart';
+import 'package:angel_route/angel_route.dart';
+import 'package:combinator/combinator.dart';
+import 'package:json_god/json_god.dart' as god;
+import 'package:pool/pool.dart';
+import 'package:tuple/tuple.dart';
+import 'request_context.dart';
+import 'response_context.dart';
+import 'server.dart';
+
+final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// Adapts `dart:io`'s [HttpServer] to serve Angel.
 class AngelHttp {
+  final Angel app;
 
+  Pool _pool;
+
+  AngelHttp(this.app);
+
+  /// Handles a single request.
+  Future handleRequest(HttpRequest request) async {
+    var req = await createRequestContext(request);
+    var res = await createResponseContext(request.response, req);
+
+    try {
+      var path = req.path;
+      if (path == '/') path = '';
+
+      Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
+        Router r = _flattened ?? this;
+        var resolved =
+        r.resolveAbsolute(path, method: req.method, strip: false);
+
+        return new Tuple3(
+          new MiddlewarePipeline(resolved).handlers,
+          resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
+          resolved.isEmpty ? null : resolved.first.parseResult,
+        );
+      }
+
+      var cacheKey = req.method + path;
+      var tuple = app.isProduction
+          ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
+          : resolveTuple();
+
+      //req.inject(Zone, zone);
+      //req.inject(ZoneSpecification, zoneSpec);
+      req.params.addAll(tuple.item2);
+      req.inject(ParseResult, tuple.item3);
+
+      if (app.logger != null) req.inject(Stopwatch, new Stopwatch()..start());
+
+      var pipeline = tuple.item1;
+
+      for (var handler in pipeline) {
+        try {
+          if (handler == null || !await app.executeHandler(handler, req, res))
+            break;
+        } on AngelHttpException catch (e, st) {
+          e.stackTrace ??= st;
+          return await handleAngelHttpException(e, st, req, res, request);
+        }
+      }
+
+      try {
+        await sendResponse(request, req, res);
+      } on AngelHttpException catch (e, st) {
+        e.stackTrace ??= st;
+        return await handleAngelHttpException(
+          e,
+          st,
+          req,
+          res,
+          request,
+          ignoreFinalizers: true,
+        );
+      }
+    } on FormatException catch (error, stackTrace) {
+      var e = new AngelHttpException.badRequest(message: error.message);
+
+      if (app.logger != null) {
+        app.logger.severe(e.message ?? e.toString(), error, stackTrace);
+      }
+
+      return await handleAngelHttpException(e, stackTrace, req, res, request);
+    } catch (error, stackTrace) {
+      var e = new AngelHttpException(error,
+          stackTrace: stackTrace, message: error?.toString());
+
+      if (app.logger != null) {
+        app.logger.severe(e.message ?? e.toString(), error, stackTrace);
+      }
+
+      return await handleAngelHttpException(e, stackTrace, req, res, request);
+    } finally {
+      res.dispose();
+    }
+  }
+
+  /// Handles an [AngelHttpException].
+  Future handleAngelHttpException(AngelHttpException e, StackTrace st,
+      RequestContext req, ResponseContext res, HttpRequest request,
+      {bool ignoreFinalizers: false}) async {
+    if (req == null || res == null) {
+      try {
+        app.logger?.severe(e, st);
+        request.response
+          ..statusCode = HttpStatus.INTERNAL_SERVER_ERROR
+          ..write('500 Internal Server Error')
+          ..close();
+      } finally {
+        return null;
+      }
+    }
+
+    if (res.isOpen) {
+      res.statusCode = e.statusCode;
+      var result = await app.errorHandler(e, req, res);
+      await app.executeHandler(result, req, res);
+      res.end();
+    }
+
+    return await sendResponse(request, req, res,
+        ignoreFinalizers: ignoreFinalizers == true);
+  }
+
+  /// Sends a response.
+  Future sendResponse(
+      HttpRequest request, RequestContext req, ResponseContext res,
+      {bool ignoreFinalizers: false}) {
+    if (res.willCloseItself) return new Future.value();
+
+    Future finalizers = ignoreFinalizers == true
+        ? new Future.value()
+        : app.responseFinalizers.fold<Future>(
+        new Future.value(), (out, f) => out.then((_) => f(req, res)));
+
+    if (res.isOpen) res.end();
+
+    for (var key in res.headers.keys) {
+      request.response.headers.add(key, res.headers[key]);
+    }
+
+    request.response.contentLength = res.buffer.length;
+    request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
+
+    List<int> outputBuffer = res.buffer.toBytes();
+
+    if (res.encoders.isNotEmpty) {
+      var allowedEncodings =
+      req.headers[HttpHeaders.ACCEPT_ENCODING]?.map((str) {
+        // Ignore quality specifications in accept-encoding
+        // ex. gzip;q=0.8
+        if (!str.contains(';')) return str;
+        return str.split(';')[0];
+      });
+
+      if (allowedEncodings != null) {
+        for (var encodingName in allowedEncodings) {
+          Converter<List<int>, List<int>> encoder;
+          String key = encodingName;
+
+          if (res.encoders.containsKey(encodingName))
+            encoder = res.encoders[encodingName];
+          else if (encodingName == '*') {
+            encoder = res.encoders[key = res.encoders.keys.first];
+          }
+
+          if (encoder != null) {
+            request.response.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+            outputBuffer = res.encoders[key].convert(outputBuffer);
+            request.response.contentLength = outputBuffer.length;
+            break;
+          }
+        }
+      }
+    }
+
+    request.response
+      ..statusCode = res.statusCode
+      ..cookies.addAll(res.cookies)
+      ..add(outputBuffer);
+
+    return finalizers.then((_) async {
+      request.response.close();
+
+      if (req.injections.containsKey(PoolResource)) {
+        req.injections[PoolResource].release();
+      }
+
+      if (app.logger != null) {
+        var sw = req.grab<Stopwatch>(Stopwatch);
+
+        if (sw.isRunning) {
+          sw?.stop();
+          app.logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
+              ?.elapsedMilliseconds ?? 'unknown'} ms)");
+        }
+      }
+    });
+  }
+
+  Future<RequestContext> createRequestContext(HttpRequest request) {
+    var path = request.uri.path.replaceAll(_straySlashes, '');
+    if (path.length == 0) path = '/';
+    return RequestContext.from(request, app, path).then((req) async {
+      if (_pool != null) req.inject(PoolResource, await _pool.request());
+      if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
+      return req;
+    });
+  }
+
+  Future<ResponseContext> createResponseContext(HttpResponse response,
+      [RequestContext correspondingRequest]) =>
+      new Future<ResponseContext>.value(
+          new ResponseContext(response, app, correspondingRequest)
+            ..serializer = (_serializer ?? god.serialize)
+            ..encoders.addAll(app.encoders ?? {}));
+
+  /// Limits the maximum number of requests to be handled concurrently by this instance.
+  ///
+  /// You can optionally provide a [timeout] to limit the amount of time a request can be
+  /// handled before.
+  void throttle(int maxConcurrentRequests, {Duration timeout}) {
+    _pool = new Pool(maxConcurrentRequests, timeout: timeout);
+  }
 }
\ No newline at end of file
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 60fa04eb..5f590372 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -14,6 +14,7 @@ import 'package:meta/meta.dart';
 import 'package:pool/pool.dart';
 import 'package:tuple/tuple.dart';
 import 'angel_base.dart';
+import 'angel_http.dart';
 import 'controller.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -35,9 +36,9 @@ class Angel extends AngelBase {
       handlerCache = new HashMap();
 
   Router _flattened;
+  AngelHttp _http;
   bool _isProduction;
   Angel _parent;
-  Pool _pool;
   StreamSubscription<HttpRequest> _sub;
   ServerGenerator _serverGenerator = HttpServer.bind;
 
@@ -106,6 +107,9 @@ class Angel extends AngelBase {
   /// These will only not run if a response's `willCloseItself` is set to `true`.
   final List<RequestHandler> responseFinalizers = [];
 
+  /// All global dependencies injected into the application.
+  Map get injections => _injections;
+
   /// Use [configuration] instead.
   @deprecated
   Map get properties {
@@ -275,6 +279,7 @@ class Angel extends AngelBase {
 
   /// Shortcut for adding a middleware to inject a serialize on every request.
   void injectSerializer(ResponseSerializer serializer) {
+    // TODO: Make this public
     _serializer = serializer;
   }
 
@@ -317,6 +322,8 @@ class Angel extends AngelBase {
     else if (result is bool) {
       return result;
     } else if (result != null) {
+      // TODO: Make `serialize` return a bool, return this as the value.
+      // Do this wherever applicable
       res.serialize(result,
           contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
               ContentType.JSON.mimeType);
@@ -325,22 +332,17 @@ class Angel extends AngelBase {
       return res.isOpen;
   }
 
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   Future<RequestContext> createRequestContext(HttpRequest request) {
-    var path = request.uri.path.replaceAll(_straySlashes, '');
-    if (path.length == 0) path = '/';
-    return RequestContext.from(request, this, path).then((req) async {
-      if (_pool != null) req.inject(PoolResource, await _pool.request());
-      if (_injections.isNotEmpty) _injections.forEach(req.inject);
-      return req;
-    });
+    return _http.createRequestContext(request);
   }
 
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   Future<ResponseContext> createResponseContext(HttpResponse response,
           [RequestContext correspondingRequest]) =>
-      new Future<ResponseContext>.value(
-          new ResponseContext(response, this, correspondingRequest)
-            ..serializer = (_serializer ?? god.serialize)
-            ..encoders.addAll(encoders ?? {}));
+      _http.createResponseContext(response, correspondingRequest);
 
   /// Attempts to find a middleware by the given name within this application.
   findMiddleware(key) {
@@ -354,115 +356,19 @@ class Angel extends AngelBase {
     return parent != null ? parent.findProperty(key) : null;
   }
 
-  /// Handles an [AngelHttpException].
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   Future handleAngelHttpException(AngelHttpException e, StackTrace st,
       RequestContext req, ResponseContext res, HttpRequest request,
-      {bool ignoreFinalizers: false}) async {
-    if (req == null || res == null) {
-      try {
-        logger?.severe(e, st);
-        request.response
-          ..statusCode = HttpStatus.INTERNAL_SERVER_ERROR
-          ..write('500 Internal Server Error')
-          ..close();
-      } finally {
-        return null;
-      }
-    }
-
-    if (res.isOpen) {
-      res.statusCode = e.statusCode;
-      var result = await errorHandler(e, req, res);
-      await executeHandler(result, req, res);
-      res.end();
-    }
-
-    return await sendResponse(request, req, res,
+      {bool ignoreFinalizers: false}) {
+    return _http.handleAngelHttpException(e, st, req, res, request,
         ignoreFinalizers: ignoreFinalizers == true);
   }
 
-  /// Handles a single request.
-  Future handleRequest(HttpRequest request) async {
-    var req = await createRequestContext(request);
-    var res = await createResponseContext(request.response, req);
-
-    try {
-      var path = req.path;
-      if (path == '/') path = '';
-
-      Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
-        Router r = _flattened ?? this;
-        var resolved =
-            r.resolveAbsolute(path, method: req.method, strip: false);
-
-        return new Tuple3(
-          new MiddlewarePipeline(resolved).handlers,
-          resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
-          resolved.isEmpty ? null : resolved.first.parseResult,
-        );
-      }
-
-      var cacheKey = req.method + path;
-      var tuple = isProduction
-          ? handlerCache.putIfAbsent(cacheKey, resolveTuple)
-          : resolveTuple();
-
-      //req.inject(Zone, zone);
-      //req.inject(ZoneSpecification, zoneSpec);
-      req.params.addAll(tuple.item2);
-      req.inject(ParseResult, tuple.item3);
-
-      if (logger != null) req.inject(Stopwatch, new Stopwatch()..start());
-
-      var pipeline = tuple.item1;
-
-      for (var handler in pipeline) {
-        try {
-          if (handler == null || !await executeHandler(handler, req, res))
-            break;
-        } on AngelHttpException catch (e, st) {
-          e.stackTrace ??= st;
-          return await handleAngelHttpException(e, st, req, res, request);
-        }
-      }
-
-      try {
-        await sendResponse(request, req, res);
-      } on AngelHttpException catch (e, st) {
-        e.stackTrace ??= st;
-        return await handleAngelHttpException(
-          e,
-          st,
-          req,
-          res,
-          request,
-          ignoreFinalizers: true,
-        );
-      }
-    } on FormatException catch (error, stackTrace) {
-      var e = new AngelHttpException.badRequest(message: error.message);
-
-      if (logger != null) {
-        logger.severe(e.message ?? e.toString(), error, stackTrace);
-      }
-
-      return await handleAngelHttpException(e, stackTrace, req, res, request);
-    } catch (error, stackTrace) {
-      var e = new AngelHttpException(error,
-          stackTrace: stackTrace, message: error?.toString());
-
-      if (logger != null) {
-        logger.severe(e.message ?? e.toString(), error, stackTrace);
-      }
-
-      return await handleAngelHttpException(e, stackTrace, req, res, request);
-    } finally {
-      res.dispose();
-    }
-  }
-
-  Future setupRequest(RequestContext req) async {
-
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
+  Future handleRequest(HttpRequest request) {
+    return _http.handleRequest(request);
   }
 
   /// Runs several optimizations, *if* [isProduction] is `true`.
@@ -519,88 +425,18 @@ class Angel extends AngelBase {
     // return await closureMirror.apply(args).reflectee;
   }
 
-  /// Sends a response.
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
-    if (res.willCloseItself) return new Future.value();
-
-    Future finalizers = ignoreFinalizers == true
-        ? new Future.value()
-        : responseFinalizers.fold<Future>(
-            new Future.value(), (out, f) => out.then((_) => f(req, res)));
-
-    if (res.isOpen) res.end();
-
-    for (var key in res.headers.keys) {
-      request.response.headers.add(key, res.headers[key]);
-    }
-
-    request.response.contentLength = res.buffer.length;
-    request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
-
-    List<int> outputBuffer = res.buffer.toBytes();
-
-    if (res.encoders.isNotEmpty) {
-      var allowedEncodings =
-          req.headers[HttpHeaders.ACCEPT_ENCODING]?.map((str) {
-        // Ignore quality specifications in accept-encoding
-        // ex. gzip;q=0.8
-        if (!str.contains(';')) return str;
-        return str.split(';')[0];
-      });
-
-      if (allowedEncodings != null) {
-        for (var encodingName in allowedEncodings) {
-          Converter<List<int>, List<int>> encoder;
-          String key = encodingName;
-
-          if (res.encoders.containsKey(encodingName))
-            encoder = res.encoders[encodingName];
-          else if (encodingName == '*') {
-            encoder = res.encoders[key = res.encoders.keys.first];
-          }
-
-          if (encoder != null) {
-            request.response.headers.set(HttpHeaders.CONTENT_ENCODING, key);
-            outputBuffer = res.encoders[key].convert(outputBuffer);
-            request.response.contentLength = outputBuffer.length;
-            break;
-          }
-        }
-      }
-    }
-
-    request.response
-      ..statusCode = res.statusCode
-      ..cookies.addAll(res.cookies)
-      ..add(outputBuffer);
-
-    return finalizers.then((_) async {
-      request.response.close();
-
-      if (req.injections.containsKey(PoolResource)) {
-        req.injections[PoolResource].release();
-      }
-
-      if (logger != null) {
-        var sw = req.grab<Stopwatch>(Stopwatch);
-
-        if (sw.isRunning) {
-          sw?.stop();
-          logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
-              ?.elapsedMilliseconds ?? 'unknown'} ms)");
-        }
-      }
-    });
+    return _http.sendResponse(request, req, res);
   }
 
-  /// Limits the maximum number of requests to be handled concurrently by this instance.
-  ///
-  /// You can optionally provide a [timeout] to limit the amount of time a request can be
-  /// handled before.
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   void throttle(int maxConcurrentRequests, {Duration timeout}) {
-    _pool = new Pool(maxConcurrentRequests, timeout: timeout);
+    _http?.throttle(maxConcurrentRequests, timeout: timeout);
   }
 
   /// Applies an [AngelConfigurer] to this instance.

From 37989933c6dbaf32e4b788b8f49fcb934422d7ce Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:48:26 -0500
Subject: [PATCH 172/414] Made `Angel.serializer` public

---
 .idea/workspace.xml          | 46 ++++++++++++++++++------------------
 lib/src/http/angel_http.dart |  2 +-
 lib/src/http/server.dart     | 11 +++++----
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d2b51d8d..c760e7a9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -92,8 +92,8 @@
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-1684">
-                  <caret line="380" column="7" lean-forward="false" selection-start-line="380" selection-start-column="7" selection-end-line="380" selection-end-column="7" />
+                <state relative-caret-position="209">
+                  <caret line="58" column="57" lean-forward="true" selection-start-line="58" selection-start-column="57" selection-end-line="58" selection-end-column="57" />
                   <folding>
                     <element signature="e#38#58#0" expanded="true" />
                   </folding>
@@ -141,8 +141,8 @@
           <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="300">
-                  <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+                <state relative-caret-position="192">
+                  <caret line="219" column="5" lean-forward="true" selection-start-line="219" selection-start-column="5" selection-end-line="219" selection-end-column="5" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                     <element signature="e#1190#1195#0" expanded="false" />
@@ -291,8 +291,8 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -700,14 +700,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="2011000" />
-    </task>
-    <task id="LOCAL-00002" summary="Core done?">
-      <created>1481378740441</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1481378740441</updated>
+      <workItem from="1517973177718" duration="2111000" />
     </task>
     <task id="LOCAL-00003" summary="Fixed todo">
       <created>1481379127310</created>
@@ -1045,7 +1038,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517974351105</updated>
     </task>
-    <option name="localTasksCounter" value="51" />
+    <task id="LOCAL-00051" summary="Basic server methods transferred to AngelHttp">
+      <created>1517975212864</created>
+      <option name="number" value="00051" />
+      <option name="presentableId" value="LOCAL-00051" />
+      <option name="project" value="LOCAL" />
+      <updated>1517975212864</updated>
+    </task>
+    <option name="localTasksCounter" value="52" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1081,7 +1081,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="120047000" />
+    <option name="totallyTimeSpent" value="120147000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1110,7 +1110,7 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1119,6 +1119,7 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1129,7 +1130,6 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1140,7 +1140,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="1.0.7+2" />
     <MESSAGE value="Working on 1.0.8, including performance tuning" />
     <MESSAGE value="Remove reopen" />
     <MESSAGE value="1.0.8" />
@@ -1165,7 +1164,8 @@
     <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
     <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
     <MESSAGE value="Created setup for AngelHttp" />
-    <option name="LAST_COMMIT_MESSAGE" value="Created setup for AngelHttp" />
+    <MESSAGE value="Basic server methods transferred to AngelHttp" />
+    <option name="LAST_COMMIT_MESSAGE" value="Basic server methods transferred to AngelHttp" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1538,8 +1538,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1684">
-          <caret line="380" column="7" lean-forward="false" selection-start-line="380" selection-start-column="7" selection-end-line="380" selection-end-column="7" />
+        <state relative-caret-position="209">
+          <caret line="58" column="57" lean-forward="true" selection-start-line="58" selection-start-column="57" selection-end-line="58" selection-end-column="57" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
@@ -1548,8 +1548,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+        <state relative-caret-position="192">
+          <caret line="219" column="5" lean-forward="true" selection-start-line="219" selection-start-column="5" selection-end-line="219" selection-end-column="5" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
             <element signature="e#1190#1195#0" expanded="false" />
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 2b8f3da2..7182ff45 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -218,7 +218,7 @@ class AngelHttp {
       [RequestContext correspondingRequest]) =>
       new Future<ResponseContext>.value(
           new ResponseContext(response, app, correspondingRequest)
-            ..serializer = (_serializer ?? god.serialize)
+            ..serializer = (app.serializer ?? god.serialize)
             ..encoders.addAll(app.encoders ?? {}));
 
   /// Limits the maximum number of requests to be handled concurrently by this instance.
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 5f590372..459cda83 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -11,7 +11,6 @@ export 'package:container/container.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
-import 'package:pool/pool.dart';
 import 'package:tuple/tuple.dart';
 import 'angel_base.dart';
 import 'angel_http.dart';
@@ -53,7 +52,9 @@ class Angel extends AngelBase {
       createZoneForRequest;
 
   final Map<dynamic, InjectionRequest> _preContained = {};
-  ResponseSerializer _serializer;
+
+  /// A middleware to inject a serialize on every request.
+  ResponseSerializer serializer;
 
   /// A [Map] of dependency data obtained via reflection.
   ///
@@ -277,10 +278,10 @@ class Angel extends AngelBase {
     this.encoders.addAll(encoders);
   }
 
-  /// Shortcut for adding a middleware to inject a serialize on every request.
+  /// Prefer directly setting [serializer].
+  @deprecated
   void injectSerializer(ResponseSerializer serializer) {
-    // TODO: Make this public
-    _serializer = serializer;
+    this.serializer = serializer;
   }
 
   Future getHandlerResult(

From d1a4def0ce4993c66bdf61a141251c597a677274 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:49:59 -0500
Subject: [PATCH 173/414] Remove line that resets `Angel.serializer` on close

---
 .idea/workspace.xml      | 57 ++++++++++++++++++++--------------------
 lib/src/http/server.dart |  2 +-
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c760e7a9..e590d659 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -92,8 +91,8 @@
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="209">
-                  <caret line="58" column="57" lean-forward="true" selection-start-line="58" selection-start-column="57" selection-end-line="58" selection-end-column="57" />
+                <state relative-caret-position="438">
+                  <caret line="229" column="6" lean-forward="false" selection-start-line="229" selection-start-column="6" selection-end-line="229" selection-end-column="6" />
                   <folding>
                     <element signature="e#38#58#0" expanded="true" />
                   </folding>
@@ -141,7 +140,7 @@
           <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="192">
+                <state relative-caret-position="442">
                   <caret line="219" column="5" lean-forward="true" selection-start-line="219" selection-start-column="5" selection-end-line="219" selection-end-column="5" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
@@ -291,8 +290,8 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
       </list>
     </option>
   </component>
@@ -700,14 +699,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="2111000" />
-    </task>
-    <task id="LOCAL-00003" summary="Fixed todo">
-      <created>1481379127310</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1481379127310</updated>
+      <workItem from="1517973177718" duration="2196000" />
     </task>
     <task id="LOCAL-00004" summary="Done???">
       <created>1481389821679</created>
@@ -1045,7 +1037,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517975212864</updated>
     </task>
-    <option name="localTasksCounter" value="52" />
+    <task id="LOCAL-00052" summary="Made `Angel.serializer` public">
+      <created>1517975306169</created>
+      <option name="number" value="00052" />
+      <option name="presentableId" value="LOCAL-00052" />
+      <option name="project" value="LOCAL" />
+      <updated>1517975306169</updated>
+    </task>
+    <option name="localTasksCounter" value="53" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1081,7 +1080,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="120147000" />
+    <option name="totallyTimeSpent" value="120232000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1110,7 +1109,7 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1140,7 +1139,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Working on 1.0.8, including performance tuning" />
     <MESSAGE value="Remove reopen" />
     <MESSAGE value="1.0.8" />
     <MESSAGE value="1.0.9+1" />
@@ -1165,7 +1163,8 @@
     <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
     <MESSAGE value="Created setup for AngelHttp" />
     <MESSAGE value="Basic server methods transferred to AngelHttp" />
-    <option name="LAST_COMMIT_MESSAGE" value="Basic server methods transferred to AngelHttp" />
+    <MESSAGE value="Made `Angel.serializer` public" />
+    <option name="LAST_COMMIT_MESSAGE" value="Made `Angel.serializer` public" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1536,19 +1535,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="58" column="57" lean-forward="true" selection-start-line="58" selection-start-column="57" selection-end-line="58" selection-end-column="57" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
+        <state relative-caret-position="442">
           <caret line="219" column="5" lean-forward="true" selection-start-line="219" selection-start-column="5" selection-end-line="219" selection-end-column="5" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -1558,6 +1547,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="229" column="6" lean-forward="false" selection-start-line="229" selection-start-column="6" selection-end-line="229" selection-end-column="6" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 459cda83..24503a89 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -227,7 +227,7 @@ class Angel extends AngelBase {
     handlerCache.clear();
     _injections.clear();
     encoders.clear();
-    _serializer = god.serialize;
+    //_serializer = god.serialize;
     _children.clear();
     _parent = null;
     logger = null;

From f72b725725883d1bdfec7ff3c7867e795548fca7 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:51:52 -0500
Subject: [PATCH 174/414] Angel._flattened is now accessible via
 `optimizedRouter`

---
 .idea/workspace.xml          | 176 +++++++++++++++++++++++++++--------
 lib/src/http/angel_http.dart |   2 +-
 lib/src/http/server.dart     |   3 +
 3 files changed, 142 insertions(+), 39 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e590d659..4e581b0e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -91,10 +92,54 @@
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="438">
-                  <caret line="229" column="6" lean-forward="false" selection-start-line="229" selection-start-column="6" selection-end-line="229" selection-end-column="6" />
+                <state relative-caret-position="377">
+                  <caret line="63" column="67" lean-forward="false" selection-start-line="63" selection-start-column="67" selection-end-line="63" selection-end-column="67" />
                   <folding>
-                    <element signature="e#38#58#0" expanded="true" />
+                    <element signature="e#1951#2006#0" expanded="false" />
+                    <element signature="e#2482#2489#0" expanded="false" />
+                    <element signature="e#2712#2789#0" expanded="false" />
+                    <element signature="e#3047#3142#0" expanded="false" />
+                    <element signature="e#3430#3484#0" expanded="false" />
+                    <element signature="e#3608#3663#0" expanded="false" />
+                    <element signature="e#3789#3830#0" expanded="false" />
+                    <element signature="e#4143#4405#0" expanded="false" />
+                    <element signature="e#5302#5324#0" expanded="false" />
+                    <element signature="e#5452#5767#0" expanded="false" />
+                    <element signature="e#5878#6225#0" expanded="false" />
+                    <element signature="e#6315#6682#0" expanded="false" />
+                    <element signature="e#6775#7013#0" expanded="false" />
+                    <element signature="e#7017#7084#0" expanded="false" />
+                    <element signature="e#7188#7866#0" expanded="false" />
+                    <element signature="e#8028#8668#0" expanded="false" />
+                    <element signature="e#8780#8815#0" expanded="false" />
+                    <element signature="e#8988#9029#0" expanded="false" />
+                    <element signature="e#9144#9183#0" expanded="false" />
+                    <element signature="e#9268#9985#0" expanded="false" />
+                    <element signature="e#10154#10655#0" expanded="false" />
+                    <element signature="e#10358#10424#0" expanded="false" />
+                    <element signature="e#10792#10845#0" expanded="false" />
+                    <element signature="e#11207#11350#0" expanded="false" />
+                    <element signature="e#11449#11582#0" expanded="false" />
+                    <element signature="e#11829#11955#0" expanded="false" />
+                    <element signature="e#12069#12115#0" expanded="false" />
+                    <element signature="e#12119#12181#0" expanded="false" />
+                    <element signature="e#12497#13129#0" expanded="false" />
+                    <element signature="e#12590#12714#0" expanded="false" />
+                    <element signature="e#12748#12993#0" expanded="false" />
+                    <element signature="e#13133#13191#0" expanded="false" />
+                    <element signature="e#13425#13600#0" expanded="false" />
+                    <element signature="e#13756#13945#0" expanded="false" />
+                    <element signature="e#14144#14199#0" expanded="false" />
+                    <element signature="e#14332#14399#0" expanded="false" />
+                    <element signature="e#14501#14540#0" expanded="false" />
+                    <element signature="e#14544#14605#0" expanded="false" />
+                    <element signature="e#15031#16106#0" expanded="false" />
+                    <element signature="e#16158#16236#0" expanded="false" />
+                    <element signature="e#16304#16566#0" expanded="false" />
+                    <element signature="e#16696#16761#0" expanded="false" />
+                    <element signature="e#16824#17018#0" expanded="false" />
+                    <element signature="e#17022#17050#0" expanded="false" />
+                    <element signature="e#17342#17761#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
@@ -140,17 +185,27 @@
           <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="442">
-                  <caret line="219" column="5" lean-forward="true" selection-start-line="219" selection-start-column="5" selection-end-line="219" selection-end-column="5" />
+                <state relative-caret-position="152">
+                  <caret line="33" column="39" lean-forward="false" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
-                    <element signature="e#1190#1195#0" expanded="false" />
-                    <element signature="e#1498#1523#0" expanded="false" />
+                    <element signature="e#1191#1196#0" expanded="false" />
+                    <element signature="e#1499#1524#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/example/json.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="233">
+                  <caret line="42" column="6" lean-forward="false" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -290,8 +345,8 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -699,14 +754,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="2196000" />
-    </task>
-    <task id="LOCAL-00004" summary="Done???">
-      <created>1481389821679</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1481389821679</updated>
+      <workItem from="1517973177718" duration="2311000" />
     </task>
     <task id="LOCAL-00005" summary="findExpose">
       <created>1483150316137</created>
@@ -1044,7 +1092,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517975306169</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="Remove line that resets `Angel.serializer` on close">
+      <created>1517975399809</created>
+      <option name="number" value="00053" />
+      <option name="presentableId" value="LOCAL-00053" />
+      <option name="project" value="LOCAL" />
+      <updated>1517975399809</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1080,7 +1135,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="120232000" />
+    <option name="totallyTimeSpent" value="120347000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1099,7 +1154,7 @@
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1139,7 +1194,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Remove reopen" />
     <MESSAGE value="1.0.8" />
     <MESSAGE value="1.0.9+1" />
     <MESSAGE value="1.1.0-alpha start" />
@@ -1164,20 +1218,14 @@
     <MESSAGE value="Created setup for AngelHttp" />
     <MESSAGE value="Basic server methods transferred to AngelHttp" />
     <MESSAGE value="Made `Angel.serializer` public" />
-    <option name="LAST_COMMIT_MESSAGE" value="Made `Angel.serializer` public" />
+    <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove line that resets `Angel.serializer` on close" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/extension.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2001">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/developer.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="390">
@@ -1535,24 +1583,76 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="219" column="5" lean-forward="true" selection-start-line="219" selection-start-column="5" selection-end-line="219" selection-end-column="5" />
+        <state relative-caret-position="377">
+          <caret line="63" column="67" lean-forward="false" selection-start-line="63" selection-start-column="67" selection-end-line="63" selection-end-column="67" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
-            <element signature="e#1190#1195#0" expanded="false" />
-            <element signature="e#1498#1523#0" expanded="false" />
+            <element signature="e#1951#2006#0" expanded="false" />
+            <element signature="e#2482#2489#0" expanded="false" />
+            <element signature="e#2712#2789#0" expanded="false" />
+            <element signature="e#3047#3142#0" expanded="false" />
+            <element signature="e#3430#3484#0" expanded="false" />
+            <element signature="e#3608#3663#0" expanded="false" />
+            <element signature="e#3789#3830#0" expanded="false" />
+            <element signature="e#4143#4405#0" expanded="false" />
+            <element signature="e#5302#5324#0" expanded="false" />
+            <element signature="e#5452#5767#0" expanded="false" />
+            <element signature="e#5878#6225#0" expanded="false" />
+            <element signature="e#6315#6682#0" expanded="false" />
+            <element signature="e#6775#7013#0" expanded="false" />
+            <element signature="e#7017#7084#0" expanded="false" />
+            <element signature="e#7188#7866#0" expanded="false" />
+            <element signature="e#8028#8668#0" expanded="false" />
+            <element signature="e#8780#8815#0" expanded="false" />
+            <element signature="e#8988#9029#0" expanded="false" />
+            <element signature="e#9144#9183#0" expanded="false" />
+            <element signature="e#9268#9985#0" expanded="false" />
+            <element signature="e#10154#10655#0" expanded="false" />
+            <element signature="e#10358#10424#0" expanded="false" />
+            <element signature="e#10792#10845#0" expanded="false" />
+            <element signature="e#11207#11350#0" expanded="false" />
+            <element signature="e#11449#11582#0" expanded="false" />
+            <element signature="e#11829#11955#0" expanded="false" />
+            <element signature="e#12069#12115#0" expanded="false" />
+            <element signature="e#12119#12181#0" expanded="false" />
+            <element signature="e#12497#13129#0" expanded="false" />
+            <element signature="e#12590#12714#0" expanded="false" />
+            <element signature="e#12748#12993#0" expanded="false" />
+            <element signature="e#13133#13191#0" expanded="false" />
+            <element signature="e#13425#13600#0" expanded="false" />
+            <element signature="e#13756#13945#0" expanded="false" />
+            <element signature="e#14144#14199#0" expanded="false" />
+            <element signature="e#14332#14399#0" expanded="false" />
+            <element signature="e#14501#14540#0" expanded="false" />
+            <element signature="e#14544#14605#0" expanded="false" />
+            <element signature="e#15031#16106#0" expanded="false" />
+            <element signature="e#16158#16236#0" expanded="false" />
+            <element signature="e#16304#16566#0" expanded="false" />
+            <element signature="e#16696#16761#0" expanded="false" />
+            <element signature="e#16824#17018#0" expanded="false" />
+            <element signature="e#17022#17050#0" expanded="false" />
+            <element signature="e#17342#17761#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="229" column="6" lean-forward="false" selection-start-line="229" selection-start-column="6" selection-end-line="229" selection-end-column="6" />
+        <state relative-caret-position="233">
+          <caret line="42" column="6" lean-forward="false" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="33" column="39" lean-forward="false" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#1191#1196#0" expanded="false" />
+            <element signature="e#1499#1524#0" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 7182ff45..7b0d67f8 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -31,7 +31,7 @@ class AngelHttp {
       if (path == '/') path = '';
 
       Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
-        Router r = _flattened ?? this;
+        Router r = app.optimizedRouter;
         var resolved =
         r.resolveAbsolute(path, method: req.method, strip: false);
 
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 24503a89..3d58045d 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -61,6 +61,9 @@ class Angel extends AngelBase {
   /// You may modify this [Map] yourself if you intend to avoid reflection entirely.
   Map<dynamic, InjectionRequest> get preContained => _preContained;
 
+  /// Returns the [flatten]ed version of this router in production.
+  Router get optimizedRouter => _flattened ?? this;
+
   /// Determines whether to allow HTTP request method overrides.
   bool allowMethodOverrides = true;
 

From f4d9cb3b8e6225f6e351282d1fbcea812d73a089 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 22:54:24 -0500
Subject: [PATCH 175/414] Used function syntax, deprecated `ResponseSerializer`
 typedef

---
 .idea/workspace.xml                | 285 +++++++++++++++--------------
 example/json.dart                  |   2 +-
 lib/src/http/response_context.dart |   5 +-
 lib/src/http/server.dart           |   4 +-
 4 files changed, 150 insertions(+), 146 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4e581b0e..dc2b10f1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Changed signature of serializer">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -39,11 +40,11 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="371">
-                  <caret line="310" column="28" lean-forward="false" selection-start-line="310" selection-start-column="28" selection-end-line="310" selection-end-column="28" />
+                <state relative-caret-position="239">
+                  <caret line="76" column="26" lean-forward="false" selection-start-line="76" selection-start-column="26" selection-end-line="76" selection-end-column="26" />
                   <folding />
                 </state>
               </provider>
@@ -89,57 +90,56 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
+          <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="377">
-                  <caret line="63" column="67" lean-forward="false" selection-start-line="63" selection-start-column="67" selection-end-line="63" selection-end-column="67" />
+                <state relative-caret-position="170">
+                  <caret line="285" column="30" lean-forward="true" selection-start-line="285" selection-start-column="30" selection-end-line="285" selection-end-column="30" />
                   <folding>
-                    <element signature="e#1951#2006#0" expanded="false" />
-                    <element signature="e#2482#2489#0" expanded="false" />
-                    <element signature="e#2712#2789#0" expanded="false" />
-                    <element signature="e#3047#3142#0" expanded="false" />
-                    <element signature="e#3430#3484#0" expanded="false" />
-                    <element signature="e#3608#3663#0" expanded="false" />
-                    <element signature="e#3789#3830#0" expanded="false" />
-                    <element signature="e#4143#4405#0" expanded="false" />
-                    <element signature="e#5302#5324#0" expanded="false" />
-                    <element signature="e#5452#5767#0" expanded="false" />
-                    <element signature="e#5878#6225#0" expanded="false" />
-                    <element signature="e#6315#6682#0" expanded="false" />
-                    <element signature="e#6775#7013#0" expanded="false" />
-                    <element signature="e#7017#7084#0" expanded="false" />
-                    <element signature="e#7188#7866#0" expanded="false" />
-                    <element signature="e#8028#8668#0" expanded="false" />
-                    <element signature="e#8780#8815#0" expanded="false" />
-                    <element signature="e#8988#9029#0" expanded="false" />
-                    <element signature="e#9144#9183#0" expanded="false" />
-                    <element signature="e#9268#9985#0" expanded="false" />
-                    <element signature="e#10154#10655#0" expanded="false" />
-                    <element signature="e#10358#10424#0" expanded="false" />
-                    <element signature="e#10792#10845#0" expanded="false" />
-                    <element signature="e#11207#11350#0" expanded="false" />
-                    <element signature="e#11449#11582#0" expanded="false" />
-                    <element signature="e#11829#11955#0" expanded="false" />
-                    <element signature="e#12069#12115#0" expanded="false" />
-                    <element signature="e#12119#12181#0" expanded="false" />
-                    <element signature="e#12497#13129#0" expanded="false" />
-                    <element signature="e#12590#12714#0" expanded="false" />
-                    <element signature="e#12748#12993#0" expanded="false" />
-                    <element signature="e#13133#13191#0" expanded="false" />
-                    <element signature="e#13425#13600#0" expanded="false" />
-                    <element signature="e#13756#13945#0" expanded="false" />
-                    <element signature="e#14144#14199#0" expanded="false" />
-                    <element signature="e#14332#14399#0" expanded="false" />
-                    <element signature="e#14501#14540#0" expanded="false" />
-                    <element signature="e#14544#14605#0" expanded="false" />
-                    <element signature="e#15031#16106#0" expanded="false" />
-                    <element signature="e#16158#16236#0" expanded="false" />
-                    <element signature="e#16304#16566#0" expanded="false" />
-                    <element signature="e#16696#16761#0" expanded="false" />
-                    <element signature="e#16824#17018#0" expanded="false" />
-                    <element signature="e#17022#17050#0" expanded="false" />
-                    <element signature="e#17342#17761#0" expanded="false" />
+                    <element signature="e#38#58#0" expanded="true" />
+                    <element signature="e#1957#2012#0" expanded="false" />
+                    <element signature="e#2488#2495#0" expanded="false" />
+                    <element signature="e#2718#2795#0" expanded="false" />
+                    <element signature="e#3053#3148#0" expanded="false" />
+                    <element signature="e#3436#3490#0" expanded="false" />
+                    <element signature="e#3614#3669#0" expanded="false" />
+                    <element signature="e#3795#3836#0" expanded="false" />
+                    <element signature="e#4149#4411#0" expanded="false" />
+                    <element signature="e#5308#5330#0" expanded="false" />
+                    <element signature="e#5884#6231#0" expanded="false" />
+                    <element signature="e#6321#6688#0" expanded="false" />
+                    <element signature="e#6781#7019#0" expanded="false" />
+                    <element signature="e#7023#7090#0" expanded="false" />
+                    <element signature="e#7194#7872#0" expanded="false" />
+                    <element signature="e#8034#8674#0" expanded="false" />
+                    <element signature="e#8786#8821#0" expanded="false" />
+                    <element signature="e#8994#9035#0" expanded="false" />
+                    <element signature="e#9265#9982#0" expanded="false" />
+                    <element signature="e#10151#10652#0" expanded="false" />
+                    <element signature="e#10355#10421#0" expanded="false" />
+                    <element signature="e#10789#10842#0" expanded="false" />
+                    <element signature="e#11204#11347#0" expanded="false" />
+                    <element signature="e#11446#11579#0" expanded="false" />
+                    <element signature="e#11826#11952#0" expanded="false" />
+                    <element signature="e#12066#12112#0" expanded="false" />
+                    <element signature="e#12116#12178#0" expanded="false" />
+                    <element signature="e#12494#13126#0" expanded="false" />
+                    <element signature="e#12587#12711#0" expanded="false" />
+                    <element signature="e#12745#12990#0" expanded="false" />
+                    <element signature="e#13130#13188#0" expanded="false" />
+                    <element signature="e#13422#13597#0" expanded="false" />
+                    <element signature="e#13753#13942#0" expanded="false" />
+                    <element signature="e#14141#14196#0" expanded="false" />
+                    <element signature="e#14329#14396#0" expanded="false" />
+                    <element signature="e#14498#14537#0" expanded="false" />
+                    <element signature="e#14541#14602#0" expanded="false" />
+                    <element signature="e#15028#16103#0" expanded="false" />
+                    <element signature="e#16155#16233#0" expanded="false" />
+                    <element signature="e#16301#16563#0" expanded="false" />
+                    <element signature="e#16693#16758#0" expanded="false" />
+                    <element signature="e#16821#17015#0" expanded="false" />
+                    <element signature="e#17019#17047#0" expanded="false" />
+                    <element signature="e#17339#17758#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
@@ -182,11 +182,11 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="152">
-                  <caret line="33" column="39" lean-forward="false" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
+                <state relative-caret-position="430">
+                  <caret line="38" column="52" lean-forward="true" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                     <element signature="e#1191#1196#0" expanded="false" />
@@ -196,11 +196,11 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
+          <file leaf-file-name="json.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/example/json.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="233">
-                  <caret line="42" column="6" lean-forward="false" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
+                <state relative-caret-position="281">
+                  <caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
                   <folding />
                 </state>
               </provider>
@@ -219,8 +219,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>sendResponse</find>
-      <find>addStream</find>
       <find>Lo</find>
       <find>useStr</find>
       <find>_injections?</find>
@@ -247,8 +245,10 @@
       <find>((cre)|(upd))atedAt</find>
       <find>'((cre)|(upd))atedAt'</find>
       <find>handleReque</find>
-      <find>injectSeri</find>
       <find>optimize</find>
+      <find>serializer`</find>
+      <find>serializer</find>
+      <find>injectSeri</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -314,7 +314,6 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
@@ -341,12 +340,13 @@
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       </list>
     </option>
   </component>
@@ -754,14 +754,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="2311000" />
-    </task>
-    <task id="LOCAL-00005" summary="findExpose">
-      <created>1483150316137</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1483150316138</updated>
+      <workItem from="1517973177718" duration="2463000" />
     </task>
     <task id="LOCAL-00006" summary="I love stack overflows!!!">
       <created>1483150975010</created>
@@ -1099,7 +1092,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517975399809</updated>
     </task>
-    <option name="localTasksCounter" value="54" />
+    <task id="LOCAL-00054" summary="Angel._flattened is now accessible via `optimizedRouter`">
+      <created>1517975513004</created>
+      <option name="number" value="00054" />
+      <option name="presentableId" value="LOCAL-00054" />
+      <option name="project" value="LOCAL" />
+      <updated>1517975513004</updated>
+    </task>
+    <option name="localTasksCounter" value="55" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1135,7 +1135,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="120347000" />
+    <option name="totallyTimeSpent" value="120499000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1194,7 +1194,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="1.0.8" />
     <MESSAGE value="1.0.9+1" />
     <MESSAGE value="1.1.0-alpha start" />
     <MESSAGE value="1.1.0-alpha" />
@@ -1219,10 +1218,13 @@
     <MESSAGE value="Basic server methods transferred to AngelHttp" />
     <MESSAGE value="Made `Angel.serializer` public" />
     <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove line that resets `Angel.serializer` on close" />
+    <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Angel._flattened is now accessible via `optimizedRouter`" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="1" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
@@ -1533,14 +1535,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="371">
-          <caret line="310" column="28" lean-forward="false" selection-start-line="310" selection-start-column="28" selection-end-line="310" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -1583,80 +1577,87 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="377">
-          <caret line="63" column="67" lean-forward="false" selection-start-line="63" selection-start-column="67" selection-end-line="63" selection-end-column="67" />
+        <state relative-caret-position="430">
+          <caret line="38" column="52" lean-forward="true" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
           <folding>
-            <element signature="e#1951#2006#0" expanded="false" />
-            <element signature="e#2482#2489#0" expanded="false" />
-            <element signature="e#2712#2789#0" expanded="false" />
-            <element signature="e#3047#3142#0" expanded="false" />
-            <element signature="e#3430#3484#0" expanded="false" />
-            <element signature="e#3608#3663#0" expanded="false" />
-            <element signature="e#3789#3830#0" expanded="false" />
-            <element signature="e#4143#4405#0" expanded="false" />
-            <element signature="e#5302#5324#0" expanded="false" />
-            <element signature="e#5452#5767#0" expanded="false" />
-            <element signature="e#5878#6225#0" expanded="false" />
-            <element signature="e#6315#6682#0" expanded="false" />
-            <element signature="e#6775#7013#0" expanded="false" />
-            <element signature="e#7017#7084#0" expanded="false" />
-            <element signature="e#7188#7866#0" expanded="false" />
-            <element signature="e#8028#8668#0" expanded="false" />
-            <element signature="e#8780#8815#0" expanded="false" />
-            <element signature="e#8988#9029#0" expanded="false" />
-            <element signature="e#9144#9183#0" expanded="false" />
-            <element signature="e#9268#9985#0" expanded="false" />
-            <element signature="e#10154#10655#0" expanded="false" />
-            <element signature="e#10358#10424#0" expanded="false" />
-            <element signature="e#10792#10845#0" expanded="false" />
-            <element signature="e#11207#11350#0" expanded="false" />
-            <element signature="e#11449#11582#0" expanded="false" />
-            <element signature="e#11829#11955#0" expanded="false" />
-            <element signature="e#12069#12115#0" expanded="false" />
-            <element signature="e#12119#12181#0" expanded="false" />
-            <element signature="e#12497#13129#0" expanded="false" />
-            <element signature="e#12590#12714#0" expanded="false" />
-            <element signature="e#12748#12993#0" expanded="false" />
-            <element signature="e#13133#13191#0" expanded="false" />
-            <element signature="e#13425#13600#0" expanded="false" />
-            <element signature="e#13756#13945#0" expanded="false" />
-            <element signature="e#14144#14199#0" expanded="false" />
-            <element signature="e#14332#14399#0" expanded="false" />
-            <element signature="e#14501#14540#0" expanded="false" />
-            <element signature="e#14544#14605#0" expanded="false" />
-            <element signature="e#15031#16106#0" expanded="false" />
-            <element signature="e#16158#16236#0" expanded="false" />
-            <element signature="e#16304#16566#0" expanded="false" />
-            <element signature="e#16696#16761#0" expanded="false" />
-            <element signature="e#16824#17018#0" expanded="false" />
-            <element signature="e#17022#17050#0" expanded="false" />
-            <element signature="e#17342#17761#0" expanded="false" />
+            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#1191#1196#0" expanded="false" />
+            <element signature="e#1499#1524#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="42" column="6" lean-forward="false" selection-start-line="42" selection-start-column="6" selection-end-line="42" selection-end-column="6" />
+        <state relative-caret-position="281">
+          <caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="33" column="39" lean-forward="false" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
+        <state relative-caret-position="170">
+          <caret line="285" column="30" lean-forward="true" selection-start-line="285" selection-start-column="30" selection-end-line="285" selection-end-column="30" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
-            <element signature="e#1191#1196#0" expanded="false" />
-            <element signature="e#1499#1524#0" expanded="false" />
+            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#1957#2012#0" expanded="false" />
+            <element signature="e#2488#2495#0" expanded="false" />
+            <element signature="e#2718#2795#0" expanded="false" />
+            <element signature="e#3053#3148#0" expanded="false" />
+            <element signature="e#3436#3490#0" expanded="false" />
+            <element signature="e#3614#3669#0" expanded="false" />
+            <element signature="e#3795#3836#0" expanded="false" />
+            <element signature="e#4149#4411#0" expanded="false" />
+            <element signature="e#5308#5330#0" expanded="false" />
+            <element signature="e#5884#6231#0" expanded="false" />
+            <element signature="e#6321#6688#0" expanded="false" />
+            <element signature="e#6781#7019#0" expanded="false" />
+            <element signature="e#7023#7090#0" expanded="false" />
+            <element signature="e#7194#7872#0" expanded="false" />
+            <element signature="e#8034#8674#0" expanded="false" />
+            <element signature="e#8786#8821#0" expanded="false" />
+            <element signature="e#8994#9035#0" expanded="false" />
+            <element signature="e#9265#9982#0" expanded="false" />
+            <element signature="e#10151#10652#0" expanded="false" />
+            <element signature="e#10355#10421#0" expanded="false" />
+            <element signature="e#10789#10842#0" expanded="false" />
+            <element signature="e#11204#11347#0" expanded="false" />
+            <element signature="e#11446#11579#0" expanded="false" />
+            <element signature="e#11826#11952#0" expanded="false" />
+            <element signature="e#12066#12112#0" expanded="false" />
+            <element signature="e#12116#12178#0" expanded="false" />
+            <element signature="e#12494#13126#0" expanded="false" />
+            <element signature="e#12587#12711#0" expanded="false" />
+            <element signature="e#12745#12990#0" expanded="false" />
+            <element signature="e#13130#13188#0" expanded="false" />
+            <element signature="e#13422#13597#0" expanded="false" />
+            <element signature="e#13753#13942#0" expanded="false" />
+            <element signature="e#14141#14196#0" expanded="false" />
+            <element signature="e#14329#14396#0" expanded="false" />
+            <element signature="e#14498#14537#0" expanded="false" />
+            <element signature="e#14541#14602#0" expanded="false" />
+            <element signature="e#15028#16103#0" expanded="false" />
+            <element signature="e#16155#16233#0" expanded="false" />
+            <element signature="e#16301#16563#0" expanded="false" />
+            <element signature="e#16693#16758#0" expanded="false" />
+            <element signature="e#16821#17015#0" expanded="false" />
+            <element signature="e#17019#17047#0" expanded="false" />
+            <element signature="e#17339#17758#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="239">
+          <caret line="76" column="26" lean-forward="false" selection-start-line="76" selection-start-column="26" selection-end-line="76" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/example/json.dart b/example/json.dart
index d13447f5..684a7056 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -40,7 +40,7 @@ serverMain(_) async {
   // Performance tuning
   app
     ..lazyParseBodies = true
-    ..injectSerializer(JSON.encode);
+    ..serializer = JSON.encode;
 
   app.errorHandler = (e, req, res) {
     print(e.message ?? e.error ?? e);
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index c6d80a0b..8a5d3c19 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -17,6 +17,9 @@ final RegExp _contentType =
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// Serializes response data into a String.
+///
+/// Prefer the String Function(dynamic) syntax.
+@deprecated
 typedef String ResponseSerializer(data);
 
 /// A convenience wrapper around an outgoing HTTP request.
@@ -71,7 +74,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// ```dart
   /// app.injectSerializer(JSON.encode);
   /// ```
-  ResponseSerializer serializer = god.serialize;
+  String Function(dynamic) serializer = god.serialize;
 
   /// This response's status code.
   int get statusCode => _statusCode;
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 3d58045d..1e28befa 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -54,7 +54,7 @@ class Angel extends AngelBase {
   final Map<dynamic, InjectionRequest> _preContained = {};
 
   /// A middleware to inject a serialize on every request.
-  ResponseSerializer serializer;
+  String Function(dynamic) serializer;
 
   /// A [Map] of dependency data obtained via reflection.
   ///
@@ -283,7 +283,7 @@ class Angel extends AngelBase {
 
   /// Prefer directly setting [serializer].
   @deprecated
-  void injectSerializer(ResponseSerializer serializer) {
+  void injectSerializer(String serializer(x)) {
     this.serializer = serializer;
   }
 

From e65025d2ea58bbbdc08c5c3e1e158a458876b8b8 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:10:49 -0500
Subject: [PATCH 176/414] Deprecated all serving logic in `Angel`

---
 .idea/workspace.xml          | 362 +++++++++--------------------------
 lib/src/http/angel_http.dart |  66 +++++++
 lib/src/http/server.dart     |  75 +++-----
 3 files changed, 183 insertions(+), 320 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dc2b10f1..758f51b5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Changed signature of serializer">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Used function syntax, deprecated `ResponseSerializer` typedef">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -30,176 +29,40 @@
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-          <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="0">
-                  <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="239">
-                  <caret line="76" column="26" lean-forward="false" selection-start-line="76" selection-start-column="26" selection-end-line="76" selection-end-column="26" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="245">
-                  <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
-                  <folding>
-                    <element signature="e#0#20#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/README.md">
-              <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-                <state split_layout="SPLIT">
-                  <first_editor relative-caret-position="0">
-                    <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-                    <folding>
-                      <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
-                    </folding>
-                  </first_editor>
-                  <second_editor />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-              <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-                <state split_layout="SPLIT">
-                  <first_editor relative-caret-position="45">
-                    <caret line="3" column="45" lean-forward="false" selection-start-line="3" selection-start-column="45" selection-end-line="3" selection-end-column="45" />
-                    <folding />
-                  </first_editor>
-                  <second_editor />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+          <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="170">
-                  <caret line="285" column="30" lean-forward="true" selection-start-line="285" selection-start-column="30" selection-end-line="285" selection-end-column="30" />
+                <state relative-caret-position="167">
+                  <caret line="348" column="3" lean-forward="true" selection-start-line="348" selection-start-column="3" selection-end-line="348" selection-end-column="3" />
                   <folding>
                     <element signature="e#38#58#0" expanded="true" />
-                    <element signature="e#1957#2012#0" expanded="false" />
-                    <element signature="e#2488#2495#0" expanded="false" />
-                    <element signature="e#2718#2795#0" expanded="false" />
-                    <element signature="e#3053#3148#0" expanded="false" />
-                    <element signature="e#3436#3490#0" expanded="false" />
-                    <element signature="e#3614#3669#0" expanded="false" />
-                    <element signature="e#3795#3836#0" expanded="false" />
-                    <element signature="e#4149#4411#0" expanded="false" />
-                    <element signature="e#5308#5330#0" expanded="false" />
-                    <element signature="e#5884#6231#0" expanded="false" />
-                    <element signature="e#6321#6688#0" expanded="false" />
-                    <element signature="e#6781#7019#0" expanded="false" />
-                    <element signature="e#7023#7090#0" expanded="false" />
-                    <element signature="e#7194#7872#0" expanded="false" />
-                    <element signature="e#8034#8674#0" expanded="false" />
-                    <element signature="e#8786#8821#0" expanded="false" />
-                    <element signature="e#8994#9035#0" expanded="false" />
-                    <element signature="e#9265#9982#0" expanded="false" />
-                    <element signature="e#10151#10652#0" expanded="false" />
-                    <element signature="e#10355#10421#0" expanded="false" />
-                    <element signature="e#10789#10842#0" expanded="false" />
-                    <element signature="e#11204#11347#0" expanded="false" />
-                    <element signature="e#11446#11579#0" expanded="false" />
-                    <element signature="e#11826#11952#0" expanded="false" />
-                    <element signature="e#12066#12112#0" expanded="false" />
-                    <element signature="e#12116#12178#0" expanded="false" />
-                    <element signature="e#12494#13126#0" expanded="false" />
-                    <element signature="e#12587#12711#0" expanded="false" />
-                    <element signature="e#12745#12990#0" expanded="false" />
-                    <element signature="e#13130#13188#0" expanded="false" />
-                    <element signature="e#13422#13597#0" expanded="false" />
-                    <element signature="e#13753#13942#0" expanded="false" />
-                    <element signature="e#14141#14196#0" expanded="false" />
-                    <element signature="e#14329#14396#0" expanded="false" />
-                    <element signature="e#14498#14537#0" expanded="false" />
-                    <element signature="e#14541#14602#0" expanded="false" />
-                    <element signature="e#15028#16103#0" expanded="false" />
-                    <element signature="e#16155#16233#0" expanded="false" />
-                    <element signature="e#16301#16563#0" expanded="false" />
-                    <element signature="e#16693#16758#0" expanded="false" />
-                    <element signature="e#16821#17015#0" expanded="false" />
-                    <element signature="e#17019#17047#0" expanded="false" />
-                    <element signature="e#17339#17758#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="0">
-                  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-                  <folding>
-                    <element signature="e#0#22#0" expanded="true" />
-                    <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1980">
-                  <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="router.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="4815">
-                  <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
         </leaf>
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="430">
-                  <caret line="38" column="52" lean-forward="true" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
+                <state relative-caret-position="273">
+                  <caret line="41" column="0" lean-forward="true" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
-                    <element signature="e#1191#1196#0" expanded="false" />
-                    <element signature="e#1499#1524#0" expanded="false" />
+                    <element signature="e#3455#3460#0" expanded="false" />
+                    <element signature="e#3763#3788#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="json.dart" pinned="false" current-in-tab="true">
+          <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/example/json.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="281">
+                <state relative-caret-position="452">
                   <caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
                   <folding />
                 </state>
@@ -219,8 +82,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Lo</find>
-      <find>useStr</find>
       <find>_injections?</find>
       <find>createRes</find>
       <find>requestedUrl</find>
@@ -249,6 +110,8 @@
       <find>serializer`</find>
       <find>serializer</find>
       <find>injectSeri</find>
+      <find>close</find>
+      <find>shutdown</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -343,10 +206,10 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
       </list>
     </option>
   </component>
@@ -754,14 +617,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="2463000" />
-    </task>
-    <task id="LOCAL-00006" summary="I love stack overflows!!!">
-      <created>1483150975010</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1483150975010</updated>
+      <workItem from="1517973177718" duration="3447000" />
     </task>
     <task id="LOCAL-00007" summary="Fixed last batch?">
       <created>1492278141283</created>
@@ -1099,7 +955,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517975513004</updated>
     </task>
-    <option name="localTasksCounter" value="55" />
+    <task id="LOCAL-00055" summary="Used function syntax, deprecated `ResponseSerializer` typedef">
+      <created>1517975664302</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <option name="project" value="LOCAL" />
+      <updated>1517975664302</updated>
+    </task>
+    <option name="localTasksCounter" value="56" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1135,7 +998,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="120499000" />
+    <option name="totallyTimeSpent" value="121483000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1154,7 +1017,7 @@
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1194,7 +1057,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="1.0.9+1" />
     <MESSAGE value="1.1.0-alpha start" />
     <MESSAGE value="1.1.0-alpha" />
     <MESSAGE value="pubspec" />
@@ -1219,11 +1081,12 @@
     <MESSAGE value="Made `Angel.serializer` public" />
     <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
     <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Angel._flattened is now accessible via `optimizedRouter`" />
+    <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
+    <option name="LAST_COMMIT_MESSAGE" value="Used function syntax, deprecated `ResponseSerializer` typedef" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="1" />
+      <option name="time" value="3" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1500,41 +1363,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4815">
-          <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-            <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1980">
-          <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -1543,13 +1371,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="452">
+          <caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1577,87 +1403,81 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="38" column="52" lean-forward="true" selection-start-line="38" selection-start-column="52" selection-end-line="38" selection-end-column="52" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-            <element signature="e#1191#1196#0" expanded="false" />
-            <element signature="e#1499#1524#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
+        <state relative-caret-position="647">
+          <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="285" column="30" lean-forward="true" selection-start-line="285" selection-start-column="30" selection-end-line="285" selection-end-column="30" />
+        <state relative-caret-position="82">
+          <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
-            <element signature="e#1957#2012#0" expanded="false" />
-            <element signature="e#2488#2495#0" expanded="false" />
-            <element signature="e#2718#2795#0" expanded="false" />
-            <element signature="e#3053#3148#0" expanded="false" />
-            <element signature="e#3436#3490#0" expanded="false" />
-            <element signature="e#3614#3669#0" expanded="false" />
-            <element signature="e#3795#3836#0" expanded="false" />
-            <element signature="e#4149#4411#0" expanded="false" />
-            <element signature="e#5308#5330#0" expanded="false" />
-            <element signature="e#5884#6231#0" expanded="false" />
-            <element signature="e#6321#6688#0" expanded="false" />
-            <element signature="e#6781#7019#0" expanded="false" />
-            <element signature="e#7023#7090#0" expanded="false" />
-            <element signature="e#7194#7872#0" expanded="false" />
-            <element signature="e#8034#8674#0" expanded="false" />
-            <element signature="e#8786#8821#0" expanded="false" />
-            <element signature="e#8994#9035#0" expanded="false" />
-            <element signature="e#9265#9982#0" expanded="false" />
-            <element signature="e#10151#10652#0" expanded="false" />
-            <element signature="e#10355#10421#0" expanded="false" />
-            <element signature="e#10789#10842#0" expanded="false" />
-            <element signature="e#11204#11347#0" expanded="false" />
-            <element signature="e#11446#11579#0" expanded="false" />
-            <element signature="e#11826#11952#0" expanded="false" />
-            <element signature="e#12066#12112#0" expanded="false" />
-            <element signature="e#12116#12178#0" expanded="false" />
-            <element signature="e#12494#13126#0" expanded="false" />
-            <element signature="e#12587#12711#0" expanded="false" />
-            <element signature="e#12745#12990#0" expanded="false" />
-            <element signature="e#13130#13188#0" expanded="false" />
-            <element signature="e#13422#13597#0" expanded="false" />
-            <element signature="e#13753#13942#0" expanded="false" />
-            <element signature="e#14141#14196#0" expanded="false" />
-            <element signature="e#14329#14396#0" expanded="false" />
-            <element signature="e#14498#14537#0" expanded="false" />
-            <element signature="e#14541#14602#0" expanded="false" />
-            <element signature="e#15028#16103#0" expanded="false" />
-            <element signature="e#16155#16233#0" expanded="false" />
-            <element signature="e#16301#16563#0" expanded="false" />
-            <element signature="e#16693#16758#0" expanded="false" />
-            <element signature="e#16821#17015#0" expanded="false" />
-            <element signature="e#17019#17047#0" expanded="false" />
-            <element signature="e#17339#17758#0" expanded="false" />
+            <element signature="e#0#22#0" expanded="true" />
+            <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="245">
+          <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
+        <state relative-caret-position="1005">
           <caret line="76" column="26" lean-forward="false" selection-start-line="76" selection-start-column="26" selection-end-line="76" selection-end-column="26" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="24" column="34" lean-forward="false" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="41" column="0" lean-forward="true" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#3455#3460#0" expanded="false" />
+            <element signature="e#3763#3788#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="348" column="3" lean-forward="true" selection-start-line="348" selection-start-column="3" selection-end-line="348" selection-end-column="3" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 7b0d67f8..605a7bba 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -16,11 +16,77 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 /// Adapts `dart:io`'s [HttpServer] to serve Angel.
 class AngelHttp {
   final Angel app;
+  bool _closed = false;
+  HttpServer _server;
+  Future<HttpServer> Function(dynamic,int) _serverGenerator = HttpServer.bind;
+  StreamSubscription<HttpRequest> _sub;
 
   Pool _pool;
 
   AngelHttp(this.app);
 
+  /// An instance mounted on a server started by the [serverGenerator].
+  factory AngelHttp.custom(Angel app, ServerGenerator serverGenerator) {
+    return new AngelHttp(app).._serverGenerator = serverGenerator;
+  }
+
+  factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context) {
+    var http = new AngelHttp(app);
+
+    http._serverGenerator = (InternetAddress address, int port) async {
+      return await HttpServer.bindSecure(address, port, context);
+    };
+
+    return http;
+  }
+
+  /// Creates an HTTPS server.
+  ///
+  /// Provide paths to a certificate chain and server key (both .pem).
+  /// If no password is provided, a random one will be generated upon running
+  /// the server.
+  factory AngelHttp.secure(Angel app, String certificateChainPath, String serverKeyPath,
+      {bool debug: false, String password}) {
+    var certificateChain =
+    Platform.script.resolve(certificateChainPath).toFilePath();
+    var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
+    var serverContext = new SecurityContext();
+    serverContext.useCertificateChain(certificateChain, password: password);
+    serverContext.usePrivateKey(serverKey, password: password);
+
+    return new AngelHttp.fromSecurityContext(app, serverContext);
+  }
+
+  /// The native HttpServer running this instance.
+  HttpServer get httpServer => _server;
+
+  /// Starts the server.
+  ///
+  /// Returns false on failure; otherwise, returns the HttpServer.
+  Future<HttpServer> startServer([address, int port]) async {
+    var host = address ?? InternetAddress.LOOPBACK_IP_V4;
+    _server = await _serverGenerator(host, port ?? 0);
+
+    for (var configurer in app.startupHooks) {
+      await app.configure(configurer);
+    }
+
+    app.optimizeForProduction();
+    _sub = _server.listen(handleRequest);
+    return _server;
+  }
+
+  /// Shuts down the underlying server.
+  Future<HttpServer> close() async {
+    if (_closed) return _server;
+    _closed = true;
+    _sub?.cancel();
+    await app.close();
+
+    for (var configurer in app.shutdownHooks) await app.configure(configurer);
+    return _server;
+  }
+
   /// Handles a single request.
   Future handleRequest(HttpRequest request) async {
     var req = await createRequestContext(request);
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 1e28befa..e174a435 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -8,7 +8,6 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 export 'package:container/container.dart';
-import 'package:json_god/json_god.dart' as god;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
@@ -38,7 +37,6 @@ class Angel extends AngelBase {
   AngelHttp _http;
   bool _isProduction;
   Angel _parent;
-  StreamSubscription<HttpRequest> _sub;
   ServerGenerator _serverGenerator = HttpServer.bind;
 
   /// A global Map of converters that can transform responses bodies.
@@ -153,23 +151,15 @@ class Angel extends AngelBase {
     res.end();
   };
 
-  /// The native HttpServer running this instancce.
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   HttpServer httpServer;
 
-  /// Starts the server.
-  ///
-  /// Returns false on failure; otherwise, returns the HttpServer.
-  Future<HttpServer> startServer([address, int port]) async {
-    var host = address ?? InternetAddress.LOOPBACK_IP_V4;
-    this.httpServer = await _serverGenerator(host, port ?? 0);
-
-    for (var configurer in startupHooks) {
-      await configure(configurer);
-    }
-
-    optimizeForProduction();
-    _sub = httpServer.listen(handleRequest);
-    return httpServer;
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
+  Future<HttpServer> startServer([address, int port]) {
+    _http ??= new AngelHttp(this);
+    return _http.startServer(address, port);
   }
 
   @override
@@ -209,22 +199,11 @@ class Angel extends AngelBase {
   /// Shuts down the server, and closes any open [StreamController]s.
   ///
   /// The server will be **COMPLETE DEFUNCT** after this operation!
-  Future<HttpServer> close() async {
-    HttpServer server;
-
-    _sub?.cancel();
-
-    if (httpServer != null) {
-      server = httpServer;
-      await httpServer.close(force: true);
-    }
-
+  Future close() async {
     await Future.forEach(services.values, (Service service) async {
       await service.close();
     });
 
-    for (var plugin in shutdownHooks) await plugin(this);
-
     await super.close();
     _preContained.clear();
     handlerCache.clear();
@@ -238,8 +217,8 @@ class Angel extends AngelBase {
     shutdownHooks.clear();
     responseFinalizers.clear();
     _flattened = null;
-
-    return server;
+    await _http.close();
+    return _http.httpServer;
   }
 
   @override
@@ -515,35 +494,33 @@ class Angel extends AngelBase {
     );
   }
 
-  /// An instance mounted on a server started by the [serverGenerator].
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   factory Angel.custom(ServerGenerator serverGenerator) {
-    return new Angel().._serverGenerator = serverGenerator;
+    var app = new Angel();
+    return app.._http = new AngelHttp.custom(app, serverGenerator);
   }
 
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   factory Angel.fromSecurityContext(SecurityContext context) {
     var app = new Angel();
 
-    app._serverGenerator = (InternetAddress address, int port) async {
+    app._http =
+        new AngelHttp.custom(app, (InternetAddress address, int port) async {
       return await HttpServer.bindSecure(address, port, context);
-    };
+    });
 
     return app;
   }
 
-  /// Creates an HTTPS server.
-  ///
-  /// Provide paths to a certificate chain and server key (both .pem).
-  /// If no password is provided, a random one will be generated upon running
-  /// the server.
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
-      {bool debug: false, String password}) {
-    var certificateChain =
-        Platform.script.resolve(certificateChainPath).toFilePath();
-    var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
-    var serverContext = new SecurityContext();
-    serverContext.useCertificateChain(certificateChain, password: password);
-    serverContext.usePrivateKey(serverKey, password: password);
-
-    return new Angel.fromSecurityContext(serverContext);
+      {String password}) {
+    var app = new Angel();
+    return app
+      .._http = new AngelHttp.secure(app, certificateChainPath, serverKeyPath,
+          password: password);
   }
 }

From 101aedc0c332cdd20748cc36fcd1be03d4875722 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:11:52 -0500
Subject: [PATCH 177/414] Removed use of `HttpHeaders` in `Angel`

---
 .idea/workspace.xml      | 42 ++++++++++++++++++++--------------------
 lib/src/http/server.dart |  5 ++---
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 758f51b5..4bb2cfab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Used function syntax, deprecated `ResponseSerializer` typedef">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -26,14 +25,14 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5">
+    <splitter split-orientation="horizontal" split-proportion="0.7132018">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="167">
-                  <caret line="348" column="3" lean-forward="true" selection-start-line="348" selection-start-column="3" selection-end-line="348" selection-end-column="3" />
+                <state relative-caret-position="202">
+                  <caret line="303" column="19" lean-forward="true" selection-start-line="303" selection-start-column="19" selection-end-line="303" selection-end-column="19" />
                   <folding>
                     <element signature="e#38#58#0" expanded="true" />
                   </folding>
@@ -82,8 +81,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>_injections?</find>
-      <find>createRes</find>
       <find>requestedUrl</find>
       <find>cacheK</find>
       <find>resolveAl</find>
@@ -112,6 +109,8 @@
       <find>injectSeri</find>
       <find>close</find>
       <find>shutdown</find>
+      <find>HttpHeaders</find>
+      <find>ContentType</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -133,6 +132,7 @@
       <replace>req.path</replace>
       <replace>req.path`</replace>
       <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
+      <replace>'content-type'</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -617,14 +617,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="3447000" />
-    </task>
-    <task id="LOCAL-00007" summary="Fixed last batch?">
-      <created>1492278141283</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1492278141283</updated>
+      <workItem from="1517973177718" duration="3510000" />
     </task>
     <task id="LOCAL-00008" summary="1.0.2">
       <created>1493087536575</created>
@@ -962,7 +955,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517975664302</updated>
     </task>
-    <option name="localTasksCounter" value="56" />
+    <task id="LOCAL-00056" summary="Deprecated all serving logic in `Angel`">
+      <created>1517976649593</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1517976649593</updated>
+    </task>
+    <option name="localTasksCounter" value="57" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -998,7 +998,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="121483000" />
+    <option name="totallyTimeSpent" value="121546000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1057,7 +1057,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="1.1.0-alpha start" />
     <MESSAGE value="1.1.0-alpha" />
     <MESSAGE value="pubspec" />
     <MESSAGE value="Logging support" />
@@ -1082,7 +1081,8 @@
     <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
     <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
     <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
-    <option name="LAST_COMMIT_MESSAGE" value="Used function syntax, deprecated `ResponseSerializer` typedef" />
+    <MESSAGE value="Deprecated all serving logic in `Angel`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Deprecated all serving logic in `Angel`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1470,8 +1470,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="348" column="3" lean-forward="true" selection-start-line="348" selection-start-column="3" selection-end-line="348" selection-end-column="3" />
+        <state relative-caret-position="202">
+          <caret line="303" column="19" lean-forward="true" selection-start-line="303" selection-start-column="19" selection-end-line="303" selection-end-column="19" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index e174a435..e5e61c1c 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -138,7 +138,7 @@ class Angel extends AngelBase {
       return;
     }
 
-    res.headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
+    res.headers['content-type'] = 'text/html';
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
@@ -308,8 +308,7 @@ class Angel extends AngelBase {
       // TODO: Make `serialize` return a bool, return this as the value.
       // Do this wherever applicable
       res.serialize(result,
-          contentType: res.headers[HttpHeaders.CONTENT_TYPE] ??
-              ContentType.JSON.mimeType);
+          contentType: res.headers['content-type'] ?? 'application/json');
       return false;
     } else
       return res.isOpen;

From 9e21634764590b933304ad648ea34377544f24ba Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:13:26 -0500
Subject: [PATCH 178/414] Deprecated createZoneForRequest

---
 .idea/workspace.xml      | 34 +++++++++++++++++-----------------
 lib/src/http/server.dart |  4 +++-
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4bb2cfab..2d3d8bfd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -31,8 +31,8 @@
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="202">
-                  <caret line="303" column="19" lean-forward="true" selection-start-line="303" selection-start-column="19" selection-end-line="303" selection-end-column="19" />
+                <state relative-caret-position="168">
+                  <caret line="44" column="29" lean-forward="true" selection-start-line="44" selection-start-column="29" selection-end-line="44" selection-end-column="29" />
                   <folding>
                     <element signature="e#38#58#0" expanded="true" />
                   </folding>
@@ -81,7 +81,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>requestedUrl</find>
       <find>cacheK</find>
       <find>resolveAl</find>
       <find>path</find>
@@ -111,6 +110,7 @@
       <find>shutdown</find>
       <find>HttpHeaders</find>
       <find>ContentType</find>
+      <find>createZ</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -617,14 +617,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="3510000" />
-    </task>
-    <task id="LOCAL-00008" summary="1.0.2">
-      <created>1493087536575</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1493087536575</updated>
+      <workItem from="1517973177718" duration="3606000" />
     </task>
     <task id="LOCAL-00009" summary="+1">
       <created>1493088262571</created>
@@ -962,7 +955,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517976649593</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="Removed use of `HttpHeaders` in `Angel`">
+      <created>1517976712783</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1517976712783</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -998,7 +998,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="121546000" />
+    <option name="totallyTimeSpent" value="121642000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1057,7 +1057,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="1.1.0-alpha" />
     <MESSAGE value="pubspec" />
     <MESSAGE value="Logging support" />
     <MESSAGE value="Updated `use`" />
@@ -1082,7 +1081,8 @@
     <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
     <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
     <MESSAGE value="Deprecated all serving logic in `Angel`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Deprecated all serving logic in `Angel`" />
+    <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Removed use of `HttpHeaders` in `Angel`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1470,8 +1470,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="303" column="19" lean-forward="true" selection-start-line="303" selection-start-column="19" selection-end-line="303" selection-end-column="19" />
+        <state relative-caret-position="168">
+          <caret line="44" column="29" lean-forward="true" selection-start-line="44" selection-start-column="29" selection-end-line="44" selection-end-column="29" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index e5e61c1c..9492b945 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -44,7 +44,7 @@ class Angel extends AngelBase {
 
   final Map _injections = {};
 
-  /// Creates a safe zone within which a request can be handled, without crashing the application.
+  @deprecated
   Future<ZoneSpecification> Function(
           HttpRequest request, RequestContext req, ResponseContext res)
       createZoneForRequest;
@@ -478,9 +478,11 @@ class Angel extends AngelBase {
   /// Default constructor. ;)
   Angel() : super() {
     bootstrapContainer();
+    // ignore: deprecated_member_use
     createZoneForRequest = defaultZoneCreator;
   }
 
+  @deprecated
   Future<ZoneSpecification> defaultZoneCreator(request, req, res) async {
     return new ZoneSpecification(
       print: (Zone self, ZoneDelegate parent, Zone zone, String line) {

From 116824e7c5f763f3f7bcb67b36a4313487cd98ca Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:17:40 -0500
Subject: [PATCH 179/414] Deprecated `ServerGenerator`

---
 .idea/workspace.xml          | 125 +++++++++++++++++++----------------
 CHANGELOG.md                 |   3 +
 lib/src/http/angel_http.dart |  23 ++++---
 lib/src/http/http.dart       |   4 +-
 lib/src/http/server.dart     |  12 ++--
 5 files changed, 94 insertions(+), 73 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2d3d8bfd..cbf873ad 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -25,16 +28,26 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.7132018">
+    <splitter split-orientation="horizontal" split-proportion="0.50455236">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
           <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="168">
-                  <caret line="44" column="29" lean-forward="true" selection-start-line="44" selection-start-column="29" selection-end-line="44" selection-end-column="29" />
+                <state relative-caret-position="135">
+                  <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="114">
+                  <caret line="65" column="61" lean-forward="false" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
                   <folding>
-                    <element signature="e#38#58#0" expanded="true" />
+                    <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
                   </folding>
                 </state>
               </provider>
@@ -47,12 +60,10 @@
           <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="273">
-                  <caret line="41" column="0" lean-forward="true" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+                <state relative-caret-position="279">
+                  <caret line="27" column="64" lean-forward="false" selection-start-line="27" selection-start-column="64" selection-end-line="27" selection-end-column="64" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
-                    <element signature="e#3455#3460#0" expanded="false" />
-                    <element signature="e#3763#3788#0" expanded="false" />
                   </folding>
                 </state>
               </provider>
@@ -183,7 +194,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/metrics.dart" />
@@ -205,9 +215,10 @@
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
       </list>
@@ -617,14 +628,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="3606000" />
-    </task>
-    <task id="LOCAL-00009" summary="+1">
-      <created>1493088262571</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1493088262571</updated>
+      <workItem from="1517973177718" duration="3858000" />
     </task>
     <task id="LOCAL-00010" summary="+2">
       <created>1493090378709</created>
@@ -962,7 +966,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517976712783</updated>
     </task>
-    <option name="localTasksCounter" value="58" />
+    <task id="LOCAL-00058" summary="Deprecated createZoneForRequest">
+      <created>1517976806435</created>
+      <option name="number" value="00058" />
+      <option name="presentableId" value="LOCAL-00058" />
+      <option name="project" value="LOCAL" />
+      <updated>1517976806435</updated>
+    </task>
+    <option name="localTasksCounter" value="59" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -998,7 +1009,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="121642000" />
+    <option name="totallyTimeSpent" value="121894000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1057,7 +1068,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="pubspec" />
     <MESSAGE value="Logging support" />
     <MESSAGE value="Updated `use`" />
     <MESSAGE value="+2" />
@@ -1082,11 +1092,12 @@
     <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
     <MESSAGE value="Deprecated all serving logic in `Angel`" />
     <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Removed use of `HttpHeaders` in `Angel`" />
+    <MESSAGE value="Deprecated createZoneForRequest" />
+    <option name="LAST_COMMIT_MESSAGE" value="Deprecated createZoneForRequest" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="3" />
+      <option name="time" value="4" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1194,13 +1205,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="25" column="66" lean-forward="true" selection-start-line="25" selection-start-column="66" selection-end-line="25" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -1222,13 +1226,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="113" column="27" lean-forward="true" selection-start-line="113" selection-start-column="27" selection-end-line="113" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -1392,17 +1389,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="45">
-            <caret line="3" column="45" lean-forward="false" selection-start-line="3" selection-start-column="45" selection-end-line="3" selection-end-column="45" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="647">
@@ -1456,25 +1442,50 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="120">
+            <caret line="8" column="3" lean-forward="true" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="41" lean-forward="false" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="41" column="0" lean-forward="true" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
+        <state relative-caret-position="279">
+          <caret line="27" column="64" lean-forward="false" selection-start-line="27" selection-start-column="64" selection-end-line="27" selection-end-column="64" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
-            <element signature="e#3455#3460#0" expanded="false" />
-            <element signature="e#3763#3788#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="65" column="61" lean-forward="false" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
+          <folding>
+            <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="44" column="29" lean-forward="true" selection-start-line="44" selection-start-column="29" selection-end-line="44" selection-end-column="29" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="135">
+          <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14fdff46..76dca643 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 * `ResponseContext` no longer automatically closes if `serializer` returns an
 empty string.
 * Added `autoSnakeCaseNames` to `MapService`.
+* Deprecated `Angel.createZoneForRequest`.
+* Deprecated all `Angel` methods that directly touch an `HttpServer` or `HttpRequest`.
+* Created the `AngelHttp` class.
 
 # 1.1.0+3
 * Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 605a7bba..5579d0d1 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -18,15 +18,19 @@ class AngelHttp {
   final Angel app;
   bool _closed = false;
   HttpServer _server;
-  Future<HttpServer> Function(dynamic,int) _serverGenerator = HttpServer.bind;
+  Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
   StreamSubscription<HttpRequest> _sub;
 
   Pool _pool;
 
   AngelHttp(this.app);
 
+  /// The function used to bind this instance to an HTTP server.
+  Future<HttpServer> Function(dynamic, int) get serverGenerator => _serverGenerator;
+
   /// An instance mounted on a server started by the [serverGenerator].
-  factory AngelHttp.custom(Angel app, ServerGenerator serverGenerator) {
+  factory AngelHttp.custom(
+      Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator) {
     return new AngelHttp(app).._serverGenerator = serverGenerator;
   }
 
@@ -45,10 +49,11 @@ class AngelHttp {
   /// Provide paths to a certificate chain and server key (both .pem).
   /// If no password is provided, a random one will be generated upon running
   /// the server.
-  factory AngelHttp.secure(Angel app, String certificateChainPath, String serverKeyPath,
+  factory AngelHttp.secure(
+      Angel app, String certificateChainPath, String serverKeyPath,
       {bool debug: false, String password}) {
     var certificateChain =
-    Platform.script.resolve(certificateChainPath).toFilePath();
+        Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
     var serverContext = new SecurityContext();
     serverContext.useCertificateChain(certificateChain, password: password);
@@ -99,7 +104,7 @@ class AngelHttp {
       Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
         Router r = app.optimizedRouter;
         var resolved =
-        r.resolveAbsolute(path, method: req.method, strip: false);
+            r.resolveAbsolute(path, method: req.method, strip: false);
 
         return new Tuple3(
           new MiddlewarePipeline(resolved).handlers,
@@ -203,7 +208,7 @@ class AngelHttp {
     Future finalizers = ignoreFinalizers == true
         ? new Future.value()
         : app.responseFinalizers.fold<Future>(
-        new Future.value(), (out, f) => out.then((_) => f(req, res)));
+            new Future.value(), (out, f) => out.then((_) => f(req, res)));
 
     if (res.isOpen) res.end();
 
@@ -218,7 +223,7 @@ class AngelHttp {
 
     if (res.encoders.isNotEmpty) {
       var allowedEncodings =
-      req.headers[HttpHeaders.ACCEPT_ENCODING]?.map((str) {
+          req.headers[HttpHeaders.ACCEPT_ENCODING]?.map((str) {
         // Ignore quality specifications in accept-encoding
         // ex. gzip;q=0.8
         if (!str.contains(';')) return str;
@@ -281,7 +286,7 @@ class AngelHttp {
   }
 
   Future<ResponseContext> createResponseContext(HttpResponse response,
-      [RequestContext correspondingRequest]) =>
+          [RequestContext correspondingRequest]) =>
       new Future<ResponseContext>.value(
           new ResponseContext(response, app, correspondingRequest)
             ..serializer = (app.serializer ?? god.serialize)
@@ -294,4 +299,4 @@ class AngelHttp {
   void throttle(int maxConcurrentRequests, {Duration timeout}) {
     _pool = new Pool(maxConcurrentRequests, timeout: timeout);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index f72ebdc0..a1f09d06 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -3,7 +3,6 @@ library angel_framework.http;
 
 import 'dart:async';
 import 'dart:io';
-import 'server.dart' show ServerGenerator;
 export 'package:angel_http_exception/angel_http_exception.dart';
 export 'package:angel_model/angel_model.dart';
 export 'package:angel_route/angel_route.dart';
@@ -25,8 +24,7 @@ export 'typed_service.dart';
 Future<HttpServer> startShared(address, int port) => HttpServer
     .bind(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, shared: true);
 
-/// Boots a secure shared server instance. Use this if launching multiple isolates
-ServerGenerator startSharedSecure(SecurityContext securityContext) {
+Future<HttpServer> Function(dynamic, int) startSharedSecure(SecurityContext securityContext) {
   return (address, int port) => HttpServer.bindSecure(
       address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, securityContext,
       shared: true);
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 9492b945..1316299f 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -22,6 +22,9 @@ import 'service.dart';
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A function that binds an [Angel] server to an Internet address and port.
+///
+/// Prefer the Future<HttpServer> Function(dynamic, int) syntax.
+@deprecated
 typedef Future<HttpServer> ServerGenerator(address, int port);
 
 /// A function that configures an [Angel] server in some way.
@@ -37,7 +40,7 @@ class Angel extends AngelBase {
   AngelHttp _http;
   bool _isProduction;
   Angel _parent;
-  ServerGenerator _serverGenerator = HttpServer.bind;
+  Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
 
   /// A global Map of converters that can transform responses bodies.
   final Map<String, Converter<List<int>, List<int>>> encoders = {};
@@ -85,8 +88,9 @@ class Angel extends AngelBase {
         (Platform.environment['ANGEL_ENV'] == 'production');
   }
 
-  /// The function used to bind this instance to an HTTP server.
-  ServerGenerator get serverGenerator => _serverGenerator;
+  /// Use the serving methods in [AngelHttp] instead.
+  @deprecated
+  ServerGenerator get serverGenerator => _http.serverGenerator;
 
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
@@ -497,7 +501,7 @@ class Angel extends AngelBase {
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
-  factory Angel.custom(ServerGenerator serverGenerator) {
+  factory Angel.custom(Future<HttpServer> Function(dynamic, int) serverGenerator) {
     var app = new Angel();
     return app.._http = new AngelHttp.custom(app, serverGenerator);
   }

From b07e2f0e8a39b9e40119b8e5cf7d577ab7574a6a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:34:08 -0500
Subject: [PATCH 180/414] Updated tests to use `AngelHttp` API

---
 lib/src/http/http.dart         |  1 +
 lib/src/http/server.dart       | 23 +++++++++++++------
 test/accepts_test.dart         |  3 ++-
 test/encoders_buffer_test.dart | 12 +++++-----
 test/extension_test.dart       |  3 ++-
 test/parameter_meta_test.dart  | 16 +++++++------
 test/primitives_test.dart      | 12 +++++-----
 test/routing_test.dart         |  2 +-
 test/server_test.dart          | 41 +++++++++++++++++++++-------------
 test/streaming_test.dart       | 10 +++++----
 10 files changed, 76 insertions(+), 47 deletions(-)

diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index a1f09d06..88b47ee0 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -8,6 +8,7 @@ export 'package:angel_model/angel_model.dart';
 export 'package:angel_route/angel_route.dart';
 export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'angel_base.dart';
+export 'angel_http.dart';
 export 'anonymous_service.dart';
 export 'controller.dart';
 export 'hooked_service.dart';
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index 1316299f..c8ea6eb9 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -90,7 +90,8 @@ class Angel extends AngelBase {
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
-  ServerGenerator get serverGenerator => _http.serverGenerator;
+  ServerGenerator get serverGenerator =>
+      (_http ??= new AngelHttp(this)).serverGenerator;
 
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
@@ -157,7 +158,7 @@ class Angel extends AngelBase {
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
-  HttpServer httpServer;
+  HttpServer get httpServer => _http?.httpServer;
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
@@ -221,8 +222,8 @@ class Angel extends AngelBase {
     shutdownHooks.clear();
     responseFinalizers.clear();
     _flattened = null;
-    await _http.close();
-    return _http.httpServer;
+    await _http?.close();
+    return _http?.httpServer;
   }
 
   @override
@@ -321,14 +322,18 @@ class Angel extends AngelBase {
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
   Future<RequestContext> createRequestContext(HttpRequest request) {
+    _http ??= new AngelHttp(this);
     return _http.createRequestContext(request);
   }
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
   Future<ResponseContext> createResponseContext(HttpResponse response,
-          [RequestContext correspondingRequest]) =>
-      _http.createResponseContext(response, correspondingRequest);
+      [RequestContext correspondingRequest]) {
+    _http ??= new AngelHttp(this);
+
+    return _http.createResponseContext(response, correspondingRequest);
+  }
 
   /// Attempts to find a middleware by the given name within this application.
   findMiddleware(key) {
@@ -347,6 +352,7 @@ class Angel extends AngelBase {
   Future handleAngelHttpException(AngelHttpException e, StackTrace st,
       RequestContext req, ResponseContext res, HttpRequest request,
       {bool ignoreFinalizers: false}) {
+    _http ??= new AngelHttp(this);
     return _http.handleAngelHttpException(e, st, req, res, request,
         ignoreFinalizers: ignoreFinalizers == true);
   }
@@ -354,6 +360,7 @@ class Angel extends AngelBase {
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
   Future handleRequest(HttpRequest request) {
+    _http ??= new AngelHttp(this);
     return _http.handleRequest(request);
   }
 
@@ -416,6 +423,7 @@ class Angel extends AngelBase {
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
+    _http ??= new AngelHttp(this);
     return _http.sendResponse(request, req, res);
   }
 
@@ -501,7 +509,8 @@ class Angel extends AngelBase {
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
-  factory Angel.custom(Future<HttpServer> Function(dynamic, int) serverGenerator) {
+  factory Angel.custom(
+      Future<HttpServer> Function(dynamic, int) serverGenerator) {
     var app = new Angel();
     return app.._http = new AngelHttp.custom(app, serverGenerator);
   }
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index d6c811cb..0c93b6a9 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -60,5 +60,6 @@ Future<RequestContext> acceptContentTypes(
   rq.headers.set(HttpHeaders.ACCEPT, headerString);
   rq.close();
   var app = new Angel();
-  return app.createRequestContext(rq);
+  var http = new AngelHttp(app);
+  return http.createRequestContext(rq);
 }
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 5879a19b..98bc70ee 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -29,15 +29,17 @@ main() {
 void encodingTests(Angel getApp()) {
   group('encoding', () {
     Angel app;
+    AngelHttp http;
 
     setUp(() {
       app = getApp();
+      http = new AngelHttp(app);
     });
 
     test('sends plaintext if no accept-encoding', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))..close();
       var rs = rq.response;
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
 
       var body = await rs.transform(UTF8.decoder).join();
       expect(body, 'Hello, world!');
@@ -48,7 +50,7 @@ void encodingTests(Angel getApp()) {
         ..headers.set(HttpHeaders.ACCEPT_ENCODING, '*')
         ..close();
       var rs = rq.response;
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
@@ -60,7 +62,7 @@ void encodingTests(Angel getApp()) {
         ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['foo', 'bar', '*'])
         ..close();
       var rs = rq.response;
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
@@ -72,7 +74,7 @@ void encodingTests(Angel getApp()) {
         ..headers.set(HttpHeaders.ACCEPT_ENCODING, 'gzip')
         ..close();
       var rs = rq.response;
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
@@ -84,7 +86,7 @@ void encodingTests(Angel getApp()) {
         ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['gzip', 'deflate'])
         ..close();
       var rs = rq.response;
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
diff --git a/test/extension_test.dart b/test/extension_test.dart
index c10603ec..34a5f37f 100644
--- a/test/extension_test.dart
+++ b/test/extension_test.dart
@@ -25,5 +25,6 @@ main() {
 Future<RequestContext> makeRequest(String path) {
   var rq = new MockHttpRequest('GET', ENDPOINT.replace(path: path))..close();
   var app = new Angel();
-  return app.createRequestContext(rq);
+  var http = new AngelHttp(app);
+  return http.createRequestContext(rq);
 }
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index aa6009de..e72abcb3 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -17,9 +17,11 @@ Future printResponse(MockHttpResponse rs) {
 
 main() {
   Angel app;
+  AngelHttp http;
 
   setUp(() {
     app = new Angel()..lazyParseBodies = true;
+    http = new AngelHttp(app);
 
     app.get('/cookie', (@CookieValue('token') String jwt) {
       return jwt;
@@ -61,7 +63,7 @@ main() {
     // Invalid request
     var rq = new MockHttpRequest('GET', Uri.parse('/header'))..close();
     var rs = rq.response;
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
 
     await printResponse(rs);
     expect(rs.statusCode, 400);
@@ -71,7 +73,7 @@ main() {
       ..headers.add('x-foo', 'bar')
       ..close();
     rs = rq.response;
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
 
     var body = await readResponse(rs);
     print('Body: $body');
@@ -83,7 +85,7 @@ main() {
     // Invalid request
     var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
     var rs = rq.response;
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
 
     await printResponse(rs);
     expect(rs.statusCode, 500);
@@ -92,7 +94,7 @@ main() {
     rq.session['foo'] = 'bar';
     rq.close();
     rs = rq.response;
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
 
     await printResponse(rs);
     expect(rs.statusCode, 200);
@@ -105,7 +107,7 @@ main() {
   test('pattern matching', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/match?mode=pos'))..close();
     var rs = rq.response;
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
@@ -113,7 +115,7 @@ main() {
 
     rq = new MockHttpRequest('GET', Uri.parse('/match?mode=neg'))..close();
     rs = rq.response;
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
@@ -122,7 +124,7 @@ main() {
     // Fallback
     rq = new MockHttpRequest('GET', Uri.parse('/match?mode=ambi'))..close();
     rs = rq.response;
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index d7e55b3a..b53d04ef 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -6,9 +6,11 @@ import 'package:test/test.dart';
 
 main() {
   Angel app;
+  AngelHttp http;
 
   setUp(() {
     app = new Angel()..inject('global', 305); // Pitbull!
+    http = new AngelHttp(app);
 
     app.get('/string/:string', (String string) => string);
 
@@ -33,21 +35,21 @@ main() {
 
   test('String type annotation', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/string/hello'))..close();
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var rs = await rq.response.transform(UTF8.decoder).join();
     expect(rs, JSON.encode('hello'));
   });
 
   test('Primitive after parsed param injection', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/num/parsed/24'))..close();
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var rs = await rq.response.transform(UTF8.decoder).join();
     expect(rs, JSON.encode(24));
   });
 
   test('globally-injected primitive', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/num/global'))..close();
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var rs = await rq.response.transform(UTF8.decoder).join();
     expect(rs, JSON.encode(305));
   });
@@ -56,8 +58,8 @@ main() {
     try {
       var rq = new MockHttpRequest('GET', Uri.parse('/num/unparsed/32'))
         ..close();
-      var req = await app.createRequestContext(rq);
-      var res = await app.createResponseContext(rq.response, req);
+      var req = await http.createRequestContext(rq);
+      var res = await http.createResponseContext(rq.response, req);
       await app.runContained((num unparsed) => unparsed, req, res);
       throw new StateError(
           'ArgumentError should be thrown if a parameter cannot be resolved.');
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 02fb3b13..004bdaf7 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -100,7 +100,7 @@ main() {
   });
 
   tearDown(() async {
-    await app.httpServer.close(force: true);
+    await app.close();
     app = null;
     nested = null;
     todos = null;
diff --git a/test/server_test.dart b/test/server_test.dart
index c22337b1..f952b467 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -29,23 +29,27 @@ main() {
   });
 
   test('custom server generator', () {
-    var app = new Angel.custom(HttpServer.bind);
-    expect(app.serverGenerator, HttpServer.bind);
+    var app = new Angel();
+    var http = new AngelHttp.custom(app, HttpServer.bind);
+    expect(http.serverGenerator, HttpServer.bind);
   });
 
   test('default error handler', () async {
     var app = new Angel();
+    var http = new AngelHttp(app);
     var rq = new MockHttpRequest('GET', $foo);
     rq.close();
     var rs = rq.response;
-    var req = await app.createRequestContext(rq);
-    var res = await app.createResponseContext(rs);
+    var req = await http.createRequestContext(rq);
+    var res = await http.createResponseContext(rs);
     var e = new AngelHttpException(null,
         statusCode: 321, message: 'Hello', errors: ['foo', 'bar']);
     await app.errorHandler(e, req, res);
-    await app.sendResponse(rq, req, res);
-    expect(rs.headers.value(HttpHeaders.CONTENT_TYPE),
-        ContentType.HTML.toString());
+    await http.sendResponse(rq, req, res);
+    expect(
+      ContentType.parse(rs.headers.value(HttpHeaders.CONTENT_TYPE)).mimeType,
+      ContentType.HTML.mimeType,
+    );
     expect(rs.statusCode, e.statusCode);
     var body = await rs.transform(UTF8.decoder).join();
     expect(body, contains('<title>${e.message}</title>'));
@@ -81,24 +85,27 @@ main() {
 
   test('global injection added to injection map', () async {
     var app = new Angel()..inject('a', 'b');
+    var http = new AngelHttp(app);
     app.get('/', (String a) => a);
     var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var body = await rq.response.transform(UTF8.decoder).join();
     expect(body, JSON.encode('b'));
   });
 
   test('global injected serializer', () async {
-    var app = new Angel()..injectSerializer((_) => 'x');
+    var app = new Angel()..serializer = (_) => 'x';
+    var http = new AngelHttp(app);
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
     var rq = new MockHttpRequest('GET', $foo)..close();
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var body = await rq.response.transform(UTF8.decoder).join();
     expect(body, 'x');
   });
 
   group('handler results', () {
     var app = new Angel();
+    var http = new AngelHttp(app);
     app.responseFinalizers
         .add((req, res) => throw new AngelHttpException.forbidden());
     RequestContext req;
@@ -106,8 +113,8 @@ main() {
 
     setUp(() async {
       var rq = new MockHttpRequest('GET', $foo)..close();
-      req = await app.createRequestContext(rq);
-      res = await app.createResponseContext(rq.response);
+      req = await http.createRequestContext(rq);
+      res = await http.createResponseContext(rq.response);
     });
 
     group('getHandlerResult', () {
@@ -140,12 +147,14 @@ main() {
 
   group('handleAngelHttpException', () {
     Angel app;
+    AngelHttp http;
 
     setUp(() async {
       app = new Angel();
       app.get('/wtf', () => throw new AngelHttpException.forbidden());
       app.get('/wtf2', () => throw new AngelHttpException.forbidden());
-      await app.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+      http = new AngelHttp(app);
+      await http.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
 
       var oldHandler = app.errorHandler;
       app.errorHandler = (e, req, res) {
@@ -161,7 +170,7 @@ main() {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
         ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
       rq.close();
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
       expect(
           rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
@@ -171,7 +180,7 @@ main() {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
         ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
       rq.close();
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
       expect(
           rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
@@ -181,7 +190,7 @@ main() {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
       rq.headers.set(HttpHeaders.ACCEPT, ContentType.HTML.toString());
       rq.close();
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
       expect(
           rq.response.headers.contentType?.mimeType, ContentType.HTML.mimeType);
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 3ecf71d2..e2e9e489 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -9,9 +9,11 @@ import 'encoders_buffer_test.dart' show encodingTests;
 
 main() {
   Angel app;
+  AngelHttp http;
 
   setUp(() {
     app = new Angel();
+    http = new AngelHttp(app);
 
     app.logger = new Logger('streaming_test')
       ..onRecord.listen((rec) {
@@ -66,11 +68,11 @@ main() {
     };
   });
 
-  tearDown(() => app.close());
+  tearDown(() => http.close());
 
   _expectHelloBye(String path) async {
     var rq = new MockHttpRequest('GET', Uri.parse(path))..close();
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var body = await rq.response.transform(UTF8.decoder).join();
     expect(body, 'Hello, world!bye');
   }
@@ -81,7 +83,7 @@ main() {
 
   test('cannot write after close', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
-    await app.handleRequest(rq);
+    await http.handleRequest(rq);
     var body = await rq.response.transform(UTF8.decoder).join();
 
     if (rq.response.statusCode != 32)
@@ -91,7 +93,7 @@ main() {
   test('res => addError', () async {
     try {
       var rq = new MockHttpRequest('GET', Uri.parse('/error'))..close();
-      await app.handleRequest(rq);
+      await http.handleRequest(rq);
       var body = await rq.response.transform(UTF8.decoder).join();
       throw 'addError should throw error; response: $body';
     } on StateError {

From 15b49f18881d0cc3fce1a64faa55828f44cabc99 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:38:26 -0500
Subject: [PATCH 181/414] Added example/main.dart

---
 .idea/runConfigurations/main_dart.xml |   7 +
 .idea/workspace.xml                   | 519 +++++++++++++++-----------
 example/common.dart                   |   5 -
 example/json.dart                     |   6 +-
 example/main.dart                     |  19 +
 5 files changed, 340 insertions(+), 216 deletions(-)
 create mode 100644 .idea/runConfigurations/main_dart.xml
 delete mode 100644 example/common.dart
 create mode 100644 example/main.dart

diff --git a/.idea/runConfigurations/main_dart.xml b/.idea/runConfigurations/main_dart.xml
new file mode 100644
index 00000000..750f7262
--- /dev/null
+++ b/.idea/runConfigurations/main_dart.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="main.dart" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/example/main.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cbf873ad..6983a17f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/main_dart.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/example/main.dart" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/example/common.dart" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -31,23 +31,108 @@
     <splitter split-orientation="horizontal" split-proportion="0.50455236">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-          <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+          <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="135">
-                  <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
+                <state relative-caret-position="176">
+                  <caret line="23" column="30" lean-forward="false" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+          <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="114">
-                  <caret line="65" column="61" lean-forward="false" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
+                <state relative-caret-position="119">
+                  <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="192">
+                  <caret line="52" column="40" lean-forward="true" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/example/json.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="0">
+                  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
                   <folding>
-                    <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
+                    <element signature="e#0#20#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/example/main.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="270">
+                  <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="180">
+                  <caret line="422" column="22" lean-forward="true" selection-start-line="422" selection-start-column="22" selection-end-line="422" selection-end-column="22" />
+                  <folding>
+                    <element signature="e#38#58#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="276">
+                  <caret line="103" column="25" lean-forward="false" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="99">
+                  <caret line="38" column="4" lean-forward="false" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="132">
+                  <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="-1269">
+                  <caret line="102" column="14" lean-forward="false" selection-start-line="102" selection-start-column="14" selection-end-line="102" selection-end-column="14" />
+                  <folding>
+                    <marker date="1517977457000" expanded="false" signature="7:13" ph="..." />
+                    <marker date="1517977457000" expanded="true" signature="6143:6153" ph="{...}" />
                   </folding>
                 </state>
               </provider>
@@ -60,8 +145,8 @@
           <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="279">
-                  <caret line="27" column="64" lean-forward="false" selection-start-line="27" selection-start-column="64" selection-end-line="27" selection-end-column="64" />
+                <state relative-caret-position="182">
+                  <caret line="275" column="3" lean-forward="true" selection-start-line="275" selection-start-column="3" selection-end-line="275" selection-end-column="3" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -69,16 +154,6 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/example/json.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="452">
-                  <caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -92,8 +167,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>cacheK</find>
-      <find>resolveAl</find>
       <find>path</find>
       <find>handleRequest</find>
       <find>flatten</find>
@@ -102,7 +175,6 @@
       <find>createR</find>
       <find>print</find>
       <find>dispos</find>
-      <find>handleRe</find>
       <find>xhr</find>
       <find>accepts</find>
       <find>cacheKey</find>
@@ -122,6 +194,9 @@
       <find>HttpHeaders</find>
       <find>ContentType</find>
       <find>createZ</find>
+      <find>app</find>
+      <find>handleRe</find>
+      <find>instead.</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -144,6 +219,7 @@
       <replace>req.path`</replace>
       <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
       <replace>'content-type'</replace>
+      <replace>appa</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -170,7 +246,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/extensible.dart" />
         <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
@@ -184,15 +259,11 @@
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
@@ -205,22 +276,27 @@
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
-        <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/test/extension_test.dart" />
+        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
       </list>
     </option>
   </component>
@@ -261,6 +337,11 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="example" type="cbb8eebc:String" user="example" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -326,7 +407,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -516,7 +597,7 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="39">
+    <list size="40">
       <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
       <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
       <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
@@ -556,6 +637,7 @@
       <item index="36" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
       <item index="37" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
       <item index="38" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
+      <item index="39" class="java.lang.String" itemvalue="Dart Command Line App.main.dart" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -628,21 +710,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="3858000" />
-    </task>
-    <task id="LOCAL-00010" summary="+2">
-      <created>1493090378709</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1493090378709</updated>
-    </task>
-    <task id="LOCAL-00011" summary="+3">
-      <created>1493247351000</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1493247351000</updated>
+      <workItem from="1517973177718" duration="5097000" />
     </task>
     <task id="LOCAL-00012" summary="Coverage start...">
       <created>1495888785100</created>
@@ -973,43 +1041,57 @@
       <option name="project" value="LOCAL" />
       <updated>1517976806435</updated>
     </task>
-    <option name="localTasksCounter" value="59" />
+    <task id="LOCAL-00059" summary="Deprecated `ServerGenerator`">
+      <created>1517977060369</created>
+      <option name="number" value="00059" />
+      <option name="presentableId" value="LOCAL-00059" />
+      <option name="project" value="LOCAL" />
+      <updated>1517977060369</updated>
+    </task>
+    <task id="LOCAL-00060" summary="Updated tests to use `AngelHttp` API">
+      <created>1517978048042</created>
+      <option name="number" value="00060" />
+      <option name="presentableId" value="LOCAL-00060" />
+      <option name="project" value="LOCAL" />
+      <updated>1517978048043</updated>
+    </task>
+    <option name="localTasksCounter" value="61" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.02.06 at 22h 24m 09s.xml">
+    <history-entry file="All_Tests - 2018.02.06 at 23h 24m 26s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 12m 52s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 24m 59s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.11.28 at 13h 46m 37s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 25m 58s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.12.06 at 09h 45m 26s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 26m 57s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.12.12 at 13h 28m 22s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 28m 52s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests_(PRODUCTION) - 2017.12.12 at 13h 33m 34s.xml">
-      <configuration name="All Tests (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 29m 36s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 05m 10s.xml">
-      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 31m 02s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 05m 25s.xml">
-      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 32m 48s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 06m 00s.xml">
-      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 33m 32s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="only_match_route_with_matching_method_in_routing_test_dart - 2017.11.28 at 13h 07m 52s.xml">
-      <configuration name="only match route with matching method in routing_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.02.06 at 23h 33m 56s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="121894000" />
+    <option name="totallyTimeSpent" value="123133000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1044,7 +1126,7 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1068,8 +1150,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Logging support" />
-    <MESSAGE value="Updated `use`" />
     <MESSAGE value="+2" />
     <MESSAGE value="+3" />
     <MESSAGE value="+4" />
@@ -1093,7 +1173,9 @@
     <MESSAGE value="Deprecated all serving logic in `Angel`" />
     <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
     <MESSAGE value="Deprecated createZoneForRequest" />
-    <option name="LAST_COMMIT_MESSAGE" value="Deprecated createZoneForRequest" />
+    <MESSAGE value="Deprecated `ServerGenerator`" />
+    <MESSAGE value="Updated tests to use `AngelHttp` API" />
+    <option name="LAST_COMMIT_MESSAGE" value="Updated tests to use `AngelHttp` API" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1102,34 +1184,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/developer/developer.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/expando.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="12" column="24" lean-forward="true" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="339" column="48" lean-forward="true" selection-start-line="339" selection-start-column="48" selection-end-line="339" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/schedule_microtask.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="131" column="5" lean-forward="false" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib/src/middleware_pipeline.dart" />
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib/src/tuple.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1191,13 +1245,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="152" column="66" lean-forward="true" selection-start-line="152" selection-start-column="66" selection-end-line="152" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib/pool.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="375">
@@ -1233,13 +1280,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="36" column="4" lean-forward="false" selection-start-line="36" selection-start-column="4" selection-end-line="36" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/pattern.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
@@ -1254,13 +1294,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="109">
-          <caret line="85" column="32" lean-forward="false" selection-start-line="85" selection-start-column="32" selection-end-line="85" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="392">
@@ -1268,20 +1301,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="85" column="23" lean-forward="false" selection-start-line="85" selection-start-column="23" selection-end-line="85" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/map.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2658">
@@ -1317,13 +1336,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="32" lean-forward="false" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1331,35 +1343,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="28" lean-forward="false" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
           <folding>
-            <element signature="e#0#38#0" expanded="true" />
+            <element signature="e#0#38#0" expanded="false" />
             <marker date="1511894754000" expanded="true" signature="1709:1766" ph="{...}" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3015">
-          <caret line="205" column="5" lean-forward="false" selection-start-line="205" selection-start-column="5" selection-end-line="205" selection-end-column="5" />
-          <folding>
-            <marker date="1511894754000" expanded="false" signature="7:13" ph="..." />
-            <marker date="1511894754000" expanded="true" signature="6165:6175" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
@@ -1368,14 +1362,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="452">
-          <caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1389,20 +1375,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="647">
-          <caret line="137" column="62" lean-forward="false" selection-start-line="137" selection-start-column="62" selection-end-line="137" selection-end-column="62" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="82">
           <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
           <folding>
-            <element signature="e#0#22#0" expanded="true" />
+            <element signature="e#0#22#0" expanded="false" />
             <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
           </folding>
         </state>
@@ -1413,7 +1391,7 @@
         <state relative-caret-position="245">
           <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1453,27 +1431,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="41" lean-forward="false" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="27" column="64" lean-forward="false" selection-start-line="27" selection-start-column="64" selection-end-line="27" selection-end-column="64" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
+        <state relative-caret-position="461">
           <caret line="65" column="61" lean-forward="false" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
           <folding>
             <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
@@ -1481,10 +1441,151 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="263">
+          <caret line="29" column="68" lean-forward="false" selection-start-line="29" selection-start-column="68" selection-end-line="29" selection-end-column="68" />
+          <folding>
+            <element signature="e#100#120#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="19" lean-forward="true" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="26" column="21" lean-forward="false" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="62" column="32" lean-forward="false" selection-start-line="62" selection-start-column="32" selection-end-line="62" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="99">
+          <caret line="38" column="4" lean-forward="false" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="276">
+          <caret line="103" column="25" lean-forward="false" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1269">
+          <caret line="102" column="14" lean-forward="false" selection-start-line="102" selection-start-column="14" selection-end-line="102" selection-end-column="14" />
+          <folding>
+            <marker date="1517977457000" expanded="false" signature="7:13" ph="..." />
+            <marker date="1517977457000" expanded="true" signature="6143:6153" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="23" column="30" lean-forward="false" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
+        <state relative-caret-position="180">
+          <caret line="422" column="22" lean-forward="true" selection-start-line="422" selection-start-column="22" selection-end-line="422" selection-end-column="22" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="709" column="35" lean-forward="false" selection-start-line="709" selection-start-column="35" selection-end-line="709" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="52" column="40" lean-forward="true" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="275" column="3" lean-forward="true" selection-start-line="275" selection-start-column="3" selection-end-line="275" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
           <folding />
         </state>
       </provider>
diff --git a/example/common.dart b/example/common.dart
deleted file mode 100644
index c47d469d..00000000
--- a/example/common.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-Future<HttpServer> startShared(InternetAddress address, int port) => HttpServer
-    .bind(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, shared: true);
diff --git a/example/json.dart b/example/json.dart
index 684a7056..81e33562 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -29,7 +29,8 @@ main() async {
 }
 
 serverMain(_) async {
-  var app = new Angel.custom(startShared); // Run a cluster
+  var app = new Angel();
+  var http = new AngelHttp.custom(app, startShared); // Run a cluster
 
   app.get('/', {
     "foo": "bar",
@@ -47,5 +48,6 @@ serverMain(_) async {
     print(e.stackTrace);
   };
 
-  await app.startServer(InternetAddress.LOOPBACK_IP_V4, 3000);
+  var server = await http.startServer(InternetAddress.LOOPBACK_IP_V4, 3000);
+  print('Listening at http://${server.address.address}:${server.port}');
 }
diff --git a/example/main.dart b/example/main.dart
new file mode 100644
index 00000000..5f3a61e8
--- /dev/null
+++ b/example/main.dart
@@ -0,0 +1,19 @@
+import 'package:angel_framework/angel_framework.dart';
+
+main() async {
+  var app = new Angel();
+
+  app.get('/', () => 'Welcome to Angel!');
+
+  app.get('/greet/:name', (String name) => 'Hello, $name!');
+
+  app.use((RequestContext req) async {
+    throw new AngelHttpException.notFound(
+      message: 'Unknown path: "${req.uri.path}"',
+    );
+  });
+
+  var http = new AngelHttp(app);
+  var server = await http.startServer('127.0.0.1', 3000);
+  print('Listening at http://${server.address.address}:${server.port}');
+}

From dbfac9c5839bf243966bae66e5d4c70956ed7a6b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:59:05 -0500
Subject: [PATCH 182/414] Create HttpRequestContextImpl

---
 .idea/workspace.xml                    | 285 +++++++++----------------
 lib/src/http/angel_http.dart           |   3 +-
 lib/src/http/http_request_context.dart | 139 ++++++++++++
 lib/src/http/request_context.dart      | 102 ++-------
 4 files changed, 265 insertions(+), 264 deletions(-)
 create mode 100644 lib/src/http/http_request_context.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6983a17f..33521cff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/main_dart.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/example/main.dart" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/example/common.dart" afterPath="" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -28,44 +27,14 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.50455236">
+    <splitter split-orientation="horizontal" split-proportion="0.53945374">
       <split-first>
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-          <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+        <leaf>
+          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="176">
-                  <caret line="23" column="30" lean-forward="false" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="119">
-                  <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="192">
-                  <caret line="52" column="40" lean-forward="true" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/example/json.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="0">
-                  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+                <state relative-caret-position="257">
+                  <caret line="281" column="65" lean-forward="false" selection-start-line="281" selection-start-column="65" selection-end-line="281" selection-end-column="65" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -73,80 +42,15 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/example/main.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="270">
-                  <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="180">
-                  <caret line="422" column="22" lean-forward="true" selection-start-line="422" selection-start-column="22" selection-end-line="422" selection-end-column="22" />
-                  <folding>
-                    <element signature="e#38#58#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="276">
-                  <caret line="103" column="25" lean-forward="false" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="99">
-                  <caret line="38" column="4" lean-forward="false" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="132">
-                  <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-1269">
-                  <caret line="102" column="14" lean-forward="false" selection-start-line="102" selection-start-column="14" selection-end-line="102" selection-end-column="14" />
-                  <folding>
-                    <marker date="1517977457000" expanded="false" signature="7:13" ph="..." />
-                    <marker date="1517977457000" expanded="true" signature="6143:6153" ph="{...}" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
         </leaf>
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="182">
-                  <caret line="275" column="3" lean-forward="true" selection-start-line="275" selection-start-column="3" selection-end-line="275" selection-end-column="3" />
+                <state relative-caret-position="90">
+                  <caret line="6" column="69" lean-forward="false" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -161,13 +65,13 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Gherkin feature file" />
         <option value="Dart File" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>path</find>
       <find>handleRequest</find>
       <find>flatten</find>
       <find>pipeline</find>
@@ -197,6 +101,7 @@
       <find>app</find>
       <find>handleRe</find>
       <find>instead.</find>
+      <find>io\b</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -246,7 +151,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/util_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
@@ -277,14 +181,12 @@
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
@@ -297,6 +199,9 @@
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -710,14 +615,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="5097000" />
-    </task>
-    <task id="LOCAL-00012" summary="Coverage start...">
-      <created>1495888785100</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1495888785100</updated>
+      <workItem from="1517973177718" duration="6314000" />
     </task>
     <task id="LOCAL-00013" summary="1.0.3">
       <created>1496752953708</created>
@@ -1055,7 +953,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517978048043</updated>
     </task>
-    <option name="localTasksCounter" value="61" />
+    <task id="LOCAL-00061" summary="Added example/main.dart">
+      <created>1517978306602</created>
+      <option name="number" value="00061" />
+      <option name="presentableId" value="LOCAL-00061" />
+      <option name="project" value="LOCAL" />
+      <updated>1517978306602</updated>
+    </task>
+    <option name="localTasksCounter" value="62" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1091,7 +996,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="123133000" />
+    <option name="totallyTimeSpent" value="124350000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1126,7 +1031,7 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1150,7 +1055,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="+2" />
     <MESSAGE value="+3" />
     <MESSAGE value="+4" />
     <MESSAGE value="+6" />
@@ -1175,7 +1079,8 @@
     <MESSAGE value="Deprecated createZoneForRequest" />
     <MESSAGE value="Deprecated `ServerGenerator`" />
     <MESSAGE value="Updated tests to use `AngelHttp` API" />
-    <option name="LAST_COMMIT_MESSAGE" value="Updated tests to use `AngelHttp` API" />
+    <MESSAGE value="Added example/main.dart" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added example/main.dart" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1184,21 +1089,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-1.0.6/lib/src/middleware_pipeline.dart" />
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib/src/tuple.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="78" column="21" lean-forward="false" selection-start-line="78" selection-start-column="21" selection-end-line="78" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.2/lib/src/parse_body.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="90" column="7" lean-forward="true" selection-start-line="90" selection-start-column="7" selection-end-line="90" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="107">
@@ -1329,13 +1219,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="249" column="30" lean-forward="true" selection-start-line="249" selection-start-column="30" selection-end-line="249" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1512,6 +1395,40 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/example/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="52" column="40" lean-forward="true" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1530,7 +1447,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
+        <state relative-caret-position="6330">
           <caret line="422" column="22" lean-forward="true" selection-start-line="422" selection-start-column="22" selection-end-line="422" selection-end-column="22" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
@@ -1538,58 +1455,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib/meta.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="709" column="35" lean-forward="false" selection-start-line="709" selection-start-column="35" selection-end-line="709" selection-end-column="35" />
+        <state relative-caret-position="224">
+          <caret line="201" column="50" lean-forward="false" selection-start-line="201" selection-start-column="50" selection-end-line="201" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib/src/body_parse_result.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="52" column="40" lean-forward="true" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
+        <state relative-caret-position="240">
+          <caret line="16" column="31" lean-forward="true" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="820" column="15" lean-forward="false" selection-start-line="820" selection-start-column="15" selection-end-line="820" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="69" lean-forward="false" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="227">
+          <caret line="232" column="19" lean-forward="false" selection-start-line="232" selection-start-column="19" selection-end-line="232" selection-end-column="19" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="275" column="3" lean-forward="true" selection-start-line="275" selection-start-column="3" selection-end-line="275" selection-end-column="3" />
+        <state relative-caret-position="257">
+          <caret line="281" column="65" lean-forward="false" selection-start-line="281" selection-start-column="65" selection-end-line="281" selection-end-column="65" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 5579d0d1..1b4debbb 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -7,6 +7,7 @@ import 'package:combinator/combinator.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:pool/pool.dart';
 import 'package:tuple/tuple.dart';
+import 'http_request_context.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'server.dart';
@@ -278,7 +279,7 @@ class AngelHttp {
   Future<RequestContext> createRequestContext(HttpRequest request) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
     if (path.length == 0) path = '/';
-    return RequestContext.from(request, app, path).then((req) async {
+    return HttpRequestContextImpl.from(request, app, path).then((req) async {
       if (_pool != null) req.inject(PoolResource, await _pool.request());
       if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
       return req;
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
new file mode 100644
index 00000000..096a4718
--- /dev/null
+++ b/lib/src/http/http_request_context.dart
@@ -0,0 +1,139 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:body_parser/body_parser.dart';
+import 'request_context.dart';
+import 'server.dart';
+
+/// An implementation of [RequestContext] that wraps a [HttpRequest].
+class HttpRequestContextImpl extends RequestContext {
+  ContentType _contentType;
+  HttpRequest _io;
+  String _override, _path;
+
+  @override
+  ContentType get contentType {
+    return _contentType;
+  }
+
+  @override
+  List<Cookie> get cookies {
+    return io.cookies;
+  }
+
+  @override
+  HttpHeaders get headers {
+    return io.headers;
+  }
+
+  @override
+  String get hostname {
+    return io.headers.value(HttpHeaders.HOST);
+  }
+
+  /// The underlying [HttpRequest] instance underneath this context.
+  HttpRequest get io => _io;
+
+  @override
+  String get method {
+    return  _override ?? originalMethod;
+  }
+
+  @override
+  String get originalMethod {
+    return io.method;
+  }
+
+  @override
+  String get path {
+    return _path;
+  }
+
+  @override
+  InternetAddress get remoteAddress {
+    return io.connectionInfo.remoteAddress;
+  }
+
+  @override
+  HttpSession get session {
+    return io.session;
+  }
+
+  @override
+  Uri get uri {
+    return io.uri;
+  }
+
+  @override
+  bool get xhr {
+    return io.headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
+        'xmlhttprequest';
+  }
+
+  /// Magically transforms an [HttpRequest] into a [RequestContext].
+  static Future<HttpRequestContextImpl> from(
+      HttpRequest request, Angel app, String path) async {
+    HttpRequestContextImpl ctx = new HttpRequestContextImpl();
+
+    String override = request.method;
+
+    if (app.allowMethodOverrides == true)
+      override =
+          request.headers.value('x-http-method-override')?.toUpperCase() ??
+              request.method;
+
+    ctx.app = app;
+    ctx._contentType = request.headers.contentType;
+    ctx._override = override;
+
+    /*
+    // Faster way to get path
+    List<int> _path = [];
+
+    // Go up until we reach a ?
+    for (int ch in request.uri.toString().codeUnits) {
+      if (ch != $question)
+        _path.add(ch);
+      else
+        break;
+    }
+
+    // Remove trailing slashes
+    int lastSlash = -1;
+
+    for (int i = _path.length - 1; i >= 0; i--) {
+      if (_path[i] == $slash)
+        lastSlash = i;
+      else
+        break;
+    }
+
+    if (lastSlash > -1)
+      ctx._path = new String.fromCharCodes(_path.take(lastSlash));
+    else
+      ctx._path = new String.fromCharCodes(_path);
+      */
+
+    ctx._path = path;
+    ctx._io = request;
+
+    if (app.lazyParseBodies != true) {
+      await ctx.parse();
+    }
+
+    return ctx;
+  }
+
+  @override
+  Future close() {
+    _contentType = null;
+    _io = null;
+    _override = _path = null;
+    return super.close();
+  }
+
+  @override
+  Future<BodyParseResult> parseOnce() async {
+    return await parseBody(io,
+        storeOriginalBuffer: app.storeOriginalBuffer == true);
+  }
+}
diff --git a/lib/src/http/request_context.dart b/lib/src/http/request_context.dart
index 41fbe2ca..4cb6d625 100644
--- a/lib/src/http/request_context.dart
+++ b/lib/src/http/request_context.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:mirrors';
 import 'package:body_parser/body_parser.dart';
+import 'package:meta/meta.dart';
 import 'package:path/path.dart' as p;
 import 'metadata.dart';
 import 'response_context.dart';
@@ -12,13 +13,10 @@ import 'server.dart' show Angel;
 part 'injection.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
-class RequestContext {
+abstract class RequestContext {
   String _acceptHeaderCache, _extensionCache;
   bool _acceptsAllCache;
   BodyParseResult _body;
-  ContentType _contentType;
-  HttpRequest _io;
-  String _override, _path;
   Map _provisionalQuery;
 
   final Map properties = {};
@@ -30,13 +28,13 @@ class RequestContext {
   Angel app;
 
   /// Any cookies sent with this request.
-  List<Cookie> get cookies => io.cookies;
+  List<Cookie> get cookies;
 
   /// All HTTP headers sent with this request.
-  HttpHeaders get headers => io.headers;
+  HttpHeaders get headers;
 
   /// The requested hostname.
-  String get hostname => io.headers.value(HttpHeaders.HOST);
+  String get hostname;
 
   final Map _injections = {};
   Map _injectionsCache;
@@ -44,8 +42,9 @@ class RequestContext {
   /// A [Map] of singletons injected via [inject]. *Read-only*.
   Map get injections => _injectionsCache ??= new Map.unmodifiable(_injections);
 
-  /// The underlying [HttpRequest] instance underneath this context.
-  HttpRequest get io => _io;
+  /// This feature does not map to other adapters (i.e. HTTP/2), so it will be removed in a future version.
+  @deprecated
+  HttpRequest get io;
 
   /// The user's IP.
   String get ip => remoteAddress.address;
@@ -53,10 +52,10 @@ class RequestContext {
   /// This request's HTTP method.
   ///
   /// This may have been processed by an override. See [originalMethod] to get the real method.
-  String get method => _override ?? originalMethod;
+  String get method;
 
   /// The original HTTP verb sent to the server.
-  String get originalMethod => io.method;
+  String get originalMethod;
 
   StateError _unparsed(String type, String caps) => new StateError(
       'Cannot get the $type of an unparsed request. Use lazy${caps}() instead.');
@@ -75,7 +74,7 @@ class RequestContext {
   }
 
   /// The content type of an incoming request.
-  ContentType get contentType => _contentType;
+  ContentType get contentType;
 
   /// Any and all files sent to the server with this request.
   ///
@@ -107,7 +106,7 @@ class RequestContext {
   Map params = {};
 
   /// The requested path.
-  String get path => _path;
+  String get path;
 
   /// The parsed request query string.
   ///
@@ -123,80 +122,22 @@ class RequestContext {
   }
 
   /// The remote address requesting this resource.
-  InternetAddress get remoteAddress => io.connectionInfo.remoteAddress;
+  InternetAddress get remoteAddress;
 
   /// The user's HTTP session.
-  HttpSession get session => io.session;
+  HttpSession get session;
 
   /// The [Uri] instance representing the path this request is responding to.
-  Uri get uri => io.uri;
+  Uri get uri;
 
   /// Is this an **XMLHttpRequest**?
-  bool get xhr =>
-      io.headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
-      'xmlhttprequest';
+  bool get xhr;
 
   /// Returns the file extension of the requested path, if any.
   ///
   /// Includes the leading `.`, if there is one.
   String get extension => _extensionCache ??= p.extension(uri.path);
 
-  /// Magically transforms an [HttpRequest] into a [RequestContext].
-  static Future<RequestContext> from(
-      HttpRequest request, Angel app, String path) async {
-    RequestContext ctx = new RequestContext();
-
-    String override = request.method;
-
-    if (app.allowMethodOverrides == true)
-      override =
-          request.headers.value('x-http-method-override')?.toUpperCase() ??
-              request.method;
-
-    ctx.app = app;
-    ctx._contentType = request.headers.contentType;
-    ctx._override = override;
-
-    /*
-    // Faster way to get path
-    List<int> _path = [];
-
-    // Go up until we reach a ?
-    for (int ch in request.uri.toString().codeUnits) {
-      if (ch != $question)
-        _path.add(ch);
-      else
-        break;
-    }
-
-    // Remove trailing slashes
-    int lastSlash = -1;
-
-    for (int i = _path.length - 1; i >= 0; i--) {
-      if (_path[i] == $slash)
-        lastSlash = i;
-      else
-        break;
-    }
-
-    if (lastSlash > -1)
-      ctx._path = new String.fromCharCodes(_path.take(lastSlash));
-    else
-      ctx._path = new String.fromCharCodes(_path);
-      */
-
-    ctx._path = path;
-    ctx._io = request;
-
-    if (app.lazyParseBodies != true) {
-      ctx._body = (await parseBody(request,
-              storeOriginalBuffer: app.storeOriginalBuffer == true)) ??
-          {};
-    }
-
-    return ctx;
-  }
-
   /// Grabs an object by key or type from [params], [_injections], or
   /// [app].container. Use this to perform dependency injection
   /// within a service hook.
@@ -248,6 +189,7 @@ class RequestContext {
         ? contentType.mimeType
         : contentType?.toString();
 
+    // Change to assert
     if (contentTypeString == null)
       throw new ArgumentError(
           'RequestContext.accepts expects the `contentType` parameter to NOT be null.');
@@ -293,18 +235,18 @@ class RequestContext {
       return _body;
     else
       _provisionalQuery = null;
-    return _body = await parseBody(io,
-        storeOriginalBuffer: app.storeOriginalBuffer == true);
+    return _body = await parseOnce();
   }
 
+  /// Override this method to one-time parse an incoming request.
+  @virtual
+  Future<BodyParseResult> parseOnce();
+
   /// Disposes of all resources.
   Future close() async {
     _body = null;
     _acceptsAllCache = null;
     _acceptHeaderCache = null;
-    _io = null;
-    _override = _path = null;
-    _contentType = null;
     _provisionalQuery?.clear();
     properties.clear();
     _injections.clear();

From cf02582d1b82edfa773ee0770bb2c7c74f996d3b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Feb 2018 23:59:59 -0500
Subject: [PATCH 183/414] Change return type of
 `AngelHttp.createRequestContext`

---
 .idea/workspace.xml          | 42 +++++++++++++++++-------------------
 lib/src/http/angel_http.dart |  2 +-
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33521cff..adcfb23a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/request_context.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -33,8 +31,8 @@
           <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="257">
-                  <caret line="281" column="65" lean-forward="false" selection-start-line="281" selection-start-column="65" selection-end-line="281" selection-end-column="65" />
+                <state relative-caret-position="212">
+                  <caret line="278" column="31" lean-forward="false" selection-start-line="278" selection-start-column="31" selection-end-line="278" selection-end-column="31" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -312,7 +310,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -615,14 +613,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="6314000" />
-    </task>
-    <task id="LOCAL-00013" summary="1.0.3">
-      <created>1496752953708</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1496752953708</updated>
+      <workItem from="1517973177718" duration="6361000" />
     </task>
     <task id="LOCAL-00014" summary="1.0.3">
       <created>1497200046584</created>
@@ -960,13 +951,17 @@
       <option name="project" value="LOCAL" />
       <updated>1517978306602</updated>
     </task>
-    <option name="localTasksCounter" value="62" />
+    <task id="LOCAL-00062" summary="Create HttpRequestContextImpl">
+      <created>1517979545063</created>
+      <option name="number" value="00062" />
+      <option name="presentableId" value="LOCAL-00062" />
+      <option name="project" value="LOCAL" />
+      <updated>1517979545063</updated>
+    </task>
+    <option name="localTasksCounter" value="63" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.02.06 at 23h 24m 26s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.02.06 at 23h 24m 59s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -994,9 +989,12 @@
     <history-entry file="All_Tests - 2018.02.06 at 23h 33m 56s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.02.06 at 23h 59m 25s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="124350000" />
+    <option name="totallyTimeSpent" value="124397000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1055,7 +1053,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="+3" />
     <MESSAGE value="+4" />
     <MESSAGE value="+6" />
     <MESSAGE value="autoIdAndDateFields in MapService" />
@@ -1080,7 +1077,8 @@
     <MESSAGE value="Deprecated `ServerGenerator`" />
     <MESSAGE value="Updated tests to use `AngelHttp` API" />
     <MESSAGE value="Added example/main.dart" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added example/main.dart" />
+    <MESSAGE value="Create HttpRequestContextImpl" />
+    <option name="LAST_COMMIT_MESSAGE" value="Create HttpRequestContextImpl" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1501,8 +1499,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="281" column="65" lean-forward="false" selection-start-line="281" selection-start-column="65" selection-end-line="281" selection-end-column="65" />
+        <state relative-caret-position="212">
+          <caret line="278" column="31" lean-forward="false" selection-start-line="278" selection-start-column="31" selection-end-line="278" selection-end-column="31" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 1b4debbb..da3ad43f 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -276,7 +276,7 @@ class AngelHttp {
     });
   }
 
-  Future<RequestContext> createRequestContext(HttpRequest request) {
+  Future<HttpRequestContextImpl> createRequestContext(HttpRequest request) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
     if (path.length == 0) path = '/';
     return HttpRequestContextImpl.from(request, app, path).then((req) async {

From 9b7bf84acfebdfee190ba1e5437361ce3274c1b9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:21:14 -0500
Subject: [PATCH 184/414] Deprecated `ResponseContext.io`, added HTTP
 equivalent

---
 .idea/workspace.xml                     | 180 +++++++++++++-----------
 lib/src/http/angel_http.dart            |   3 +-
 lib/src/http/http_response_context.dart | 120 ++++++++++++++++
 lib/src/http/response_context.dart      | 165 +++++++---------------
 lib/src/http/server.dart                |   1 -
 5 files changed, 272 insertions(+), 197 deletions(-)
 create mode 100644 lib/src/http/http_response_context.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index adcfb23a..04c5ce5d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -25,16 +28,26 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.53945374">
+    <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf>
-          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="212">
-                  <caret line="278" column="31" lean-forward="false" selection-start-line="278" selection-start-column="31" selection-end-line="278" selection-end-column="31" />
+                <state relative-caret-position="402">
+                  <caret line="151" column="5" lean-forward="true" selection-start-line="151" selection-start-column="5" selection-end-line="151" selection-end-column="5" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="135">
+                  <caret line="12" column="43" lean-forward="true" selection-start-line="12" selection-start-column="43" selection-end-line="12" selection-end-column="43" />
                   <folding>
-                    <element signature="e#0#20#0" expanded="true" />
+                    <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
                   </folding>
                 </state>
               </provider>
@@ -44,11 +57,11 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+          <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="90">
-                  <caret line="6" column="69" lean-forward="false" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
+                <state relative-caret-position="437">
+                  <caret line="108" column="0" lean-forward="true" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -70,12 +83,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>handleRequest</find>
-      <find>flatten</find>
-      <find>pipeline</find>
-      <find>pat</find>
-      <find>createR</find>
-      <find>print</find>
       <find>dispos</find>
       <find>xhr</find>
       <find>accepts</find>
@@ -100,6 +107,12 @@
       <find>handleRe</find>
       <find>instead.</find>
       <find>io\b</find>
+      <find>_isOpen</find>
+      <find>_isClosed</find>
+      <find>end</find>
+      <find>isOpen</find>
+      <find>_useStream</find>
+      <find>isClosed</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -123,6 +136,10 @@
       <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
       <replace>'content-type'</replace>
       <replace>appa</replace>
+      <replace>isClosed</replace>
+      <replace>useStream</replace>
+      <replace>streaming</replace>
+      <replace>!isOpen</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -149,7 +166,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/performance/hello/angel.md" />
         <option value="$PROJECT_DIR$/performance/hello/raw.md" />
         <option value="$PROJECT_DIR$/tool/travis.sh" />
@@ -183,7 +199,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
@@ -193,13 +208,15 @@
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
       </list>
     </option>
   </component>
@@ -613,14 +630,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="6361000" />
-    </task>
-    <task id="LOCAL-00014" summary="1.0.3">
-      <created>1497200046584</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1497200046584</updated>
+      <workItem from="1517973177718" duration="7635000" />
     </task>
     <task id="LOCAL-00015" summary="+1">
       <created>1497200256280</created>
@@ -958,7 +968,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517979545063</updated>
     </task>
-    <option name="localTasksCounter" value="63" />
+    <task id="LOCAL-00063" summary="Change return type of `AngelHttp.createRequestContext`">
+      <created>1517979599468</created>
+      <option name="number" value="00063" />
+      <option name="presentableId" value="LOCAL-00063" />
+      <option name="project" value="LOCAL" />
+      <updated>1517979599468</updated>
+    </task>
+    <option name="localTasksCounter" value="64" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -994,7 +1011,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="124397000" />
+    <option name="totallyTimeSpent" value="125671000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1053,7 +1070,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="+4" />
     <MESSAGE value="+6" />
     <MESSAGE value="autoIdAndDateFields in MapService" />
     <MESSAGE value="+8" />
@@ -1078,22 +1094,16 @@
     <MESSAGE value="Updated tests to use `AngelHttp` API" />
     <MESSAGE value="Added example/main.dart" />
     <MESSAGE value="Create HttpRequestContextImpl" />
-    <option name="LAST_COMMIT_MESSAGE" value="Create HttpRequestContextImpl" />
+    <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Change return type of `AngelHttp.createRequestContext`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="4" />
+      <option name="time" value="5" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="107">
-          <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1277,14 +1287,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1005">
-          <caret line="76" column="26" lean-forward="false" selection-start-line="76" selection-start-column="26" selection-end-line="76" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
@@ -1312,16 +1314,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="461">
-          <caret line="65" column="61" lean-forward="false" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
-          <folding>
-            <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="263">
@@ -1443,16 +1435,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6330">
-          <caret line="422" column="22" lean-forward="true" selection-start-line="422" selection-start-column="22" selection-end-line="422" selection-end-column="22" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib/meta.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="224">
@@ -1477,16 +1459,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="69" lean-forward="false" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="227">
@@ -1497,16 +1469,64 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="212">
-          <caret line="278" column="31" lean-forward="false" selection-start-line="278" selection-start-column="31" selection-end-line="278" selection-end-column="31" />
+        <state relative-caret-position="-910">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="292" column="38" lean-forward="false" selection-start-line="292" selection-start-column="38" selection-end-line="292" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="41" column="16" lean-forward="false" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="16" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="12" column="43" lean-forward="true" selection-start-line="12" selection-start-column="43" selection-end-line="12" selection-end-column="43" />
+          <folding>
+            <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="437">
+          <caret line="108" column="0" lean-forward="true" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="402">
+          <caret line="151" column="5" lean-forward="true" selection-start-line="151" selection-start-column="5" selection-end-line="151" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index da3ad43f..0c0b12b3 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -8,6 +8,7 @@ import 'package:json_god/json_god.dart' as god;
 import 'package:pool/pool.dart';
 import 'package:tuple/tuple.dart';
 import 'http_request_context.dart';
+import 'http_response_context.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'server.dart';
@@ -289,7 +290,7 @@ class AngelHttp {
   Future<ResponseContext> createResponseContext(HttpResponse response,
           [RequestContext correspondingRequest]) =>
       new Future<ResponseContext>.value(
-          new ResponseContext(response, app, correspondingRequest)
+          new HttpResponseContextImpl(response, app, correspondingRequest)
             ..serializer = (app.serializer ?? god.serialize)
             ..encoders.addAll(app.encoders ?? {}));
 
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
new file mode 100644
index 00000000..6ed7bd03
--- /dev/null
+++ b/lib/src/http/http_response_context.dart
@@ -0,0 +1,120 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'http_request_context.dart';
+import 'request_context.dart';
+import 'response_context.dart';
+import 'server.dart';
+
+class HttpResponseContextImpl extends ResponseContext {
+  /// The underlying [HttpResponse] under this instance.
+  @override
+  final HttpResponse io;
+  Angel app;
+
+  final HttpRequestContextImpl _correspondingRequest;
+  bool _isClosed = false, _useStream = false;
+
+  HttpResponseContextImpl(this.io, this.app, [this._correspondingRequest]);
+
+  @override
+  RequestContext get correspondingRequest {
+    return _correspondingRequest;
+  }
+
+  @override
+  bool get streaming {
+    return _useStream;
+  }
+
+  @override
+  void addError(Object error, [StackTrace stackTrace]) {
+    io.addError(error, stackTrace);
+    super.addError(error, stackTrace);
+  }
+
+  @override
+  bool useStream() {
+    if (!_useStream) {
+      // If this is the first stream added to this response,
+      // then add headers, status code, etc.
+      io
+        ..statusCode = statusCode
+        ..cookies.addAll(cookies);
+      headers.forEach(io.headers.set);
+      willCloseItself = _useStream = _isClosed = true;
+      releaseCorrespondingRequest();
+      return true;
+    }
+
+    return false;
+  }
+
+  @override
+  void end() {
+    _isClosed = true;
+    super.end();
+  }
+
+  @override
+  Future addStream(Stream<List<int>> stream) {
+    if (_isClosed && !_useStream) throw ResponseContext.closed();
+    var firstStream = useStream();
+
+    Stream<List<int>> output = stream;
+
+    if (encoders.isNotEmpty && correspondingRequest != null) {
+      var allowedEncodings =
+      (correspondingRequest.headers[HttpHeaders.ACCEPT_ENCODING] ?? [])
+          .map((str) {
+        // Ignore quality specifications in accept-encoding
+        // ex. gzip;q=0.8
+        if (!str.contains(';')) return str;
+        return str.split(';')[0];
+      });
+
+      for (var encodingName in allowedEncodings) {
+        Converter<List<int>, List<int>> encoder;
+        String key = encodingName;
+
+        if (encoders.containsKey(encodingName))
+          encoder = encoders[encodingName];
+        else if (encodingName == '*') {
+          encoder = encoders[key = encoders.keys.first];
+        }
+
+        if (encoder != null) {
+          if (firstStream) {
+            io.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+          }
+
+          output = encoders[key].bind(output);
+          break;
+        }
+      }
+    }
+
+    return io.addStream(output);
+  }
+
+  @override
+  void add(List<int> data) {
+    if (_isClosed && !_useStream)
+      throw ResponseContext.closed();
+    else if (_useStream)
+      io.add(data);
+    else
+      buffer.add(data);
+  }
+
+  @override
+  Future close() async {
+    if (_useStream) {
+      await io.close();
+    }
+
+    _isClosed = true;
+    await super.close();
+    _useStream = false;
+  }
+}
\ No newline at end of file
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 8a5d3c19..15aaba43 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -23,14 +23,12 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef String ResponseSerializer(data);
 
 /// A convenience wrapper around an outgoing HTTP request.
-class ResponseContext implements StreamSink<List<int>>, StringSink {
+abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
   final BytesBuilder _buffer = new _LockableBytesBuilder();
   final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
-  final RequestContext _correspondingRequest;
 
   Completer _done;
-  bool _isOpen = true, _isClosed = false, _useStream = false;
   int _statusCode = 200;
 
   /// The [Angel] instance that is sending a response.
@@ -48,7 +46,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   final Map<String, Converter<List<int>, List<int>>> encoders = {};
 
   /// Points to the [RequestContext] corresponding to this response.
-  RequestContext get correspondingRequest => _correspondingRequest;
+  RequestContext get correspondingRequest;
 
   @override
   Future get done => (_done ?? new Completer()).future;
@@ -56,7 +54,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// Headers that will be sent to the user.
   Map<String, String> get headers {
     /// If the response is closed, then this getter will return an immutable `Map`.
-    if (_isClosed)
+    if (!isOpen)
       return new Map<String, String>.unmodifiable(_headers);
     else
       return _headers;
@@ -80,20 +78,23 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   int get statusCode => _statusCode;
 
   void set statusCode(int value) {
-    if (_isClosed)
-      throw _closed();
+    if (!isOpen)
+      throw closed();
     else
       _statusCode = value ?? 200;
   }
 
   /// Can we still write to this response?
-  bool get isOpen => _isOpen && !_isClosed;
+  bool get isOpen => !!isOpen;
+
+  /// Returns `true` if a [Stream] is being written directly.
+  bool get streaming;
 
   /// A set of UTF-8 encoded bytes that will be written to the response.
   BytesBuilder get buffer => _buffer;
 
   /// The underlying [HttpResponse] under this instance.
-  final HttpResponse io;
+  HttpResponse get io;
 
   /// Gets the Content-Type header.
   ContentType get contentType {
@@ -116,25 +117,23 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
     headers[HttpHeaders.CONTENT_TYPE] = contentType.toString();
   }
 
-  ResponseContext(this.io, this.app, [this._correspondingRequest]);
-
   /// Set this to true if you will manually close the response.
   ///
   /// If `true`, all response finalizers will be skipped.
   bool willCloseItself = false;
 
-  StateError _closed() => new StateError('Cannot modify a closed response.');
+  static StateError closed() => new StateError('Cannot modify a closed response.');
 
   /// Sends a download as a response.
   Future download(File file, {String filename}) async {
-    if (!_isOpen) throw _closed();
+    if (!isOpen) throw closed();
 
     headers["Content-Disposition"] =
         'attachment; filename="${filename ?? file.path}"';
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     headers[HttpHeaders.CONTENT_LENGTH] = file.lengthSync().toString();
 
-    if (_useStream) {
+    if (streaming) {
       await file.openRead().pipe(this);
     } else {
       buffer.add(await file.readAsBytes());
@@ -143,22 +142,17 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Prevents more data from being written to the response, and locks it entire from further editing.
+  ///
+  /// This method should be overwritten, setting [streaming] to `false`, **after** a `super` call.
   Future close() {
-    var f = new Future.value();
-
-    if (_useStream) {
-      _useStream = false;
+    if (streaming) {
       _buffer?.clear();
-      f = io.close();
     } else if (_buffer is _LockableBytesBuilder) {
       (_buffer as _LockableBytesBuilder)._lock();
     }
 
-    _isOpen = _useStream = false;
-    _isClosed = true;
-
     if (_done?.isCompleted == false) _done.complete();
-    return f;
+    return new Future.value();
   }
 
   /// Disposes of all resources.
@@ -176,8 +170,9 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// Prevents further request handlers from running on the response, except for response finalizers.
   ///
   /// To disable response finalizers, see [willCloseItself].
+  ///
+  /// This method should also set [!isOpen] to true.
   void end() {
-    _isOpen = false;
     if (_done?.isCompleted == false) _done.complete();
   }
 
@@ -186,7 +181,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Returns a JSONP response.
   void jsonp(value, {String callbackName: "callback", contentType}) {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
     write("$callbackName(${serializer(value)})");
 
     if (contentType != null) {
@@ -202,7 +197,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) async {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
     write(await app.viewGenerator(view, data));
     headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
     end();
@@ -216,7 +211,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   ///
   /// See [Router]#navigate for more. :)
   void redirect(url, {bool absolute: true, int code: 302}) {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
     headers
       ..[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString()
       ..[HttpHeaders.LOCATION] =
@@ -244,7 +239,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Redirects to the given named [Route].
   void redirectTo(String name, [Map params, int code]) {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
     Route _findRoute(Router r) {
       for (Route route in r.routes) {
         if (route is SymlinkRoute) {
@@ -269,7 +264,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Redirects to the given [Controller] action.
   void redirectToAction(String action, [Map params, int code]) {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
     // UserController@show
     List<String> split = action.split("@");
 
@@ -298,7 +293,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Copies a file's contents into the response buffer.
   Future sendFile(File file) async {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     buffer.add(await file.readAsBytes());
@@ -309,7 +304,7 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   ///
   /// [contentType] can be either a [String], or a [ContentType].
   void serialize(value, {contentType}) {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
 
     var text = serializer(value);
 
@@ -329,99 +324,39 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   ///
   /// You can optionally transform the file stream with a [codec].
   Future streamFile(File file) {
-    if (_isClosed) throw _closed();
+    if (!isOpen) throw closed();
 
     headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
     return file.openRead().pipe(this);
   }
 
-  @override
-  void add(List<int> data) {
-    if (_isClosed && !_useStream)
-      throw _closed();
-    else if (_useStream)
-      io.add(data);
-    else
-      buffer.add(data);
+  /// Releases critical resources from the [correspondingRequest].
+  void releaseCorrespondingRequest() {
+    if (correspondingRequest?.injections?.containsKey(Stopwatch) == true) {
+      (correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
+    }
+
+    if (correspondingRequest?.injections?.containsKey(PoolResource) ==
+        true) {
+      (correspondingRequest.injections[PoolResource] as PoolResource)
+          .release();
+    }
   }
 
   /// Configure the response to write directly to the output stream, instead of buffering.
-  bool useStream() {
-    if (!_useStream) {
-      // If this is the first stream added to this response,
-      // then add headers, status code, etc.
-      io
-        ..statusCode = statusCode
-        ..cookies.addAll(cookies);
-      headers.forEach(io.headers.set);
-      willCloseItself = _useStream = _isClosed = true;
+  bool useStream();
 
-      if (_correspondingRequest?.injections?.containsKey(Stopwatch) == true) {
-        (_correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
-      }
-
-      if (_correspondingRequest?.injections?.containsKey(PoolResource) ==
-          true) {
-        (_correspondingRequest.injections[PoolResource] as PoolResource)
-            .release();
-      }
-
-      return true;
-    }
-
-    return false;
-  }
-
-  /// Adds a stream directly the underlying dart:[io] response.
+  /// Adds a stream directly the underlying response.
   ///
   /// This will also set [willCloseItself] to `true`, thus canceling out response finalizers.
   ///
   /// If this instance has access to a [correspondingRequest], then it will attempt to transform
   /// the content using at most one of the response [encoders].
   @override
-  Future addStream(Stream<List<int>> stream) {
-    if (_isClosed && !_useStream) throw _closed();
-    var firstStream = useStream();
-
-    Stream<List<int>> output = stream;
-
-    if (encoders.isNotEmpty && correspondingRequest != null) {
-      var allowedEncodings =
-          (correspondingRequest.headers[HttpHeaders.ACCEPT_ENCODING] ?? [])
-              .map((str) {
-        // Ignore quality specifications in accept-encoding
-        // ex. gzip;q=0.8
-        if (!str.contains(';')) return str;
-        return str.split(';')[0];
-      });
-
-      for (var encodingName in allowedEncodings) {
-        Converter<List<int>, List<int>> encoder;
-        String key = encodingName;
-
-        if (encoders.containsKey(encodingName))
-          encoder = encoders[encodingName];
-        else if (encodingName == '*') {
-          encoder = encoders[key = encoders.keys.first];
-        }
-
-        if (encoder != null) {
-          if (firstStream) {
-            io.headers.set(HttpHeaders.CONTENT_ENCODING, key);
-          }
-
-          output = encoders[key].bind(output);
-          break;
-        }
-      }
-    }
-
-    return io.addStream(output);
-  }
+  Future addStream(Stream<List<int>> stream);
 
   @override
   void addError(Object error, [StackTrace stackTrace]) {
-    io.addError(error, stackTrace);
     if (_done?.isCompleted == false) _done.completeError(error, stackTrace);
   }
 
@@ -429,13 +364,13 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
   void write(value, {Encoding encoding}) {
     encoding ??= UTF8;
 
-    if (_isClosed && !_useStream)
-      throw _closed();
-    else if (_useStream) {
+    if (!isOpen && !streaming)
+      throw closed();
+    else if (streaming) {
       if (value is List<int>)
-        io.add(value);
+        add(value);
       else
-        io.add(encoding.encode(value.toString()));
+        add(encoding.encode(value.toString()));
     } else {
       if (value is List<int>)
         buffer.add(value);
@@ -446,10 +381,10 @@ class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   @override
   void writeCharCode(int charCode) {
-    if (_isClosed && !_useStream)
-      throw _closed();
-    else if (_useStream)
-      io.add([charCode]);
+    if (!isOpen && !streaming)
+      throw closed();
+    else if (streaming)
+      add([charCode]);
     else
       buffer.addByte(charCode);
   }
diff --git a/lib/src/http/server.dart b/lib/src/http/server.dart
index c8ea6eb9..18ede8bb 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/http/server.dart
@@ -40,7 +40,6 @@ class Angel extends AngelBase {
   AngelHttp _http;
   bool _isProduction;
   Angel _parent;
-  Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
 
   /// A global Map of converters that can transform responses bodies.
   final Map<String, Converter<List<int>, List<int>>> encoders = {};

From 25dc29e1261e5da1918c219e7ace4b4d81df9e89 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:22:15 -0500
Subject: [PATCH 185/414] Removed `HttpHeaders` in `ResponseContext`

---
 .idea/workspace.xml                | 40 ++++++++++++++----------------
 lib/src/http/response_context.dart | 28 ++++++++++-----------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 04c5ce5d..5c5e11f6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/http/server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -34,8 +31,8 @@
           <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="402">
-                  <caret line="151" column="5" lean-forward="true" selection-start-line="151" selection-start-column="5" selection-end-line="151" selection-end-column="5" />
+                <state relative-caret-position="231">
+                  <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
                   <folding />
                 </state>
               </provider>
@@ -83,7 +80,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>dispos</find>
       <find>xhr</find>
       <find>accepts</find>
       <find>cacheKey</find>
@@ -113,6 +109,7 @@
       <find>isOpen</find>
       <find>_useStream</find>
       <find>isClosed</find>
+      <find>HttpHeaders.</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -140,6 +137,7 @@
       <replace>useStream</replace>
       <replace>streaming</replace>
       <replace>!isOpen</replace>
+      <replace>'server'</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -215,8 +213,8 @@
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
       </list>
     </option>
   </component>
@@ -630,14 +628,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="7635000" />
-    </task>
-    <task id="LOCAL-00015" summary="+1">
-      <created>1497200256280</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1497200256280</updated>
+      <workItem from="1517973177718" duration="7703000" />
     </task>
     <task id="LOCAL-00016" summary="1.0.4">
       <created>1497837231709</created>
@@ -975,7 +966,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517979599468</updated>
     </task>
-    <option name="localTasksCounter" value="64" />
+    <task id="LOCAL-00064" summary="Deprecated `ResponseContext.io`, added HTTP equivalent">
+      <created>1517980874143</created>
+      <option name="number" value="00064" />
+      <option name="presentableId" value="LOCAL-00064" />
+      <option name="project" value="LOCAL" />
+      <updated>1517980874143</updated>
+    </task>
+    <option name="localTasksCounter" value="65" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1011,7 +1009,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="125671000" />
+    <option name="totallyTimeSpent" value="125739000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1070,7 +1068,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="+6" />
     <MESSAGE value="autoIdAndDateFields in MapService" />
     <MESSAGE value="+8" />
     <MESSAGE value="+9" />
@@ -1095,7 +1092,8 @@
     <MESSAGE value="Added example/main.dart" />
     <MESSAGE value="Create HttpRequestContextImpl" />
     <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Change return type of `AngelHttp.createRequestContext`" />
+    <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
+    <option name="LAST_COMMIT_MESSAGE" value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1521,8 +1519,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="402">
-          <caret line="151" column="5" lean-forward="true" selection-start-line="151" selection-start-column="5" selection-end-line="151" selection-end-column="5" />
+        <state relative-caret-position="231">
+          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
           <folding />
         </state>
       </provider>
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 15aaba43..8ea3ba72 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -26,7 +26,7 @@ typedef String ResponseSerializer(data);
 abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
   final BytesBuilder _buffer = new _LockableBytesBuilder();
-  final Map<String, String> _headers = {HttpHeaders.SERVER: 'angel'};
+  final Map<String, String> _headers = {'server': 'angel'};
 
   Completer _done;
   int _statusCode = 200;
@@ -98,9 +98,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Gets the Content-Type header.
   ContentType get contentType {
-    if (!headers.containsKey(HttpHeaders.CONTENT_TYPE)) return null;
+    if (!headers.containsKey('content-type')) return null;
 
-    var header = headers[HttpHeaders.CONTENT_TYPE];
+    var header = headers['content-type'];
     var match = _contentType.firstMatch(header);
 
     if (match == null)
@@ -114,7 +114,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Sets the Content-Type header.
   void set contentType(ContentType contentType) {
-    headers[HttpHeaders.CONTENT_TYPE] = contentType.toString();
+    headers['content-type'] = contentType.toString();
   }
 
   /// Set this to true if you will manually close the response.
@@ -130,8 +130,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
     headers["Content-Disposition"] =
         'attachment; filename="${filename ?? file.path}"';
-    headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
-    headers[HttpHeaders.CONTENT_LENGTH] = file.lengthSync().toString();
+    headers['content-type'] = lookupMimeType(file.path);
+    headers['content-length'] = file.lengthSync().toString();
 
     if (streaming) {
       await file.openRead().pipe(this);
@@ -188,9 +188,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
       if (contentType is ContentType)
         this.contentType = contentType;
       else
-        headers[HttpHeaders.CONTENT_TYPE] = contentType.toString();
+        headers['content-type'] = contentType.toString();
     } else
-      headers[HttpHeaders.CONTENT_TYPE] = 'application/javascript';
+      headers['content-type'] = 'application/javascript';
 
     end();
   }
@@ -199,7 +199,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   Future render(String view, [Map data]) async {
     if (!isOpen) throw closed();
     write(await app.viewGenerator(view, data));
-    headers[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString();
+    headers['content-type'] = ContentType.HTML.toString();
     end();
   }
 
@@ -213,8 +213,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   void redirect(url, {bool absolute: true, int code: 302}) {
     if (!isOpen) throw closed();
     headers
-      ..[HttpHeaders.CONTENT_TYPE] = ContentType.HTML.toString()
-      ..[HttpHeaders.LOCATION] =
+      ..['content-type'] = ContentType.HTML.toString()
+      ..['location'] =
           url is String ? url : app.navigate(url, absolute: absolute);
     statusCode = code ?? 302;
     write('''
@@ -295,7 +295,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   Future sendFile(File file) async {
     if (!isOpen) throw closed();
 
-    headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
+    headers['content-type'] = lookupMimeType(file.path);
     buffer.add(await file.readAsBytes());
     end();
   }
@@ -312,7 +312,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
       return;
 
     if (contentType is String)
-      headers[HttpHeaders.CONTENT_TYPE] = contentType;
+      headers['content-type'] = contentType;
     else if (contentType is ContentType) this.contentType = contentType;
 
     write(text);
@@ -326,7 +326,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   Future streamFile(File file) {
     if (!isOpen) throw closed();
 
-    headers[HttpHeaders.CONTENT_TYPE] = lookupMimeType(file.path);
+    headers['content-type'] = lookupMimeType(file.path);
     return file.openRead().pipe(this);
   }
 

From 14f2b5d80742ad5e06d55c481db88e518f0814d8 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:26:11 -0500
Subject: [PATCH 186/414] Deprecated AngelMetrics

---
 .idea/workspace.xml              | 142 +++++++++++++++----------------
 CHANGELOG.md                     |   1 +
 lib/src/stats/metric_server.dart |  71 +---------------
 3 files changed, 74 insertions(+), 140 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5c5e11f6..b68cc2ca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -25,27 +26,25 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5">
+    <splitter split-orientation="horizontal" split-proportion="0.50834596">
       <split-first>
         <leaf>
-          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="231">
-                  <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+                <state relative-caret-position="315">
+                  <caret line="30" column="18" lean-forward="true" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="metric_server.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+          <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="135">
-                  <caret line="12" column="43" lean-forward="true" selection-start-line="12" selection-start-column="43" selection-end-line="12" selection-end-column="43" />
-                  <folding>
-                    <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
-                  </folding>
+                <state relative-caret-position="233">
+                  <caret line="29" column="12" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" />
+                  <folding />
                 </state>
               </provider>
             </entry>
@@ -57,8 +56,8 @@
           <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="437">
-                  <caret line="108" column="0" lean-forward="true" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
+                <state relative-caret-position="1305">
+                  <caret line="87" column="9" lean-forward="true" selection-start-line="87" selection-start-column="9" selection-end-line="87" selection-end-column="9" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -191,13 +190,11 @@
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
@@ -215,6 +212,8 @@
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
       </list>
     </option>
   </component>
@@ -628,14 +627,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="7703000" />
-    </task>
-    <task id="LOCAL-00016" summary="1.0.4">
-      <created>1497837231709</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1497837231709</updated>
+      <workItem from="1517973177718" duration="7942000" />
     </task>
     <task id="LOCAL-00017" summary="Patch">
       <created>1497985995955</created>
@@ -973,7 +965,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517980874143</updated>
     </task>
-    <option name="localTasksCounter" value="65" />
+    <task id="LOCAL-00065" summary="Removed `HttpHeaders` in `ResponseContext`">
+      <created>1517980935063</created>
+      <option name="number" value="00065" />
+      <option name="presentableId" value="LOCAL-00065" />
+      <option name="project" value="LOCAL" />
+      <updated>1517980935063</updated>
+    </task>
+    <option name="localTasksCounter" value="66" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1009,7 +1008,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="125739000" />
+    <option name="totallyTimeSpent" value="125978000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1028,7 +1027,7 @@
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1068,7 +1067,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="autoIdAndDateFields in MapService" />
     <MESSAGE value="+8" />
     <MESSAGE value="+9" />
     <MESSAGE value="1.0.11" />
@@ -1093,7 +1091,8 @@
     <MESSAGE value="Create HttpRequestContextImpl" />
     <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
     <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
-    <option name="LAST_COMMIT_MESSAGE" value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
+    <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Removed `HttpHeaders` in `ResponseContext`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1218,13 +1217,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1251,19 +1243,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="0">
-            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            <folding>
-              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="82">
@@ -1301,17 +1280,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="120">
-            <caret line="8" column="3" lean-forward="true" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="263">
@@ -1497,30 +1465,62 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="12" column="43" lean-forward="true" selection-start-line="12" selection-start-column="43" selection-end-line="12" selection-end-column="43" />
-          <folding>
-            <marker date="1512571506000" expanded="true" signature="675:868" ph="..." />
-          </folding>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="300">
+            <caret line="20" column="19" lean-forward="true" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
+            <folding>
+              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="105">
+            <caret line="7" column="92" lean-forward="false" selection-start-line="7" selection-start-column="92" selection-end-line="7" selection-end-column="92" />
+            <folding />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="108" column="0" lean-forward="true" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
+        <state relative-caret-position="1305">
+          <caret line="87" column="9" lean-forward="true" selection-start-line="87" selection-start-column="9" selection-end-line="87" selection-end-column="9" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="227">
+          <caret line="93" column="25" lean-forward="true" selection-start-line="93" selection-start-column="25" selection-end-line="93" selection-end-column="25" />
+          <folding>
+            <marker date="1517981159000" expanded="true" signature="370:563" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="26" column="28" lean-forward="true" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+        <state relative-caret-position="315">
+          <caret line="30" column="18" lean-forward="true" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="233">
+          <caret line="29" column="12" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" />
           <folding />
         </state>
       </provider>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76dca643..d138c6f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ empty string.
 * Deprecated `Angel.createZoneForRequest`.
 * Deprecated all `Angel` methods that directly touch an `HttpServer` or `HttpRequest`.
 * Created the `AngelHttp` class.
+* Removed explicit dependence on `dart:io` for `Angel`, `RequestContext`, `ResponseContext`.
 
 # 1.1.0+3
 * Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
index 2c810391..8982995b 100644
--- a/lib/src/stats/metric_server.dart
+++ b/lib/src/stats/metric_server.dart
@@ -3,21 +3,12 @@ import 'dart:io';
 import '../http/http.dart';
 import 'stats.dart';
 
-/// A variant of an [Angel] server that records performance metrics.
+@deprecated
 class AngelMetrics extends Angel {
   Angel _inner;
-  HttpServer _server;
   StreamSubscription<HttpRequest> _sub;
 
   AngelMetrics() : super() {
-    var zoneBuilder = createZoneForRequest;
-    createZoneForRequest = (request, req, res) async {
-      var spec = await zoneBuilder(request, req, res);
-      return new ZoneSpecification.from(
-        spec,
-      );
-    };
-
     get('/metrics', (req, res) {
       res.contentType = ContentType.HTML;
 
@@ -63,31 +54,8 @@ class AngelMetrics extends Angel {
     });
   }
 
-  factory AngelMetrics.custom(ServerGenerator serverGenerator) {
-    return new AngelMetrics().._inner = new Angel.custom(serverGenerator);
-  }
-
-  @override
-  HttpServer get httpServer => _server ?? super.httpServer;
-
   final AngelMetricsStats stats = new AngelMetricsStats._();
 
-  @override
-  Future<HttpServer> startServer([address, int port]) async {
-    if (_inner == null) return await super.startServer(address, port);
-
-    var host = address ?? InternetAddress.LOOPBACK_IP_V4;
-    _server = await _inner.serverGenerator(host, port ?? 0);
-
-    for (var configurer in startupHooks) {
-      await configure(configurer);
-    }
-
-    optimizeForProduction();
-    _sub = _server.listen(handleRequest);
-    return _server;
-  }
-
   @override
   Future<HttpServer> close() async {
     _sub?.cancel();
@@ -95,31 +63,11 @@ class AngelMetrics extends Angel {
     return await super.close();
   }
 
-  @override
-  Future<RequestContext> createRequestContext(HttpRequest request) {
-    return stats.createRequestContext
-        .run<RequestContext>(() => super.createRequestContext(request));
-  }
-
-  @override
-  Future<ResponseContext> createResponseContext(HttpResponse response,
-      [RequestContext correspondingRequest]) {
-    return stats.createResponseContext.run<ResponseContext>(
-        () => super.createResponseContext(response, correspondingRequest));
-  }
-
   @override
   Iterable<RoutingResult> resolveAll(String absolute, String relative,
       {String method: 'GET', bool strip: true}) {
     return stats.resolveAll.run(() =>
-        super.resolveAll(absolute, relative, method: method, strip: strip));
-  }
-
-  @override
-  Future handleRequest(HttpRequest request) {
-    return stats.handleRequest.run(() async {
-      await super.handleRequest(request);
-    });
+        _inner.resolveAll(absolute, relative, method: method, strip: strip));
   }
 
   @override
@@ -140,37 +88,22 @@ class AngelMetrics extends Angel {
       Function handler, RequestContext req, ResponseContext res) {
     return stats.runContained.run(() => super.runContained(handler, req, res));
   }
-
-  @override
-  Future sendResponse(
-      HttpRequest request, RequestContext req, ResponseContext res,
-      {bool ignoreFinalizers: false}) {
-    return stats.sendResponse.run(() => super.sendResponse(request, req, res));
-  }
 }
 
 class AngelMetricsStats {
   AngelMetricsStats._() {
     all = [
-      createRequestContext,
-      createResponseContext,
       resolveAll,
       executeHandler,
       getHandlerResult,
       runContained,
-      sendResponse,
-      handleRequest,
     ];
   }
 
-  final Stats createRequestContext = new Stats('createRequestContext');
-  final Stats createResponseContext = new Stats('createResponseContext');
   final Stats resolveAll = new Stats('resolveAll');
-  final Stats handleRequest = new Stats('handleRequest');
   final Stats executeHandler = new Stats('executeHandler');
   final Stats getHandlerResult = new Stats('getHandlerResult');
   final Stats runContained = new Stats('runContained');
-  final Stats sendResponse = new Stats('sendResponse');
 
   List<Stats> all;
 

From 760257893876683be297b8495c1495d3cf8fa039 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:26:33 -0500
Subject: [PATCH 187/414] Export HTTP Req+Res context

---
 .idea/workspace.xml    | 69 +++++++++++++++++++++++-------------------
 lib/src/http/http.dart |  2 ++
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b68cc2ca..08f8be3c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -39,11 +38,21 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
+          <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="233">
-                  <caret line="29" column="12" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" />
+                <state relative-caret-position="188">
+                  <caret line="26" column="13" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="http.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="225">
+                  <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
                   <folding />
                 </state>
               </provider>
@@ -195,7 +204,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
@@ -214,6 +222,7 @@
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
       </list>
     </option>
   </component>
@@ -627,14 +636,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="7942000" />
-    </task>
-    <task id="LOCAL-00017" summary="Patch">
-      <created>1497985995955</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1497985995955</updated>
+      <workItem from="1517973177718" duration="7961000" />
     </task>
     <task id="LOCAL-00018" summary="Added more tests.">
       <created>1498774662381</created>
@@ -972,7 +974,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517980935063</updated>
     </task>
-    <option name="localTasksCounter" value="66" />
+    <task id="LOCAL-00066" summary="Deprecated AngelMetrics">
+      <created>1517981171771</created>
+      <option name="number" value="00066" />
+      <option name="presentableId" value="LOCAL-00066" />
+      <option name="project" value="LOCAL" />
+      <updated>1517981171771</updated>
+    </task>
+    <option name="localTasksCounter" value="67" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1008,7 +1017,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="125978000" />
+    <option name="totallyTimeSpent" value="125997000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1045,7 +1054,7 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1067,7 +1076,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="+8" />
     <MESSAGE value="+9" />
     <MESSAGE value="1.0.11" />
     <MESSAGE value="Close #178, bump to 1.1.0" />
@@ -1092,7 +1100,8 @@
     <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
     <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
     <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Removed `HttpHeaders` in `ResponseContext`" />
+    <MESSAGE value="Deprecated AngelMetrics" />
+    <option name="LAST_COMMIT_MESSAGE" value="Deprecated AngelMetrics" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1280,16 +1289,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="29" column="68" lean-forward="false" selection-start-line="29" selection-start-column="68" selection-end-line="29" selection-end-column="68" />
-          <folding>
-            <element signature="e#100#120#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1519,8 +1518,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="29" column="12" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" />
+        <state relative-caret-position="188">
+          <caret line="26" column="13" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
           <folding />
         </state>
       </provider>
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 88b47ee0..1b2abf89 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -12,6 +12,8 @@ export 'angel_http.dart';
 export 'anonymous_service.dart';
 export 'controller.dart';
 export 'hooked_service.dart';
+export 'http_request_context.dart';
+export 'http_response_context.dart';
 export 'map_service.dart';
 export 'metadata.dart';
 export 'request_context.dart';

From e4b23768e404a47ce5cd6d955eeadc155227ab4d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:36:24 -0500
Subject: [PATCH 188/414] HTTP ResponseContext works

---
 .../encoding_in_encoders_buffer_test_dart.xml |   9 +
 .idea/workspace.xml                           | 523 +++++++++++-------
 lib/src/http/angel_http.dart                  |   8 +-
 lib/src/http/http_response_context.dart       |  12 +-
 lib/src/http/response_context.dart            |   2 +-
 performance/hello/main.dart                   |  14 +-
 test/controller_test.dart                     |   4 +-
 test/di_test.dart                             |   2 +-
 test/encoders_buffer_test.dart                |   8 +-
 test/general_test.dart                        |   2 +-
 test/hooked_test.dart                         |   4 +-
 test/precontained_test.dart                   |   2 +-
 test/repeat_request_test.dart                 |   2 +-
 test/routing_test.dart                        |   5 +-
 test/serialize_test.dart                      |   2 +-
 test/server_test.dart                         |   5 +-
 test/services_test.dart                       |   4 +-
 17 files changed, 369 insertions(+), 239 deletions(-)
 create mode 100644 .idea/runConfigurations/encoding_in_encoders_buffer_test_dart.xml

diff --git a/.idea/runConfigurations/encoding_in_encoders_buffer_test_dart.xml b/.idea/runConfigurations/encoding_in_encoders_buffer_test_dart.xml
new file mode 100644
index 00000000..f13ca17d
--- /dev/null
+++ b/.idea/runConfigurations/encoding_in_encoders_buffer_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="encoding in encoders_buffer_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="encoding" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 08f8be3c..d0c36e6a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Export HTTP Req+Res context">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/encoding_in_encoders_buffer_test_dart.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/general_test.dart" afterPath="$PROJECT_DIR$/test/general_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/precontained_test.dart" afterPath="$PROJECT_DIR$/test/precontained_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/serialize_test.dart" afterPath="$PROJECT_DIR$/test/serialize_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -31,33 +46,98 @@
           <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="315">
-                  <caret line="30" column="18" lean-forward="true" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
+                <state relative-caret-position="150">
+                  <caret line="420" column="18" lean-forward="false" selection-start-line="420" selection-start-column="11" selection-end-line="420" selection-end-column="18" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+          <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="188">
-                  <caret line="26" column="13" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+                <state relative-caret-position="116">
+                  <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="http.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+          <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="225">
-                  <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
+                <state relative-caret-position="152">
+                  <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="102">
+                  <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="260">
+                  <caret line="29" column="31" lean-forward="true" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
+                  <folding>
+                    <marker date="1517981365000" expanded="true" signature="3221:3505" ph="{...}" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="428">
+                  <caret line="69" column="19" lean-forward="true" selection-start-line="69" selection-start-column="19" selection-end-line="69" selection-end-column="19" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="195">
+                  <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="general_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="210">
+                  <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="302">
+                  <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
+                  <folding>
+                    <marker date="1517981346000" expanded="false" signature="7:13" ph="..." />
+                    <marker date="1517981346000" expanded="true" signature="6163:6173" ph="{...}" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-first>
       <split-second>
@@ -65,8 +145,20 @@
           <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1305">
-                  <caret line="87" column="9" lean-forward="true" selection-start-line="87" selection-start-column="9" selection-end-line="87" selection-end-column="9" />
+                <state relative-caret-position="216">
+                  <caret line="118" column="21" lean-forward="false" selection-start-line="118" selection-start-column="21" selection-end-line="118" selection-end-column="21" />
+                  <folding>
+                    <element signature="e#0#20#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="-2799">
+                  <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
                   <folding>
                     <element signature="e#0#20#0" expanded="true" />
                   </folding>
@@ -88,8 +180,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>xhr</find>
-      <find>accepts</find>
       <find>cacheKey</find>
       <find>testing</find>
       <find>cache</find>
@@ -118,6 +208,8 @@
       <find>_useStream</find>
       <find>isClosed</find>
       <find>HttpHeaders.</find>
+      <find>= false</find>
+      <find>= true</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -172,18 +264,12 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/performance/hello/angel.md" />
-        <option value="$PROJECT_DIR$/performance/hello/raw.md" />
-        <option value="$PROJECT_DIR$/tool/travis.sh" />
-        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
         <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
@@ -195,34 +281,40 @@
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/general_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
       </list>
     </option>
   </component>
@@ -333,7 +425,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -523,7 +615,7 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="40">
+    <list size="41">
       <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
       <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
       <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
@@ -564,6 +656,7 @@
       <item index="37" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
       <item index="38" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
       <item index="39" class="java.lang.String" itemvalue="Dart Command Line App.main.dart" />
+      <item index="40" class="java.lang.String" itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
     </list>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
@@ -636,14 +729,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="7961000" />
-    </task>
-    <task id="LOCAL-00018" summary="Added more tests.">
-      <created>1498774662381</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1498774662382</updated>
+      <workItem from="1517973177718" duration="8551000" />
     </task>
     <task id="LOCAL-00019" summary="Still adding more tests, fixed exception-handling bug.">
       <created>1498830585557</created>
@@ -981,43 +1067,50 @@
       <option name="project" value="LOCAL" />
       <updated>1517981171771</updated>
     </task>
-    <option name="localTasksCounter" value="67" />
+    <task id="LOCAL-00067" summary="Export HTTP Req+Res context">
+      <created>1517981193409</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1517981193409</updated>
+    </task>
+    <option name="localTasksCounter" value="68" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.02.06 at 23h 24m 59s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.02.06 at 23h 25m 58s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.02.06 at 23h 26m 57s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.02.06 at 23h 28m 52s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.02.06 at 23h 29m 36s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.02.06 at 23h 31m 02s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.02.06 at 23h 32m 48s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.02.06 at 23h 33m 32s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.02.06 at 23h 33m 56s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="All_Tests - 2018.02.06 at 23h 59m 25s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.02.07 at 00h 30m 51s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.02.07 at 00h 31m 37s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.02.07 at 00h 33m 17s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.02.07 at 00h 34m 49s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.02.07 at 00h 35m 05s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.02.07 at 00h 35m 52s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.02.07 at 00h 34m 12s.xml">
+      <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.02.07 at 00h 34m 29s.xml">
+      <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="125997000" />
+    <option name="totallyTimeSpent" value="126587000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1036,7 +1129,7 @@
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1052,9 +1145,9 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1076,7 +1169,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="+9" />
     <MESSAGE value="1.0.11" />
     <MESSAGE value="Close #178, bump to 1.1.0" />
     <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
@@ -1101,7 +1193,8 @@
     <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
     <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
     <MESSAGE value="Deprecated AngelMetrics" />
-    <option name="LAST_COMMIT_MESSAGE" value="Deprecated AngelMetrics" />
+    <MESSAGE value="Export HTTP Req+Res context" />
+    <option name="LAST_COMMIT_MESSAGE" value="Export HTTP Req+Res context" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1110,52 +1203,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="225">
-            <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="84" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="2" lean-forward="true" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="21" column="40" lean-forward="false" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/metrics.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/isolate/isolate.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="315" column="38" lean-forward="true" selection-start-line="315" selection-start-column="38" selection-end-line="315" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.3/lib/pool.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="258" column="13" lean-forward="true" selection-start-line="258" selection-start-column="13" selection-end-line="258" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -1177,13 +1224,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="54" lean-forward="false" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/pattern.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="153">
@@ -1252,17 +1292,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="82">
-          <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#22#0" expanded="false" />
-            <marker date="1511894754000" expanded="true" signature="3209:3493" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
@@ -1315,14 +1344,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="38" column="4" lean-forward="false" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="4" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -1331,25 +1352,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1269">
-          <caret line="102" column="14" lean-forward="false" selection-start-line="102" selection-start-column="14" selection-end-line="102" selection-end-column="14" />
-          <folding>
-            <marker date="1517977457000" expanded="false" signature="7:13" ph="..." />
-            <marker date="1517977457000" expanded="true" signature="6143:6153" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
@@ -1376,14 +1378,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="52" column="40" lean-forward="true" selection-start-line="52" selection-start-column="40" selection-end-line="52" selection-end-column="40" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1444,26 +1438,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="292" column="38" lean-forward="false" selection-start-line="292" selection-start-column="38" selection-end-line="292" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="137">
-          <caret line="41" column="16" lean-forward="false" selection-start-line="41" selection-start-column="16" selection-end-line="41" selection-end-column="16" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1488,16 +1462,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1305">
-          <caret line="87" column="9" lean-forward="true" selection-start-line="87" selection-start-column="9" selection-end-line="87" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="227">
@@ -1508,30 +1472,171 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="30" column="18" lean-forward="true" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
+        <state relative-caret-position="195">
+          <caret line="13" column="25" lean-forward="true" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="26" column="13" lean-forward="true" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+        <state relative-caret-position="420">
+          <caret line="31" column="18" lean-forward="true" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="34" lean-forward="false" selection-start-line="15" selection-start-column="34" selection-end-line="15" selection-end-column="34" />
+        <state relative-caret-position="152">
+          <caret line="29" column="36" lean-forward="true" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="302">
+          <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
+          <folding>
+            <marker date="1517981346000" expanded="false" signature="7:13" ph="..." />
+            <marker date="1517981346000" expanded="true" signature="6163:6173" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="20" column="36" lean-forward="true" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="29" column="31" lean-forward="true" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
+          <folding>
+            <marker date="1517981365000" expanded="true" signature="3221:3505" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="428">
+          <caret line="69" column="19" lean-forward="true" selection-start-line="69" selection-start-column="19" selection-end-line="69" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="361" column="34" lean-forward="true" selection-start-line="361" selection-start-column="34" selection-end-line="361" selection-end-column="34" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="12" column="55" lean-forward="false" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="420" column="18" lean-forward="false" selection-start-line="420" selection-start-column="11" selection-end-line="420" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/request.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="108" column="9" lean-forward="false" selection-start-line="108" selection-start-column="9" selection-end-line="108" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="237">
+          <caret line="116" column="3" lean-forward="true" selection-start-line="116" selection-start-column="3" selection-end-line="116" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2799">
+          <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="216">
+          <caret line="118" column="21" lean-forward="false" selection-start-line="118" selection-start-column="21" selection-end-line="118" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 0c0b12b3..156c2890 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -88,7 +88,13 @@ class AngelHttp {
     if (_closed) return _server;
     _closed = true;
     _sub?.cancel();
-    await app.close();
+
+    // TODO: Remove this try/catch in 1.2.0
+    try {
+      await app.close();
+    } catch(_) {
+
+    }
 
     for (var configurer in app.shutdownHooks) await app.configure(configurer);
     return _server;
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 6ed7bd03..b7f13dcb 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -22,6 +22,11 @@ class HttpResponseContextImpl extends ResponseContext {
     return _correspondingRequest;
   }
 
+  @override
+  bool get isOpen {
+    return !_isClosed;
+  }
+
   @override
   bool get streaming {
     return _useStream;
@@ -110,7 +115,12 @@ class HttpResponseContextImpl extends ResponseContext {
   @override
   Future close() async {
     if (_useStream) {
-      await io.close();
+      try {
+        await io.close();
+      } catch(_) {
+        // This only seems to occur on `MockHttpRequest`, but
+        // this try/catch prevents a crash.
+      }
     }
 
     _isClosed = true;
diff --git a/lib/src/http/response_context.dart b/lib/src/http/response_context.dart
index 8ea3ba72..1cefbac0 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/http/response_context.dart
@@ -85,7 +85,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Can we still write to this response?
-  bool get isOpen => !!isOpen;
+  bool get isOpen;
 
   /// Returns `true` if a [Stream] is being written directly.
   bool get streaming;
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index a776e60a..6322b678 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -22,9 +22,9 @@ main() async {
 }
 
 void start(int id) {
-  var app = new Angel.custom(startShared)..lazyParseBodies = true;
+  var app = new Angel()..lazyParseBodies = true;
+  var http = new AngelHttp.custom(app, startShared);
 
-  if (true) {
     app.get('/', (req, ResponseContext res) {
       res.willCloseItself = true;
       res.io
@@ -32,12 +32,7 @@ void start(int id) {
         ..close();
       return false;
     });
-  } else {
-    app.get('/', (req, ResponseContext res) {
-      res.useStream();
-      res.write('Hello, world!');
-    });
-  }
+
 
   var oldHandler = app.errorHandler;
   app.errorHandler = (e, req, res) {
@@ -45,7 +40,8 @@ void start(int id) {
     print(e.stackTrace);
     return oldHandler(e, req, res);
   };
-  app.startServer(InternetAddress.LOOPBACK_IP_V4, 3000).then((server) {
+
+  http.startServer(InternetAddress.LOOPBACK_IP_V4, 3000).then((server) {
     print(
         'Instance #$id listening at http://${server.address.address}:${server.port}');
   });
diff --git a/test/controller_test.dart b/test/controller_test.dart
index e24a81fd..5a8d23a0 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -60,7 +60,7 @@ main() {
     print(app.controllers);
     app.dumpTree();
 
-    server = await app.startServer();
+    server = await new AngelHttp(app).startServer();
     url = 'http://${server.address.address}:${server.port}';
   });
 
@@ -92,7 +92,7 @@ main() {
           return 2;
         }, optional: ['bar']));
     var rq = new MockHttpRequest('GET', new Uri(path: 'foo'));
-    await app.handleRequest(rq);
+    await new AngelHttp(app).handleRequest(rq);
     var body = await rq.response.transform(UTF8.decoder).join();
     expect(JSON.decode(body), 2);
   });
diff --git a/test/di_test.dart b/test/di_test.dart
index c309fe68..793d887d 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -27,7 +27,7 @@ main() {
     await app.configure(new SingletonController().configureServer);
     await app.configure(new ErrandController().configureServer);
 
-    server = await app.startServer();
+    server = await new AngelHttp(app).startServer();
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 98bc70ee..be44c15b 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -71,8 +71,8 @@ void encodingTests(Angel getApp()) {
 
     test('encodes if explicit', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, 'gzip')
-        ..close();
+        ..headers.set(HttpHeaders.ACCEPT_ENCODING, 'gzip');
+      await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
@@ -83,8 +83,8 @@ void encodingTests(Angel getApp()) {
 
     test('only uses one encoder', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['gzip', 'deflate'])
-        ..close();
+        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['gzip', 'deflate']);
+      await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
diff --git a/test/general_test.dart b/test/general_test.dart
index 09cc2740..d08b6876 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -16,7 +16,7 @@ main() {
       ..all('*', () => throw new AngelHttpException.notFound());
     client = new http.Client();
 
-    server = await app.startServer();
+    server = await new AngelHttp(app).startServer();
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 9102bafa..afe51caa 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -32,8 +32,8 @@ main() {
       throw e.error;
     };
 
-    server = await app.startServer();
-    url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
+    server = await new AngelHttp(app).startServer();
+    url = "http://${server.address.host}:${server.port}";
   });
 
   tearDown(() async {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 623bc62c..5c9fb0c6 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -14,7 +14,7 @@ main() {
 
     var rq = new MockHttpRequest('GET', new Uri(path: '/foo'));
     rq.close();
-    await app.handleRequest(rq);
+    await new AngelHttp(app).handleRequest(rq);
     var rs = rq.response;
     var body = await rs.transform(UTF8.decoder).join();
     expect(body, JSON.encode('bar'));
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index 8f1d1c43..f4fb9edf 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -12,7 +12,7 @@ main() {
   test('can request the same url twice', () async {
     var app = new Angel()..get('/test/:id', (id) => 'Hello $id');
     var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
-    await Future.wait([rq1, rq2, rq3].map(app.handleRequest));
+    await Future.wait([rq1, rq2, rq3].map(new AngelHttp(app).handleRequest));
     var body1 = await rq1.response.transform(UTF8.decoder).join(),
         body2 = await rq2.response.transform(UTF8.decoder).join(),
         body3 = await rq3.response.transform(UTF8.decoder).join();
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 004bdaf7..d8eb93cd 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -95,8 +95,9 @@ main() {
     app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
     client = new http.Client();
-    await app.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
-    url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
+    var server =
+        await new AngelHttp(app).startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+    url = "http://${server.address.host}:${server.port}";
   });
 
   tearDown(() async {
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index d52850b0..ad31a54b 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -18,7 +18,7 @@ main() {
               res.serialize({'hello': 'world'}, contentType: ContentType.HTML));
     client = new http.Client();
 
-    server = await app.startServer();
+    server = await new AngelHttp(app).startServer();
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/server_test.dart b/test/server_test.dart
index f952b467..4e67aa47 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -62,9 +62,12 @@ main() {
     app.startupHooks.add((app) async {
       app.configuration['two'] = 2;
     });
-    await app.startServer();
+
+    var http = new AngelHttp(app);
+    await http.startServer();
     expect(app.configuration['two'], 2);
     await app.close();
+    await http.close();
   });
 
   test('warning when adding routes to flattened router', () {
diff --git a/test/services_test.dart b/test/services_test.dart
index 9f4bd135..a8909aaa 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -26,9 +26,9 @@ main() {
         print(e.stackTrace);
       };
 
-    await app.startServer();
+    var server = await new AngelHttp(app).startServer();
     client = new http.Client();
-    url = "http://${app.httpServer.address.host}:${app.httpServer.port}";
+    url = "http://${server.address.host}:${server.port}";
   });
 
   tearDown(() async {

From 453d19aa31ce2057eb32786b0ca12eccf5d8d1f4 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:44:21 -0500
Subject: [PATCH 189/414] Created pkg:framework/http.dart

---
 .idea/workspace.xml                           | 694 +++++++++---------
 lib/angel_framework.dart                      |   1 +
 lib/http.dart                                 |   1 +
 lib/src/{http => core}/angel_base.dart        |   0
 lib/src/{http => core}/anonymous_service.dart |   0
 lib/src/core/core.dart                        |  11 +
 lib/src/{http => core}/hooked_service.dart    |   0
 lib/src/{http => core}/injection.dart         |   0
 lib/src/{http => core}/map_service.dart       |   0
 lib/src/{http => core}/metadata.dart          |   0
 lib/src/{http => core}/request_context.dart   |   0
 lib/src/{http => core}/response_context.dart  |   2 +-
 lib/src/{http => core}/routable.dart          |   0
 lib/src/{http => core}/server.dart            |   3 +-
 lib/src/{http => core}/service.dart           |   2 +-
 lib/src/{http => core}/typed_service.dart     |   0
 lib/src/http/angel_http.dart                  |   4 +-
 lib/src/http/controller.dart                  |   6 +-
 lib/src/http/http.dart                        |  11 -
 lib/src/http/http_request_context.dart        |   3 +-
 lib/src/http/http_response_context.dart       |   4 +-
 lib/src/stats/metric_server.dart              |   1 +
 22 files changed, 348 insertions(+), 395 deletions(-)
 create mode 100644 lib/http.dart
 rename lib/src/{http => core}/angel_base.dart (100%)
 rename lib/src/{http => core}/anonymous_service.dart (100%)
 create mode 100644 lib/src/core/core.dart
 rename lib/src/{http => core}/hooked_service.dart (100%)
 rename lib/src/{http => core}/injection.dart (100%)
 rename lib/src/{http => core}/map_service.dart (100%)
 rename lib/src/{http => core}/metadata.dart (100%)
 rename lib/src/{http => core}/request_context.dart (100%)
 rename lib/src/{http => core}/response_context.dart (99%)
 rename lib/src/{http => core}/routable.dart (100%)
 rename lib/src/{http => core}/server.dart (99%)
 rename lib/src/{http => core}/service.dart (99%)
 rename lib/src/{http => core}/typed_service.dart (100%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0c36e6a..c6b3edab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Export HTTP Req+Res context">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/encoding_in_encoders_buffer_test_dart.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/http.dart" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/core/core.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/injection.dart" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/core/metadata.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/typed_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/angel_framework.dart" afterPath="$PROJECT_DIR$/lib/angel_framework.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/performance/hello/main.dart" afterPath="$PROJECT_DIR$/performance/hello/main.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/general_test.dart" afterPath="$PROJECT_DIR$/test/general_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/hooked_test.dart" afterPath="$PROJECT_DIR$/test/hooked_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/precontained_test.dart" afterPath="$PROJECT_DIR$/test/precontained_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/routing_test.dart" afterPath="$PROJECT_DIR$/test/routing_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/serialize_test.dart" afterPath="$PROJECT_DIR$/test/serialize_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/services_test.dart" afterPath="$PROJECT_DIR$/test/services_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -40,135 +45,74 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.50834596">
-      <split-first>
-        <leaf>
-          <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="150">
-                  <caret line="420" column="18" lean-forward="false" selection-start-line="420" selection-start-column="11" selection-end-line="420" selection-end-column="18" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="116">
-                  <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="152">
-                  <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="102">
-                  <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="260">
-                  <caret line="29" column="31" lean-forward="true" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
-                  <folding>
-                    <marker date="1517981365000" expanded="true" signature="3221:3505" ph="{...}" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="428">
-                  <caret line="69" column="19" lean-forward="true" selection-start-line="69" selection-start-column="19" selection-end-line="69" selection-end-column="19" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="195">
-                  <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="general_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="210">
-                  <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="302">
-                  <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
-                  <folding>
-                    <marker date="1517981346000" expanded="false" signature="7:13" ph="..." />
-                    <marker date="1517981346000" expanded="true" signature="6163:6173" ph="{...}" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf>
-          <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="216">
-                  <caret line="118" column="21" lean-forward="false" selection-start-line="118" selection-start-column="21" selection-end-line="118" selection-end-column="21" />
-                  <folding>
-                    <element signature="e#0#20#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-2799">
-                  <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
-                  <folding>
-                    <element signature="e#0#20#0" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-second>
-    </splitter>
+    <leaf>
+      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="152">
+              <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="28" lean-forward="true" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/json.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="60">
+              <caret line="4" column="54" lean-forward="true" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="675">
+              <caret line="45" column="54" lean-forward="false" selection-start-line="45" selection-start-column="54" selection-end-line="45" selection-end-column="54" />
+              <folding>
+                <element signature="e#55#75#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="122">
+              <caret line="323" column="42" lean-forward="false" selection-start-line="323" selection-start-column="42" selection-end-line="323" selection-end-column="42" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -264,14 +208,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/fatal_error.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http_exception.dart" />
-        <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/base_middleware.dart" />
-        <option value="$PROJECT_DIR$/lib/src/fast_name_from_symbol.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/pattern_matcher.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
         <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
@@ -295,11 +231,8 @@
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
@@ -308,13 +241,24 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
+        <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/http.dart" />
       </list>
     </option>
   </component>
@@ -376,7 +320,7 @@
               <item name="framework" type="cbb8eebc:String" user="framework" />
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
+              <item name="stats" type="cbb8eebc:String" user="stats" />
             </path>
           </expand>
           <select />
@@ -409,6 +353,7 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/lib/src/core" />
       <recent name="$PROJECT_DIR$/lib/src/http" />
       <recent name="$PROJECT_DIR$/lib/src/util" />
     </key>
@@ -425,7 +370,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -729,14 +674,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="8551000" />
-    </task>
-    <task id="LOCAL-00019" summary="Still adding more tests, fixed exception-handling bug.">
-      <created>1498830585557</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1498830585557</updated>
+      <workItem from="1517973177718" duration="9028000" />
     </task>
     <task id="LOCAL-00020" summary="Updated Travis script">
       <created>1498830956916</created>
@@ -1074,13 +1012,17 @@
       <option name="project" value="LOCAL" />
       <updated>1517981193409</updated>
     </task>
-    <option name="localTasksCounter" value="68" />
+    <task id="LOCAL-00068" summary="HTTP ResponseContext works">
+      <created>1517981784675</created>
+      <option name="number" value="00068" />
+      <option name="presentableId" value="LOCAL-00068" />
+      <option name="project" value="LOCAL" />
+      <updated>1517981784676</updated>
+    </task>
+    <option name="localTasksCounter" value="69" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.02.06 at 23h 33m 56s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.02.06 at 23h 59m 25s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1102,6 +1044,9 @@
     <history-entry file="All_Tests - 2018.02.07 at 00h 35m 52s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.02.07 at 00h 44m 04s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.02.07 at 00h 34m 12s.xml">
       <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1110,7 +1055,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="126587000" />
+    <option name="totallyTimeSpent" value="127064000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1134,7 +1079,7 @@
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1147,7 +1092,7 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1169,7 +1114,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="1.0.11" />
     <MESSAGE value="Close #178, bump to 1.1.0" />
     <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
     <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
@@ -1194,7 +1138,8 @@
     <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
     <MESSAGE value="Deprecated AngelMetrics" />
     <MESSAGE value="Export HTTP Req+Res context" />
-    <option name="LAST_COMMIT_MESSAGE" value="Export HTTP Req+Res context" />
+    <MESSAGE value="HTTP ResponseContext works" />
+    <option name="LAST_COMMIT_MESSAGE" value="HTTP ResponseContext works" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1203,63 +1148,7 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.1/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="267" column="7" lean-forward="false" selection-start-line="267" selection-start-column="7" selection-end-line="267" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/pattern.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="73" column="15" lean-forward="false" selection-start-line="73" selection-start-column="15" selection-end-line="73" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="26" column="50" lean-forward="false" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="392">
-          <caret line="493" column="16" lean-forward="false" selection-start-line="493" selection-start-column="16" selection-end-line="493" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/core/map.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2658">
-          <caret line="193" column="4" lean-forward="false" selection-start-line="193" selection-start-column="4" selection-end-line="193" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="399" column="63" lean-forward="true" selection-start-line="399" selection-start-column="63" selection-end-line="399" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/routable.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-254">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1292,7 +1181,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/map_service.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
           <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
@@ -1310,22 +1199,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="24" column="34" lean-forward="false" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="19" lean-forward="true" selection-start-line="3" selection-start-column="19" selection-end-line="3" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
@@ -1368,16 +1241,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1418,26 +1281,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="232" column="19" lean-forward="false" selection-start-line="232" selection-start-column="19" selection-end-line="232" selection-end-column="19" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-910">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1462,24 +1305,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="93" column="25" lean-forward="true" selection-start-line="93" selection-start-column="25" selection-end-line="93" selection-end-column="25" />
-          <folding>
-            <marker date="1517981159000" expanded="true" signature="370:563" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="13" column="25" lean-forward="true" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -1498,25 +1323,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
-          <folding>
-            <marker date="1517981346000" expanded="false" signature="7:13" ph="..." />
-            <marker date="1517981346000" expanded="true" signature="6163:6173" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
@@ -1535,24 +1341,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="428">
-          <caret line="69" column="19" lean-forward="true" selection-start-line="69" selection-start-column="19" selection-end-line="69" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="167">
-          <caret line="361" column="34" lean-forward="true" selection-start-line="361" selection-start-column="34" selection-end-line="361" selection-end-column="34" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
@@ -1561,14 +1349,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -1577,22 +1357,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="420" column="18" lean-forward="false" selection-start-line="420" selection-start-column="11" selection-end-line="420" selection-end-column="18" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/request.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
@@ -1609,13 +1373,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2799">
-          <caret line="103" column="50" lean-forward="false" selection-start-line="103" selection-start-column="50" selection-end-line="103" selection-end-column="50" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="152">
+          <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1627,16 +1389,214 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="118" column="21" lean-forward="false" selection-start-line="118" selection-start-column="21" selection-end-line="118" selection-end-column="21" />
+        <state relative-caret-position="195">
+          <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="302">
+          <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
+          <folding>
+            <marker date="1517981346000" expanded="false" signature="7:13" ph="..." />
+            <marker date="1517981346000" expanded="true" signature="6163:6173" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="251">
+          <caret line="107" column="0" lean-forward="true" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" column="26" lean-forward="false" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="54" lean-forward="true" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="45" column="54" lean-forward="false" selection-start-line="45" selection-start-column="54" selection-end-line="45" selection-end-column="54" />
+          <folding>
+            <element signature="e#55#75#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="212">
+          <caret line="231" column="35" lean-forward="false" selection-start-line="231" selection-start-column="35" selection-end-line="231" selection-end-column="35" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="20" lean-forward="true" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="52" lean-forward="false" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="158">
+          <caret line="104" column="46" lean-forward="true" selection-start-line="104" selection-start-column="46" selection-end-line="104" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+            <marker date="1517982193000" expanded="true" signature="398:591" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="122">
+          <caret line="323" column="42" lean-forward="false" selection-start-line="323" selection-start-column="42" selection-end-line="323" selection-end-column="42" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="10" column="32" lean-forward="true" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="27" lean-forward="true" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" column="27" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="11" column="27" lean-forward="true" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="28" lean-forward="true" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
index f1e0f551..b9713ff5 100644
--- a/lib/angel_framework.dart
+++ b/lib/angel_framework.dart
@@ -1,4 +1,5 @@
 /// An easily-extensible web server framework in Dart.
 library angel_framework;
 
+export 'src/core/core.dart';
 export 'src/http/http.dart';
diff --git a/lib/http.dart b/lib/http.dart
new file mode 100644
index 00000000..ae5160e7
--- /dev/null
+++ b/lib/http.dart
@@ -0,0 +1 @@
+export 'src/http/http.dart';
\ No newline at end of file
diff --git a/lib/src/http/angel_base.dart b/lib/src/core/angel_base.dart
similarity index 100%
rename from lib/src/http/angel_base.dart
rename to lib/src/core/angel_base.dart
diff --git a/lib/src/http/anonymous_service.dart b/lib/src/core/anonymous_service.dart
similarity index 100%
rename from lib/src/http/anonymous_service.dart
rename to lib/src/core/anonymous_service.dart
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
new file mode 100644
index 00000000..838311c5
--- /dev/null
+++ b/lib/src/core/core.dart
@@ -0,0 +1,11 @@
+export 'angel_base.dart';
+export 'anonymous_service.dart';
+export 'hooked_service.dart';
+export 'map_service.dart';
+export 'metadata.dart';
+export 'request_context.dart';
+export 'response_context.dart';
+export 'routable.dart';
+export 'server.dart';
+export 'service.dart';
+export 'typed_service.dart';
\ No newline at end of file
diff --git a/lib/src/http/hooked_service.dart b/lib/src/core/hooked_service.dart
similarity index 100%
rename from lib/src/http/hooked_service.dart
rename to lib/src/core/hooked_service.dart
diff --git a/lib/src/http/injection.dart b/lib/src/core/injection.dart
similarity index 100%
rename from lib/src/http/injection.dart
rename to lib/src/core/injection.dart
diff --git a/lib/src/http/map_service.dart b/lib/src/core/map_service.dart
similarity index 100%
rename from lib/src/http/map_service.dart
rename to lib/src/core/map_service.dart
diff --git a/lib/src/http/metadata.dart b/lib/src/core/metadata.dart
similarity index 100%
rename from lib/src/http/metadata.dart
rename to lib/src/core/metadata.dart
diff --git a/lib/src/http/request_context.dart b/lib/src/core/request_context.dart
similarity index 100%
rename from lib/src/http/request_context.dart
rename to lib/src/core/request_context.dart
diff --git a/lib/src/http/response_context.dart b/lib/src/core/response_context.dart
similarity index 99%
rename from lib/src/http/response_context.dart
rename to lib/src/core/response_context.dart
index 1cefbac0..b1ce733d 100644
--- a/lib/src/http/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -7,8 +7,8 @@ import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
 import 'package:pool/pool.dart';
+import '../http/http.dart';
 import 'server.dart' show Angel;
-import 'controller.dart';
 import 'request_context.dart';
 
 final RegExp _contentType =
diff --git a/lib/src/http/routable.dart b/lib/src/core/routable.dart
similarity index 100%
rename from lib/src/http/routable.dart
rename to lib/src/core/routable.dart
diff --git a/lib/src/http/server.dart b/lib/src/core/server.dart
similarity index 99%
rename from lib/src/http/server.dart
rename to lib/src/core/server.dart
index 18ede8bb..defe87d9 100644
--- a/lib/src/http/server.dart
+++ b/lib/src/core/server.dart
@@ -11,9 +11,8 @@ export 'package:container/container.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
+import '../http/http.dart';
 import 'angel_base.dart';
-import 'angel_http.dart';
-import 'controller.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
diff --git a/lib/src/http/service.dart b/lib/src/core/service.dart
similarity index 99%
rename from lib/src/http/service.dart
rename to lib/src/core/service.dart
index 66def09c..bc710123 100644
--- a/lib/src/http/service.dart
+++ b/lib/src/core/service.dart
@@ -1,13 +1,13 @@
 library angel_framework.http.service;
 
 import 'dart:async';
-import 'package:angel_framework/src/http/response_context.dart';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'angel_base.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
+import 'response_context.dart';
 import 'routable.dart';
 
 /// Indicates how the service was accessed.
diff --git a/lib/src/http/typed_service.dart b/lib/src/core/typed_service.dart
similarity index 100%
rename from lib/src/http/typed_service.dart
rename to lib/src/core/typed_service.dart
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 156c2890..b2522720 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -9,9 +9,7 @@ import 'package:pool/pool.dart';
 import 'package:tuple/tuple.dart';
 import 'http_request_context.dart';
 import 'http_response_context.dart';
-import 'request_context.dart';
-import 'response_context.dart';
-import 'server.dart';
+import '../core/core.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index f6a80c74..3b4f7f33 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -4,11 +4,7 @@ import 'dart:async';
 import 'dart:mirrors';
 import 'package:angel_route/angel_route.dart';
 import 'package:meta/meta.dart';
-import 'metadata.dart';
-import 'request_context.dart';
-import 'response_context.dart';
-import 'routable.dart';
-import 'server.dart' show Angel;
+import '../core/core.dart';
 
 /// Supports grouping routes with shared functionality.
 class Controller {
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 1b2abf89..00c08977 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -7,21 +7,10 @@ export 'package:angel_http_exception/angel_http_exception.dart';
 export 'package:angel_model/angel_model.dart';
 export 'package:angel_route/angel_route.dart';
 export 'package:body_parser/body_parser.dart' show FileUploadInfo;
-export 'angel_base.dart';
 export 'angel_http.dart';
-export 'anonymous_service.dart';
 export 'controller.dart';
-export 'hooked_service.dart';
 export 'http_request_context.dart';
 export 'http_response_context.dart';
-export 'map_service.dart';
-export 'metadata.dart';
-export 'request_context.dart';
-export 'response_context.dart';
-export 'routable.dart';
-export 'server.dart';
-export 'service.dart';
-export 'typed_service.dart';
 
 /// Boots a shared server instance. Use this if launching multiple isolates
 Future<HttpServer> startShared(address, int port) => HttpServer
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index 096a4718..e75e2405 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -1,8 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:body_parser/body_parser.dart';
-import 'request_context.dart';
-import 'server.dart';
+import '../core/core.dart';
 
 /// An implementation of [RequestContext] that wraps a [HttpRequest].
 class HttpRequestContextImpl extends RequestContext {
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index b7f13dcb..01f950ce 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -1,10 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import '../core/core.dart';
 import 'http_request_context.dart';
-import 'request_context.dart';
-import 'response_context.dart';
-import 'server.dart';
 
 class HttpResponseContextImpl extends ResponseContext {
   /// The underlying [HttpResponse] under this instance.
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
index 8982995b..06cbe0a3 100644
--- a/lib/src/stats/metric_server.dart
+++ b/lib/src/stats/metric_server.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import '../core/core.dart';
 import '../http/http.dart';
 import 'stats.dart';
 

From 9e915fa7d2d2cccb8a608e044f8694d4f419a6c1 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:46:59 -0500
Subject: [PATCH 190/414] AnonymousService now takes FutureOr

---
 .idea/workspace.xml                 | 170 +++++++++++++++-------------
 CHANGELOG.md                        |   2 +
 lib/src/core/anonymous_service.dart |  12 +-
 3 files changed, 101 insertions(+), 83 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c6b3edab..eca551b3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,28 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/http.dart" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/src/core/core.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/angel_base.dart" afterPath="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/anonymous_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/hooked_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/injection.dart" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/metadata.dart" afterPath="$PROJECT_DIR$/lib/src/core/metadata.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/request_context.dart" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/routable.dart" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/server.dart" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/service.dart" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" />
-      <change type="MOVED" beforePath="$PROJECT_DIR$/lib/src/http/typed_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/angel_framework.dart" afterPath="$PROJECT_DIR$/lib/angel_framework.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http.dart" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -59,19 +40,34 @@
       <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
+            <state relative-caret-position="648">
               <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/http.dart">
+      <file leaf-file-name="anonymous_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="28" lean-forward="true" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
-              <folding />
+            <state relative-caret-position="227">
+              <caret line="26" column="78" lean-forward="false" selection-start-line="26" selection-start-column="78" selection-end-line="26" selection-end-column="78" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="150">
+                <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+                <folding />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -124,7 +120,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>cacheKey</find>
       <find>testing</find>
       <find>cache</find>
       <find>errorHan</find>
@@ -154,6 +149,7 @@
       <find>HttpHeaders.</find>
       <find>= false</find>
       <find>= true</find>
+      <find>Future</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -182,6 +178,7 @@
       <replace>streaming</replace>
       <replace>!isOpen</replace>
       <replace>'server'</replace>
+      <replace>FutureOr</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -208,7 +205,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
         <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
@@ -232,7 +228,6 @@
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
@@ -259,6 +254,8 @@
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -315,6 +312,20 @@
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="core" type="cbb8eebc:String" user="core" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -674,14 +685,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="9028000" />
-    </task>
-    <task id="LOCAL-00020" summary="Updated Travis script">
-      <created>1498830956916</created>
-      <option name="number" value="00020" />
-      <option name="presentableId" value="LOCAL-00020" />
-      <option name="project" value="LOCAL" />
-      <updated>1498830956916</updated>
+      <workItem from="1517973177718" duration="9184000" />
     </task>
     <task id="LOCAL-00021" summary="1.0.6">
       <created>1498857811360</created>
@@ -1019,7 +1023,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517981784676</updated>
     </task>
-    <option name="localTasksCounter" value="69" />
+    <task id="LOCAL-00069" summary="Created pkg:framework/http.dart">
+      <created>1517982261106</created>
+      <option name="number" value="00069" />
+      <option name="presentableId" value="LOCAL-00069" />
+      <option name="project" value="LOCAL" />
+      <updated>1517982261107</updated>
+    </task>
+    <option name="localTasksCounter" value="70" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1055,7 +1066,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127064000" />
+    <option name="totallyTimeSpent" value="127220000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1090,7 +1101,7 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1114,7 +1125,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Close #178, bump to 1.1.0" />
     <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
     <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
     <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
@@ -1139,7 +1149,8 @@
     <MESSAGE value="Deprecated AngelMetrics" />
     <MESSAGE value="Export HTTP Req+Res context" />
     <MESSAGE value="HTTP ResponseContext works" />
-    <option name="LAST_COMMIT_MESSAGE" value="HTTP ResponseContext works" />
+    <MESSAGE value="Created pkg:framework/http.dart" />
+    <option name="LAST_COMMIT_MESSAGE" value="Created pkg:framework/http.dart" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1148,13 +1159,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-254">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1294,17 +1298,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="105">
-            <caret line="7" column="92" lean-forward="false" selection-start-line="7" selection-start-column="92" selection-end-line="7" selection-end-column="92" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -1468,14 +1461,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="26" lean-forward="false" selection-start-line="3" selection-start-column="26" selection-end-line="3" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
@@ -1581,14 +1566,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1597,6 +1574,45 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+          <folding>
+            <element signature="e#81#109#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="648">
+          <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="227">
+          <caret line="26" column="78" lean-forward="false" selection-start-line="26" selection-start-column="78" selection-end-line="26" selection-end-column="78" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="150">
+            <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d138c6f9..657a97fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ empty string.
 * Deprecated all `Angel` methods that directly touch an `HttpServer` or `HttpRequest`.
 * Created the `AngelHttp` class.
 * Removed explicit dependence on `dart:io` for `Angel`, `RequestContext`, `ResponseContext`.
+* Created `lib/http.dart`, which exports HTTP-specific functionality.
+* `AnonymousService` now takes `FutureOr`.
 
 # 1.1.0+3
 * Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index 9e578be1..d263dca6 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -8,12 +8,12 @@ class AnonymousService extends Service {
   Function _index, _read, _create, _modify, _update, _remove;
 
   AnonymousService(
-      {Future index([Map params]),
-      Future read(id, [Map params]),
-      Future create(data, [Map params]),
-      Future modify(id, data, [Map params]),
-      Future update(id, data, [Map params]),
-      Future remove(id, [Map params])})
+      {FutureOr index([Map params]),
+      FutureOr read(id, [Map params]),
+      FutureOr create(data, [Map params]),
+      FutureOr modify(id, data, [Map params]),
+      FutureOr update(id, data, [Map params]),
+      FutureOr remove(id, [Map params])})
       : super() {
     _index = index;
     _read = read;

From b3aceaa83bdf208f9dd8d2c6b32b0d5535ba010f Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:48:32 -0500
Subject: [PATCH 191/414] `Service.toId` no longer only takes a `String`

---
 .idea/workspace.xml       | 154 ++++++++++++--------------------------
 CHANGELOG.md              |   1 +
 lib/src/core/service.dart |   2 +-
 3 files changed, 51 insertions(+), 106 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index eca551b3..830c8524 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="AnonymousService now takes FutureOr">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/service.dart" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,33 +27,13 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="648">
-              <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="anonymous_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="26" column="78" lean-forward="false" selection-start-line="26" selection-start-column="78" selection-end-line="26" selection-end-column="78" />
+            <state relative-caret-position="243">
+              <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#39#59#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -64,7 +44,7 @@
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="150">
-                <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+                <caret line="10" column="75" lean-forward="false" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -72,42 +52,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/json.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" column="54" lean-forward="true" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="675">
-              <caret line="45" column="54" lean-forward="false" selection-start-line="45" selection-start-column="54" selection-end-line="45" selection-end-column="54" />
-              <folding>
-                <element signature="e#55#75#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="122">
-              <caret line="323" column="42" lean-forward="false" selection-start-line="323" selection-start-column="42" selection-end-line="323" selection-end-column="42" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -120,7 +64,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>testing</find>
       <find>cache</find>
       <find>errorHan</find>
       <find>addStre</find>
@@ -150,6 +93,7 @@
       <find>= false</find>
       <find>= true</find>
       <find>Future</find>
+      <find>toId</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -245,7 +189,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
@@ -255,6 +198,7 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -685,14 +629,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="9184000" />
-    </task>
-    <task id="LOCAL-00021" summary="1.0.6">
-      <created>1498857811360</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1498857811360</updated>
+      <workItem from="1517973177718" duration="9274000" />
     </task>
     <task id="LOCAL-00022" summary="Add stackTrace">
       <created>1498960583872</created>
@@ -1030,7 +967,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517982261107</updated>
     </task>
-    <option name="localTasksCounter" value="70" />
+    <task id="LOCAL-00070" summary="AnonymousService now takes FutureOr">
+      <created>1517982419998</created>
+      <option name="number" value="00070" />
+      <option name="presentableId" value="LOCAL-00070" />
+      <option name="project" value="LOCAL" />
+      <updated>1517982419999</updated>
+    </task>
+    <option name="localTasksCounter" value="71" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1066,7 +1010,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127220000" />
+    <option name="totallyTimeSpent" value="127310000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1125,7 +1069,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Patched _matchesId, bump to 1.1.0+1" />
     <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
     <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
     <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
@@ -1150,7 +1093,8 @@
     <MESSAGE value="Export HTTP Req+Res context" />
     <MESSAGE value="HTTP ResponseContext works" />
     <MESSAGE value="Created pkg:framework/http.dart" />
-    <option name="LAST_COMMIT_MESSAGE" value="Created pkg:framework/http.dart" />
+    <MESSAGE value="AnonymousService now takes FutureOr" />
+    <option name="LAST_COMMIT_MESSAGE" value="AnonymousService now takes FutureOr" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1481,16 +1425,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="20" lean-forward="true" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -1548,14 +1482,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
@@ -1584,14 +1510,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="648">
-          <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="227">
@@ -1602,11 +1520,37 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="648">
+          <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="150">
-            <caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+            <caret line="10" column="75" lean-forward="false" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" />
             <folding />
           </first_editor>
           <second_editor />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 657a97fd..3595b83b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ empty string.
 * Removed explicit dependence on `dart:io` for `Angel`, `RequestContext`, `ResponseContext`.
 * Created `lib/http.dart`, which exports HTTP-specific functionality.
 * `AnonymousService` now takes `FutureOr`.
+* `Service.toId` no longer only takes a `String`, and is generically-typed.
 
 # 1.1.0+3
 * Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index bc710123..ea6f7f2a 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -91,7 +91,7 @@ class Service extends Routable {
   }
 
   /// Transforms an [id] string into one acceptable by a service.
-  toId(String id) {
+  toId<T>(T id) {
     if (id == 'null' || id == null)
       return null;
     else

From 95433854e5ae1fa1e2fc56471f18e638b1c40705 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:51:22 -0500
Subject: [PATCH 192/414] IDEA

---
 .idea/workspace.xml | 71 ++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 830c8524..33960850 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="AnonymousService now takes FutureOr">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/service.dart" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,10 +25,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
+            <state relative-caret-position="15">
               <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
@@ -39,19 +37,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="150">
-                <caret line="10" column="75" lean-forward="false" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -198,8 +183,8 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
       </list>
     </option>
   </component>
@@ -629,14 +614,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="9274000" />
-    </task>
-    <task id="LOCAL-00022" summary="Add stackTrace">
-      <created>1498960583872</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1498960583872</updated>
+      <workItem from="1517973177718" duration="9448000" />
     </task>
     <task id="LOCAL-00023" summary="1.0.6+2">
       <created>1499619046675</created>
@@ -974,7 +952,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517982419999</updated>
     </task>
-    <option name="localTasksCounter" value="71" />
+    <task id="LOCAL-00071" summary="`Service.toId` no longer only takes a `String`">
+      <created>1517982512124</created>
+      <option name="number" value="00071" />
+      <option name="presentableId" value="LOCAL-00071" />
+      <option name="project" value="LOCAL" />
+      <updated>1517982512124</updated>
+    </task>
+    <option name="localTasksCounter" value="72" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1010,7 +995,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127310000" />
+    <option name="totallyTimeSpent" value="127484000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1069,7 +1054,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Patched handleAngelHttpException, bump to 1.1.0+2" />
     <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
     <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
     <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
@@ -1094,7 +1078,8 @@
     <MESSAGE value="HTTP ResponseContext works" />
     <MESSAGE value="Created pkg:framework/http.dart" />
     <MESSAGE value="AnonymousService now takes FutureOr" />
-    <option name="LAST_COMMIT_MESSAGE" value="AnonymousService now takes FutureOr" />
+    <MESSAGE value="`Service.toId` no longer only takes a `String`" />
+    <option name="LAST_COMMIT_MESSAGE" value="`Service.toId` no longer only takes a `String`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1536,9 +1521,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="225">
+            <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
+        <state relative-caret-position="15">
           <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
           <folding>
             <element signature="e#39#59#0" expanded="true" />
@@ -1546,17 +1542,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="150">
-            <caret line="10" column="75" lean-forward="false" selection-start-line="10" selection-start-column="75" selection-end-line="10" selection-end-column="75" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>

From 79433b7c8479ec374537de54deff21750555f3b3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:52:20 -0500
Subject: [PATCH 193/414] README update

---
 .idea/workspace.xml | 90 ++++++++++++++++++++++++++-------------------
 README.md           |  4 +-
 2 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33960850..5bbc6458 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -25,10 +26,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
+            <state relative-caret-position="1395">
               <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
@@ -37,6 +38,21 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="360">
+                <caret line="24" column="72" lean-forward="false" selection-start-line="24" selection-start-column="72" selection-end-line="24" selection-end-column="72" />
+                <folding>
+                  <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
+                </folding>
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -134,7 +150,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/injection.dart" />
         <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
@@ -185,6 +200,7 @@
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -614,14 +630,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="9448000" />
-    </task>
-    <task id="LOCAL-00023" summary="1.0.6+2">
-      <created>1499619046675</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1499619046675</updated>
+      <workItem from="1517973177718" duration="9510000" />
     </task>
     <task id="LOCAL-00024" summary="Added RequestContext.accepts">
       <created>1499728085186</created>
@@ -959,7 +968,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517982512124</updated>
     </task>
-    <option name="localTasksCounter" value="72" />
+    <task id="LOCAL-00072" summary="IDEA">
+      <created>1517982682803</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1517982682804</updated>
+    </task>
+    <option name="localTasksCounter" value="73" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -995,7 +1011,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127484000" />
+    <option name="totallyTimeSpent" value="127546000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1054,7 +1070,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Patched ResponseContext#isOpen, bump to 1.1.0+3" />
     <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
     <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
     <MESSAGE value="Created setup for AngelHttp" />
@@ -1079,7 +1094,8 @@
     <MESSAGE value="Created pkg:framework/http.dart" />
     <MESSAGE value="AnonymousService now takes FutureOr" />
     <MESSAGE value="`Service.toId` no longer only takes a `String`" />
-    <option name="LAST_COMMIT_MESSAGE" value="`Service.toId` no longer only takes a `String`" />
+    <MESSAGE value="IDEA" />
+    <option name="LAST_COMMIT_MESSAGE" value="IDEA" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1166,14 +1182,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="15" column="32" lean-forward="true" selection-start-line="15" selection-start-column="32" selection-end-line="15" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
@@ -1214,19 +1222,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="300">
-            <caret line="20" column="19" lean-forward="true" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
-            <folding>
-              <marker date="1506049250000" expanded="true" signature="588:776" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -1534,7 +1529,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
+        <state relative-caret-position="1395">
           <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
           <folding>
             <element signature="e#39#59#0" expanded="true" />
@@ -1542,6 +1537,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" column="57" lean-forward="true" selection-start-line="16" selection-start-column="57" selection-end-line="17" selection-end-column="72" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="360">
+            <caret line="24" column="72" lean-forward="false" selection-start-line="24" selection-start-column="72" selection-end-line="24" selection-end-column="72" />
+            <folding>
+              <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/README.md b/README.md
index 5547bf0a..d81a6300 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,8 @@ main() async {
     })
     ..post('/date', () => new DateTime.now().toString());
 
-  await app.startServer();
+  var http = new AngelHttp(app);
+  var server = await app.startServer('127.0.0.1', 3000);
+  print('Listening at http://${server.address.address}:${server.port}');
 }
 ```

From 194c0128067103b9ad8ee8358ac8c60b73e74fb7 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Feb 2018 00:53:46 -0500
Subject: [PATCH 194/414] Pubspec -> v1.1.1

---
 .idea/workspace.xml | 73 ++++++++++++++++++++++++++-------------------
 pubspec.yaml        |  4 ++-
 2 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5bbc6458..2f490cda 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -38,7 +38,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
@@ -53,6 +53,16 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -161,7 +171,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
@@ -201,6 +210,7 @@
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -630,14 +640,7 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="9510000" />
-    </task>
-    <task id="LOCAL-00024" summary="Added RequestContext.accepts">
-      <created>1499728085186</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1499728085186</updated>
+      <workItem from="1517973177718" duration="9592000" />
     </task>
     <task id="LOCAL-00025" summary="Swapped to angel_model">
       <created>1499806099923</created>
@@ -975,7 +978,14 @@
       <option name="project" value="LOCAL" />
       <updated>1517982682804</updated>
     </task>
-    <option name="localTasksCounter" value="73" />
+    <task id="LOCAL-00073" summary="README update">
+      <created>1517982740969</created>
+      <option name="number" value="00073" />
+      <option name="presentableId" value="LOCAL-00073" />
+      <option name="project" value="LOCAL" />
+      <updated>1517982740969</updated>
+    </task>
+    <option name="localTasksCounter" value="74" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1011,7 +1021,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127546000" />
+    <option name="totallyTimeSpent" value="127628000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1047,7 +1057,7 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1070,7 +1080,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Response no longer closes if `serialize` is called with an empty string" />
     <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
     <MESSAGE value="Created setup for AngelHttp" />
     <MESSAGE value="Basic server methods transferred to AngelHttp" />
@@ -1095,7 +1104,8 @@
     <MESSAGE value="AnonymousService now takes FutureOr" />
     <MESSAGE value="`Service.toId` no longer only takes a `String`" />
     <MESSAGE value="IDEA" />
-    <option name="LAST_COMMIT_MESSAGE" value="IDEA" />
+    <MESSAGE value="README update" />
+    <option name="LAST_COMMIT_MESSAGE" value="README update" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1104,13 +1114,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="33" lean-forward="true" selection-start-line="3" selection-start-column="33" selection-end-line="3" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
@@ -1122,14 +1125,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="23" lean-forward="false" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="245">
@@ -1558,6 +1553,22 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.lock">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="239" column="16" lean-forward="true" selection-start-line="239" selection-start-column="16" selection-end-line="239" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/pubspec.yaml b/pubspec.yaml
index 6047fced..50e9fc0b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.0+3
+version: 1.1.1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -11,6 +11,7 @@ dependencies:
   angel_route: ^2.0.0
   body_parser: ^1.0.0-dev
   charcode: ^1.0.0
+  combinator: ">=1.0.0-beta <2.0.0"
   container: ^0.1.2
   json_god: ^2.0.0-beta
   logging: ">=0.11.3 <1.0.0"
@@ -18,6 +19,7 @@ dependencies:
   merge_map: ^1.0.0
   meta: ^1.0.0
   mime: ^0.9.3
+  path: ">=1.0.0 <2.0.0"
   pool: ^1.0.0
   random_string: ^0.0.1
   tuple: ^1.0.0

From 289f4a6ec75a3e3061bc5ad53028a3d08c24327e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 30 Mar 2018 14:33:36 -0400
Subject: [PATCH 195/414] MapService dates will be strings

---
 .idea/workspace.xml           | 242 +++++++++++-----------------------
 CHANGELOG.md                  |   3 +
 lib/src/core/map_service.dart |   6 +-
 pubspec.yaml                  |   2 +-
 4 files changed, 84 insertions(+), 169 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2f490cda..359830f8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -25,11 +27,11 @@
     <favorites_list name="framework" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1395">
+            <state relative-caret-position="0">
               <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
@@ -38,12 +40,12 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="360">
-                <caret line="24" column="72" lean-forward="false" selection-start-line="24" selection-start-column="72" selection-end-line="24" selection-end-column="72" />
+              <first_editor relative-caret-position="145">
+                <caret line="11" column="43" lean-forward="true" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
                 <folding>
                   <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
                 </folding>
@@ -53,12 +55,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
-              <folding />
+            <state relative-caret-position="105">
+              <caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -160,7 +164,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/pattern_matcher_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/metrics.dart" />
@@ -207,10 +210,11 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
       </list>
     </option>
   </component>
@@ -244,6 +248,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -292,10 +299,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scratches" />
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -640,14 +644,8 @@
       <workItem from="1513103483207" duration="18000" />
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
-      <workItem from="1517973177718" duration="9592000" />
-    </task>
-    <task id="LOCAL-00025" summary="Swapped to angel_model">
-      <created>1499806099923</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1499806099923</updated>
+      <workItem from="1517973177718" duration="9736000" />
+      <workItem from="1522434729364" duration="75000" />
     </task>
     <task id="LOCAL-00026" summary="1.0.7+2">
       <created>1500824472581</created>
@@ -985,13 +983,17 @@
       <option name="project" value="LOCAL" />
       <updated>1517982740969</updated>
     </task>
-    <option name="localTasksCounter" value="74" />
+    <task id="LOCAL-00074" summary="Pubspec -&gt; v1.1.1">
+      <created>1517982826744</created>
+      <option name="number" value="00074" />
+      <option name="presentableId" value="LOCAL-00074" />
+      <option name="project" value="LOCAL" />
+      <updated>1517982826744</updated>
+    </task>
+    <option name="localTasksCounter" value="75" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.02.06 at 23h 59m 25s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.02.07 at 00h 30m 51s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1013,6 +1015,9 @@
     <history-entry file="All_Tests - 2018.02.07 at 00h 44m 04s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.03.30 at 14h 33m 23s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
     <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.02.07 at 00h 34m 12s.xml">
       <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1021,7 +1026,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127628000" />
+    <option name="totallyTimeSpent" value="127847000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1055,11 +1060,10 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1070,6 +1074,7 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1080,7 +1085,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Added `autoSnakeCaseNames` to `MapService`" />
     <MESSAGE value="Created setup for AngelHttp" />
     <MESSAGE value="Basic server methods transferred to AngelHttp" />
     <MESSAGE value="Made `Angel.serializer` public" />
@@ -1105,7 +1109,8 @@
     <MESSAGE value="`Service.toId` no longer only takes a `String`" />
     <MESSAGE value="IDEA" />
     <MESSAGE value="README update" />
-    <option name="LAST_COMMIT_MESSAGE" value="README update" />
+    <MESSAGE value="Pubspec -&gt; v1.1.1" />
+    <option name="LAST_COMMIT_MESSAGE" value="Pubspec -&gt; v1.1.1" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1118,20 +1123,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#38#0" expanded="false" />
-            <marker date="1511894754000" expanded="true" signature="1709:1766" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="94" column="46" lean-forward="true" selection-start-line="94" selection-start-column="46" selection-end-line="94" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#20#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1139,7 +1130,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="15">
           <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1147,9 +1137,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="261">
           <caret line="26" column="21" lean-forward="false" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1157,7 +1144,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
           <caret line="62" column="32" lean-forward="false" selection-start-line="62" selection-start-column="32" selection-end-line="62" selection-end-column="32" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1165,23 +1151,14 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
           <caret line="103" column="25" lean-forward="false" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="0" lean-forward="true" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/example/common.dart" />
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
           <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1189,7 +1166,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
           <caret line="23" column="30" lean-forward="false" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1197,7 +1173,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="224">
           <caret line="201" column="50" lean-forward="false" selection-start-line="201" selection-start-column="50" selection-end-line="201" selection-end-column="50" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1205,7 +1180,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
           <caret line="16" column="31" lean-forward="true" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1213,7 +1187,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
           <caret line="820" column="15" lean-forward="false" selection-start-line="820" selection-start-column="15" selection-end-line="820" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1221,7 +1194,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
           <caret line="31" column="18" lean-forward="true" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1229,9 +1201,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
           <caret line="29" column="36" lean-forward="true" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1239,7 +1208,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
           <caret line="20" column="36" lean-forward="true" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1247,9 +1215,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="260">
           <caret line="29" column="31" lean-forward="true" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
-          <folding>
-            <marker date="1517981365000" expanded="true" signature="3221:3505" ph="{...}" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1257,7 +1222,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
           <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1265,7 +1229,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
           <caret line="12" column="55" lean-forward="false" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1273,7 +1236,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
           <caret line="108" column="9" lean-forward="false" selection-start-line="108" selection-start-column="9" selection-end-line="108" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1281,7 +1243,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="237">
           <caret line="116" column="3" lean-forward="true" selection-start-line="116" selection-start-column="3" selection-end-line="116" selection-end-column="3" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1289,7 +1250,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
           <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1297,7 +1257,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="116">
           <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1305,7 +1264,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
           <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1313,7 +1271,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1321,10 +1278,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="302">
           <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
-          <folding>
-            <marker date="1517981346000" expanded="false" signature="7:13" ph="..." />
-            <marker date="1517981346000" expanded="true" signature="6163:6173" ph="{...}" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1332,25 +1285,14 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="165">
           <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1358,7 +1300,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="251">
           <caret line="107" column="0" lean-forward="true" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1366,7 +1307,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="10" column="26" lean-forward="false" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1374,9 +1314,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="54" lean-forward="true" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1384,9 +1321,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
           <caret line="45" column="54" lean-forward="false" selection-start-line="45" selection-start-column="54" selection-end-line="45" selection-end-column="54" />
-          <folding>
-            <element signature="e#55#75#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1394,9 +1328,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="212">
           <caret line="231" column="35" lean-forward="false" selection-start-line="231" selection-start-column="35" selection-end-line="231" selection-end-column="35" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1404,9 +1335,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="52" lean-forward="false" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1414,10 +1342,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="158">
           <caret line="104" column="46" lean-forward="true" selection-start-line="104" selection-start-column="46" selection-end-line="104" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-            <marker date="1517982193000" expanded="true" signature="398:591" ph="..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1425,9 +1349,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="122">
           <caret line="323" column="42" lean-forward="false" selection-start-line="323" selection-start-column="42" selection-end-line="323" selection-end-column="42" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1435,7 +1356,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="10" column="32" lean-forward="true" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1443,7 +1363,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
           <caret line="3" column="27" lean-forward="true" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1451,9 +1370,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="27" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1461,9 +1377,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
           <caret line="11" column="27" lean-forward="true" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1471,7 +1384,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="28" lean-forward="true" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1479,9 +1391,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-          <folding>
-            <element signature="e#81#109#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1489,9 +1398,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="227">
           <caret line="26" column="78" lean-forward="false" selection-start-line="26" selection-start-column="78" selection-end-line="26" selection-end-column="78" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1499,7 +1405,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="648">
           <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1507,24 +1412,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
           <caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="225">
-            <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
-            <folding />
-          </first_editor>
-          <second_editor />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1395">
+        <state relative-caret-position="0">
           <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
           <folding>
             <element signature="e#39#59#0" expanded="true" />
@@ -1536,20 +1429,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
           <caret line="16" column="57" lean-forward="true" selection-start-line="16" selection-start-column="57" selection-end-line="17" selection-end-column="72" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="360">
-            <caret line="24" column="72" lean-forward="false" selection-start-line="24" selection-start-column="72" selection-end-line="24" selection-end-column="72" />
-            <folding>
-              <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
         </state>
       </provider>
     </entry>
@@ -1557,18 +1436,51 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
           <caret line="239" column="16" lean-forward="true" selection-start-line="239" selection-start-column="16" selection-end-line="239" selection-end-column="16" />
-          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="90">
+            <caret line="6" column="38" lean-forward="true" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="28" lean-forward="true" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="28" />
+        <state relative-caret-position="90">
+          <caret line="6" column="24" lean-forward="true" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="145">
+            <caret line="11" column="43" lean-forward="true" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
+            <folding>
+              <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3595b83b..e34e4fdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.2
+* `MapService` will store `created_at` and `updated_at` as `String`.
+
 # 1.1.1
 * `ResponseContext` no longer automatically closes if `serializer` returns an
 empty string.
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index ce2c409a..9f89f0f0 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -76,7 +76,7 @@ class MapService extends Service {
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
-    var now = new DateTime.now();
+    var now = new DateTime.now().toIso8601String();
     var result = data;
 
     if (autoIdAndDateFields == true) {
@@ -103,7 +103,7 @@ class MapService extends Service {
     if (autoIdAndDateFields == true)
       result
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-            new DateTime.now();
+            new DateTime.now().toIso8601String();
     return result;
   }
 
@@ -128,7 +128,7 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] =
             old[autoSnakeCaseNames == false ? 'createdAt' : 'created_at']
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-            new DateTime.now();
+            new DateTime.now().toIso8601String();
     }
     items.add(result);
     return result;
diff --git a/pubspec.yaml b/pubspec.yaml
index 50e9fc0b..257a3f47 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.1
+version: 1.1.2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From c5dcbedd67b220bf76eb5a97eef6dcd54d5050b4 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 6 Apr 2018 15:43:10 -0400
Subject: [PATCH 196/414] Bring back zones; mysterious hang

---
 .idea/workspace.xml           | 353 +++++++++++++++++++---------------
 lib/src/http/angel_http.dart  | 106 +++++-----
 test/parameter_meta_test.dart |   3 +
 3 files changed, 256 insertions(+), 206 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 359830f8..28d4e749 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -40,12 +39,12 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="145">
-                <caret line="11" column="43" lean-forward="true" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
+              <first_editor relative-caret-position="150">
+                <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
                 <folding>
                   <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
                 </folding>
@@ -55,11 +54,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
+            <state relative-caret-position="1320">
+              <caret line="88" column="24" lean-forward="false" selection-start-line="88" selection-start-column="24" selection-end-line="88" selection-end-column="24" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -67,6 +66,28 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="124" column="0" lean-forward="true" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="30">
+              <caret line="2" column="15" lean-forward="true" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -79,21 +100,11 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>cache</find>
-      <find>errorHan</find>
-      <find>addStre</find>
-      <find>((cre)|(upd))atedAt</find>
-      <find>'((cre)|(upd))atedAt'</find>
-      <find>handleReque</find>
-      <find>optimize</find>
-      <find>serializer`</find>
-      <find>serializer</find>
       <find>injectSeri</find>
       <find>close</find>
       <find>shutdown</find>
       <find>HttpHeaders</find>
       <find>ContentType</find>
-      <find>createZ</find>
       <find>app</find>
       <find>handleRe</find>
       <find>instead.</find>
@@ -109,6 +120,16 @@
       <find>= true</find>
       <find>Future</find>
       <find>toId</find>
+      <find>createZ</find>
+      <find>default</find>
+      <find>catch</find>
+      <find>error</find>
+      <find>trace</find>
+      <find>zonesp</find>
+      <find>close(</find>
+      <find>runGuar</find>
+      <find>unca</find>
+      <find>async</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -164,7 +185,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/metrics.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
@@ -178,7 +198,6 @@
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
@@ -202,12 +221,10 @@
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
@@ -215,6 +232,10 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -225,7 +246,7 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="39" />
+    <option name="x" value="73" />
     <option name="y" value="25" />
     <option name="width" value="1360" />
     <option name="height" value="797" />
@@ -248,9 +269,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -299,7 +318,9 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
+      <pane id="AndroidView" />
+      <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -340,7 +361,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Test.injects session or throws in parameter_meta_test.dart">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -645,14 +666,8 @@
       <workItem from="1513103506825" duration="139000" />
       <workItem from="1517332581856" duration="858000" />
       <workItem from="1517973177718" duration="9736000" />
-      <workItem from="1522434729364" duration="75000" />
-    </task>
-    <task id="LOCAL-00026" summary="1.0.7+2">
-      <created>1500824472581</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1500824472581</updated>
+      <workItem from="1522434729364" duration="100000" />
+      <workItem from="1523041434716" duration="2337000" />
     </task>
     <task id="LOCAL-00027" summary="Working on 1.0.8, including performance tuning">
       <created>1501778421241</created>
@@ -990,43 +1005,50 @@
       <option name="project" value="LOCAL" />
       <updated>1517982826744</updated>
     </task>
-    <option name="localTasksCounter" value="75" />
+    <task id="LOCAL-00075" summary="MapService dates will be strings">
+      <created>1522434816896</created>
+      <option name="number" value="00075" />
+      <option name="presentableId" value="LOCAL-00075" />
+      <option name="project" value="LOCAL" />
+      <updated>1522434816901</updated>
+    </task>
+    <option name="localTasksCounter" value="76" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.02.07 at 00h 30m 51s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 35m 42s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.02.07 at 00h 31m 37s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 36m 29s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.02.07 at 00h 33m 17s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 36m 42s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.02.07 at 00h 34m 49s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 38m 08s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.02.07 at 00h 35m 05s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 38m 29s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.02.07 at 00h 35m 52s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 39m 23s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.02.07 at 00h 44m 04s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 39m 28s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.03.30 at 14h 33m 23s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 39m 59s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.02.07 at 00h 34m 12s.xml">
-      <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 41m 13s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.02.07 at 00h 34m 29s.xml">
-      <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 42m 12s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="127847000" />
+    <option name="totallyTimeSpent" value="130209000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1038,40 +1060,40 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="39" y="25" width="1360" height="797" extended-state="0" />
+    <frame x="73" y="25" width="1360" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4002849" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1085,7 +1107,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Created setup for AngelHttp" />
     <MESSAGE value="Basic server methods transferred to AngelHttp" />
     <MESSAGE value="Made `Angel.serializer` public" />
     <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
@@ -1110,7 +1131,8 @@
     <MESSAGE value="IDEA" />
     <MESSAGE value="README update" />
     <MESSAGE value="Pubspec -&gt; v1.1.1" />
-    <option name="LAST_COMMIT_MESSAGE" value="Pubspec -&gt; v1.1.1" />
+    <MESSAGE value="MapService dates will be strings" />
+    <option name="LAST_COMMIT_MESSAGE" value="MapService dates will be strings" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1119,27 +1141,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="31" column="33" lean-forward="false" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.3+1/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="328" column="26" lean-forward="false" selection-start-line="328" selection-start-column="26" selection-end-line="328" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="26" column="21" lean-forward="false" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -1162,13 +1163,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="23" column="30" lean-forward="false" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib/meta.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="224">
@@ -1239,13 +1233,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="116" column="3" lean-forward="true" selection-start-line="116" selection-start-column="3" selection-end-line="116" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
@@ -1289,13 +1276,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="251">
@@ -1345,13 +1325,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="323" column="42" lean-forward="false" selection-start-line="323" selection-start-column="42" selection-end-line="323" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
@@ -1373,13 +1346,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="11" column="27" lean-forward="true" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1408,23 +1374,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="25" lean-forward="true" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
@@ -1444,26 +1393,64 @@
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="90">
             <caret line="6" column="38" lean-forward="true" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
-            <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="24" lean-forward="true" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="18" column="50" lean-forward="true" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
+          <folding>
+            <element signature="e#100#120#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1188">
+          <caret line="489" column="25" lean-forward="true" selection-start-line="489" selection-start-column="25" selection-end-line="490" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="26" column="50" lean-forward="false" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="318">
+          <caret line="99" column="11" lean-forward="false" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/mock_request.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="16" lean-forward="true" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/future.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="659" column="12" lean-forward="false" selection-start-line="659" selection-start-column="12" selection-end-line="659" selection-end-column="12" />
           <folding />
         </state>
       </provider>
@@ -1471,8 +1458,8 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="145">
-            <caret line="11" column="43" lean-forward="true" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
+          <first_editor relative-caret-position="150">
+            <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
             <folding>
               <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
             </folding>
@@ -1481,6 +1468,52 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="389">
+          <caret line="222" column="19" lean-forward="false" selection-start-line="222" selection-start-column="19" selection-end-line="222" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1320">
+          <caret line="88" column="24" lean-forward="false" selection-start-line="88" selection-start-column="24" selection-end-line="88" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="124" column="0" lean-forward="true" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="15" lean-forward="true" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index b2522720..2c7f102d 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -6,6 +6,7 @@ import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:pool/pool.dart';
+import 'package:stack_trace/stack_trace.dart';
 import 'package:tuple/tuple.dart';
 import 'http_request_context.dart';
 import 'http_response_context.dart';
@@ -26,7 +27,8 @@ class AngelHttp {
   AngelHttp(this.app);
 
   /// The function used to bind this instance to an HTTP server.
-  Future<HttpServer> Function(dynamic, int) get serverGenerator => _serverGenerator;
+  Future<HttpServer> Function(dynamic, int) get serverGenerator =>
+      _serverGenerator;
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory AngelHttp.custom(
@@ -90,9 +92,7 @@ class AngelHttp {
     // TODO: Remove this try/catch in 1.2.0
     try {
       await app.close();
-    } catch(_) {
-
-    }
+    } catch (_) {}
 
     for (var configurer in app.shutdownHooks) await app.configure(configurer);
     return _server;
@@ -103,7 +103,54 @@ class AngelHttp {
     var req = await createRequestContext(request);
     var res = await createResponseContext(request.response, req);
 
-    try {
+    var zoneSpec = new ZoneSpecification(
+      print: (self, parent, zone, line) {
+        if (app.logger != null)
+          app.logger.info(line);
+        else
+          parent.print(zone, line);
+      },
+      handleUncaughtError: (self, parent, zone, error, stackTrace) async {
+        var trace = new Trace.from(stackTrace).terse;
+
+        try {
+          AngelHttpException e;
+
+          if (error is FormatException) {
+            e = new AngelHttpException.badRequest(message: error.message);
+          } else {
+            e = new AngelHttpException(error,
+                stackTrace: stackTrace, message: error?.toString());
+          }
+
+          if (app.logger != null) {
+            app.logger.severe(e.message ?? e.toString(), error, trace);
+          }
+
+          await handleAngelHttpException(e, trace, req, res, request);
+        } catch (e, st) {
+          var trace = new Trace.from(st).terse;
+          request.response.close();
+          // Ideally, we won't be in a position where an absolutely fatal error occurs,
+          // but if so, we'll need to log it.
+          if (app.logger != null) {
+            app.logger.severe(
+                'Fatal error occurred when processing ${request.uri}.',
+                e,
+                trace);
+          } else {
+            stderr
+              ..writeln('Fatal error occurred when processing '
+                  '${request.uri}:')
+              ..writeln(e)
+              ..writeln(trace);
+          }
+        }
+      },
+    );
+
+    var zone = Zone.current.fork(specification: zoneSpec);
+    return await zone.runGuarded(() async {
       var path = req.path;
       if (path == '/') path = '';
 
@@ -124,8 +171,8 @@ class AngelHttp {
           ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
           : resolveTuple();
 
-      //req.inject(Zone, zone);
-      //req.inject(ZoneSpecification, zoneSpec);
+      req.inject(Zone, zone);
+      req.inject(ZoneSpecification, zoneSpec);
       req.params.addAll(tuple.item2);
       req.inject(ParseResult, tuple.item3);
 
@@ -134,48 +181,15 @@ class AngelHttp {
       var pipeline = tuple.item1;
 
       for (var handler in pipeline) {
-        try {
-          if (handler == null || !await app.executeHandler(handler, req, res))
-            break;
-        } on AngelHttpException catch (e, st) {
-          e.stackTrace ??= st;
-          return await handleAngelHttpException(e, st, req, res, request);
-        }
+        if (handler == null || !await app.executeHandler(handler, req, res))
+          break;
       }
 
-      try {
-        await sendResponse(request, req, res);
-      } on AngelHttpException catch (e, st) {
-        e.stackTrace ??= st;
-        return await handleAngelHttpException(
-          e,
-          st,
-          req,
-          res,
-          request,
-          ignoreFinalizers: true,
-        );
-      }
-    } on FormatException catch (error, stackTrace) {
-      var e = new AngelHttpException.badRequest(message: error.message);
-
-      if (app.logger != null) {
-        app.logger.severe(e.message ?? e.toString(), error, stackTrace);
-      }
-
-      return await handleAngelHttpException(e, stackTrace, req, res, request);
-    } catch (error, stackTrace) {
-      var e = new AngelHttpException(error,
-          stackTrace: stackTrace, message: error?.toString());
-
-      if (app.logger != null) {
-        app.logger.severe(e.message ?? e.toString(), error, stackTrace);
-      }
-
-      return await handleAngelHttpException(e, stackTrace, req, res, request);
-    } finally {
+      await sendResponse(request, req, res);
+    }).whenComplete(() {
       res.dispose();
-    }
+      print('hey');
+    });
   }
 
   /// Handles an [AngelHttpException].
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index e72abcb3..9e324e91 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -85,11 +85,14 @@ main() {
     // Invalid request
     var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
     var rs = rq.response;
+    print('a');
     await http.handleRequest(rq);
+    print('b');
 
     await printResponse(rs);
     expect(rs.statusCode, 500);
 
+
     rq = new MockHttpRequest('GET', Uri.parse('/session'));
     rq.session['foo'] = 'bar';
     rq.close();

From 1a32a579d66837ff98f94183cf3296f1b31b69cc Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 6 Apr 2018 15:45:58 -0400
Subject: [PATCH 197/414] Fixed tests

---
 .idea/workspace.xml           | 146 ++++++++++++++++++----------------
 example/main.dart             |   2 +
 lib/src/http/angel_http.dart  |   1 -
 test/parameter_meta_test.dart |   4 +-
 4 files changed, 82 insertions(+), 71 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 28d4e749..97d00268 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/main.dart" afterPath="$PROJECT_DIR$/example/main.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
     </list>
@@ -54,11 +55,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1320">
-              <caret line="88" column="24" lean-forward="false" selection-start-line="88" selection-start-column="24" selection-end-line="88" selection-end-column="24" />
+            <state relative-caret-position="256">
+              <caret line="98" column="0" lean-forward="true" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -69,8 +70,8 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="195">
-              <caret line="124" column="0" lean-forward="true" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
+            <state relative-caret-position="45">
+              <caret line="183" column="21" lean-forward="true" selection-start-line="183" selection-start-column="21" selection-end-line="183" selection-end-column="21" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -78,7 +79,17 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/main.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="9" column="29" lean-forward="false" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="30">
@@ -100,7 +111,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>injectSeri</find>
       <find>close</find>
       <find>shutdown</find>
       <find>HttpHeaders</find>
@@ -130,6 +140,7 @@
       <find>runGuar</find>
       <find>unca</find>
       <find>async</find>
+      <find>hey</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -200,7 +211,6 @@
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
@@ -234,8 +244,9 @@
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
       </list>
     </option>
   </component>
@@ -667,14 +678,7 @@
       <workItem from="1517332581856" duration="858000" />
       <workItem from="1517973177718" duration="9736000" />
       <workItem from="1522434729364" duration="100000" />
-      <workItem from="1523041434716" duration="2337000" />
-    </task>
-    <task id="LOCAL-00027" summary="Working on 1.0.8, including performance tuning">
-      <created>1501778421241</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1501778421241</updated>
+      <workItem from="1523041434716" duration="2511000" />
     </task>
     <task id="LOCAL-00028" summary="Remove reopen">
       <created>1501778536483</created>
@@ -1012,19 +1016,17 @@
       <option name="project" value="LOCAL" />
       <updated>1522434816901</updated>
     </task>
-    <option name="localTasksCounter" value="76" />
+    <task id="LOCAL-00076" summary="Bring back zones; mysterious hang">
+      <created>1523043790358</created>
+      <option name="number" value="00076" />
+      <option name="presentableId" value="LOCAL-00076" />
+      <option name="project" value="LOCAL" />
+      <updated>1523043790361</updated>
+    </task>
+    <option name="localTasksCounter" value="77" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 35m 42s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 36m 29s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 36m 42s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 38m 08s.xml">
       <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1046,9 +1048,18 @@
     <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 42m 12s.xml">
       <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 45m 10s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 45m 20s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 45m 48s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="130209000" />
+    <option name="totallyTimeSpent" value="130383000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1073,11 +1084,11 @@
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1107,7 +1118,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Basic server methods transferred to AngelHttp" />
     <MESSAGE value="Made `Angel.serializer` public" />
     <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
     <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
@@ -1132,7 +1142,8 @@
     <MESSAGE value="README update" />
     <MESSAGE value="Pubspec -&gt; v1.1.1" />
     <MESSAGE value="MapService dates will be strings" />
-    <option name="LAST_COMMIT_MESSAGE" value="MapService dates will be strings" />
+    <MESSAGE value="Bring back zones; mysterious hang" />
+    <option name="LAST_COMMIT_MESSAGE" value="Bring back zones; mysterious hang" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1374,13 +1385,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="57" lean-forward="true" selection-start-line="16" selection-start-column="57" selection-end-line="17" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.lock">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
@@ -1455,6 +1459,40 @@
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="389">
+          <caret line="222" column="19" lean-forward="false" selection-start-line="222" selection-start-column="19" selection-end-line="222" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="15" lean-forward="true" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="29" lean-forward="false" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="183" column="21" lean-forward="true" selection-start-line="183" selection-start-column="21" selection-end-line="183" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1478,42 +1516,16 @@
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="222" column="19" lean-forward="false" selection-start-line="222" selection-start-column="19" selection-end-line="222" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1320">
-          <caret line="88" column="24" lean-forward="false" selection-start-line="88" selection-start-column="24" selection-end-line="88" selection-end-column="24" />
+        <state relative-caret-position="256">
+          <caret line="98" column="0" lean-forward="true" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="124" column="0" lean-forward="true" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="15" lean-forward="true" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/example/main.dart b/example/main.dart
index 5f3a61e8..d3e780ba 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -7,6 +7,8 @@ main() async {
 
   app.get('/greet/:name', (String name) => 'Hello, $name!');
 
+  app.get('/greet', (@Session('name') String name) => 'Hello, $name!');
+
   app.use((RequestContext req) async {
     throw new AngelHttpException.notFound(
       message: 'Unknown path: "${req.uri.path}"',
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 2c7f102d..f1fc7c6d 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -188,7 +188,6 @@ class AngelHttp {
       await sendResponse(request, req, res);
     }).whenComplete(() {
       res.dispose();
-      print('hey');
     });
   }
 
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 9e324e91..546be9ac 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -85,9 +85,7 @@ main() {
     // Invalid request
     var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
     var rs = rq.response;
-    print('a');
-    await http.handleRequest(rq);
-    print('b');
+    await http.handleRequest(rq).timeout(const Duration(seconds: 5)).catchError((_) => null);
 
     await printResponse(rs);
     expect(rs.statusCode, 500);

From ed1090fb8e04fd87009248720d9705c7b7fb7860 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 6 Apr 2018 15:46:28 -0400
Subject: [PATCH 198/414] CHANGELOG

---
 .idea/workspace.xml | 94 +++++++++++++++++++++++++--------------------
 CHANGELOG.md        |  3 ++
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 97d00268..5ef87b98 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/main.dart" afterPath="$PROJECT_DIR$/example/main.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -55,7 +53,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="256">
@@ -67,11 +65,24 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="15">
+                <caret line="1" column="47" lean-forward="false" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
+                <folding />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="183" column="21" lean-forward="true" selection-start-line="183" selection-start-column="21" selection-end-line="183" selection-end-column="21" />
+            <state relative-caret-position="188">
+              <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -240,13 +251,13 @@
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -678,14 +689,7 @@
       <workItem from="1517332581856" duration="858000" />
       <workItem from="1517973177718" duration="9736000" />
       <workItem from="1522434729364" duration="100000" />
-      <workItem from="1523041434716" duration="2511000" />
-    </task>
-    <task id="LOCAL-00028" summary="Remove reopen">
-      <created>1501778536483</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1501778536483</updated>
+      <workItem from="1523041434716" duration="2544000" />
     </task>
     <task id="LOCAL-00029" summary="1.0.8">
       <created>1501782730507</created>
@@ -1023,7 +1027,14 @@
       <option name="project" value="LOCAL" />
       <updated>1523043790361</updated>
     </task>
-    <option name="localTasksCounter" value="77" />
+    <task id="LOCAL-00077" summary="Fixed tests">
+      <created>1523043958692</created>
+      <option name="number" value="00077" />
+      <option name="presentableId" value="LOCAL-00077" />
+      <option name="project" value="LOCAL" />
+      <updated>1523043958692</updated>
+    </task>
+    <option name="localTasksCounter" value="78" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1059,7 +1070,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="130383000" />
+    <option name="totallyTimeSpent" value="130416000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1084,7 +1095,7 @@
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1118,7 +1129,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Made `Angel.serializer` public" />
     <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
     <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
     <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
@@ -1143,7 +1153,8 @@
     <MESSAGE value="Pubspec -&gt; v1.1.1" />
     <MESSAGE value="MapService dates will be strings" />
     <MESSAGE value="Bring back zones; mysterious hang" />
-    <option name="LAST_COMMIT_MESSAGE" value="Bring back zones; mysterious hang" />
+    <MESSAGE value="Fixed tests" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed tests" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1392,16 +1403,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="90">
-            <caret line="6" column="38" lean-forward="true" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -1483,16 +1484,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="183" column="21" lean-forward="true" selection-start-line="183" selection-start-column="21" selection-end-line="183" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1526,6 +1517,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="15">
+            <caret line="1" column="47" lean-forward="false" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="188">
+          <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e34e4fdb..8ad1cde5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.3
+* `AngelHttp` now handles requests in a `Zone`.
+
 # 1.1.2
 * `MapService` will store `created_at` and `updated_at` as `String`.
 

From 271456d2ee194e410545be3baffca11368e4eca1 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 6 Apr 2018 15:56:14 -0400
Subject: [PATCH 199/414] Update example

---
 .idea/workspace.xml | 174 +++++++++++++++++++++++---------------------
 README.md           |  33 +++++++--
 example/main.dart   |  17 ++++-
 3 files changed, 134 insertions(+), 90 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5ef87b98..f9ebb579 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Update example">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/main.dart" afterPath="$PROJECT_DIR$/example/main.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -29,7 +30,7 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
+            <state relative-caret-position="203">
               <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
@@ -38,14 +39,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="150">
-                <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+              <first_editor relative-caret-position="324">
+                <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
                 <folding>
-                  <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
+                  <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
                 </folding>
               </first_editor>
               <second_editor />
@@ -56,8 +57,8 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="256">
-              <caret line="98" column="0" lean-forward="true" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
+            <state relative-caret-position="158">
+              <caret line="40" column="0" lean-forward="true" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -78,7 +79,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="188">
@@ -90,11 +91,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="29" lean-forward="false" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
+            <state relative-caret-position="131">
+              <caret line="51" column="8" lean-forward="false" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="281">
+              <caret line="84" column="0" lean-forward="true" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -122,8 +133,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>close</find>
-      <find>shutdown</find>
       <find>HttpHeaders</find>
       <find>ContentType</find>
       <find>app</find>
@@ -152,6 +161,8 @@
       <find>unca</find>
       <find>async</find>
       <find>hey</find>
+      <find>match</find>
+      <find>getV</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -249,15 +260,15 @@
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -689,14 +700,7 @@
       <workItem from="1517332581856" duration="858000" />
       <workItem from="1517973177718" duration="9736000" />
       <workItem from="1522434729364" duration="100000" />
-      <workItem from="1523041434716" duration="2544000" />
-    </task>
-    <task id="LOCAL-00029" summary="1.0.8">
-      <created>1501782730507</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1501782730507</updated>
+      <workItem from="1523041434716" duration="3129000" />
     </task>
     <task id="LOCAL-00030" summary="1.0.9+1">
       <created>1503934167188</created>
@@ -1034,13 +1038,17 @@
       <option name="project" value="LOCAL" />
       <updated>1523043958692</updated>
     </task>
-    <option name="localTasksCounter" value="78" />
+    <task id="LOCAL-00078" summary="CHANGELOG">
+      <created>1523043988632</created>
+      <option name="number" value="00078" />
+      <option name="presentableId" value="LOCAL-00078" />
+      <option name="project" value="LOCAL" />
+      <updated>1523043988632</updated>
+    </task>
+    <option name="localTasksCounter" value="79" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 38m 08s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 38m 29s.xml">
       <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1068,9 +1076,12 @@
     <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 45m 48s.xml">
       <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 49m 39s.xml">
+      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="130416000" />
+    <option name="totallyTimeSpent" value="131001000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1129,7 +1140,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Remove line that resets `Angel.serializer` on close" />
     <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
     <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
     <MESSAGE value="Deprecated all serving logic in `Angel`" />
@@ -1154,7 +1164,8 @@
     <MESSAGE value="MapService dates will be strings" />
     <MESSAGE value="Bring back zones; mysterious hang" />
     <MESSAGE value="Fixed tests" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed tests" />
+    <MESSAGE value="CHANGELOG" />
+    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1298,13 +1309,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="251">
-          <caret line="107" column="0" lean-forward="true" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
@@ -1428,14 +1432,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="26" column="50" lean-forward="false" selection-start-line="26" selection-start-column="50" selection-end-line="26" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="318">
@@ -1476,41 +1472,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="29" lean-forward="false" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="150">
-            <caret line="10" column="7" lean-forward="false" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
-            <folding>
-              <marker date="1517982736000" expanded="true" signature="588:912" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="98" column="0" lean-forward="true" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
+        <state relative-caret-position="158">
+          <caret line="40" column="0" lean-forward="true" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1528,6 +1493,40 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="51" column="8" lean-forward="false" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="84" column="0" lean-forward="true" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="203">
+          <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="25" column="18" lean-forward="true" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="188">
@@ -1538,6 +1537,19 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="324">
+            <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
+            <folding>
+              <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/README.md b/README.md
index d81a6300..d8276fba 100644
--- a/README.md
+++ b/README.md
@@ -14,14 +14,33 @@ import 'package:angel_framework/angel_framework.dart';
 main() async {
   var app = new Angel();
 
-  app
-    ..get('/hello', (req, res) {
-      res.write('world!');
-    })
-    ..post('/date', () => new DateTime.now().toString());
+  // Index route. Returns JSON.
+  app.get('/', () => 'Welcome to Angel!');
+
+  // Accepts a URL like /greet/foo or /greet/bob.
+  app.get('/greet/:name', (String name) => 'Hello, $name!');
+
+  // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
+  app.get('/greet', (@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥');
+
+  // Handle any other query value of `name`.
+  app.get('/greet', (@Query('name') String name) => 'Hello, $name!');
+
+  // Simple fallback to throw a 404 on unknown paths.
+  app.use((RequestContext req) async {
+    throw new AngelHttpException.notFound(
+      message: 'Unknown path: "${req.uri.path}"',
+    );
+  });
 
   var http = new AngelHttp(app);
-  var server = await app.startServer('127.0.0.1', 3000);
-  print('Listening at http://${server.address.address}:${server.port}');
+  var server = await http.startServer('127.0.0.1', 3000);
+  var url = 'http://${server.address.address}:${server.port}';
+  print('Listening at $url');
+  print('Visit these pages to see Angel in action:');
+  print('* $url/greet/bob');
+  print('* $url/greet/?name=emoji');
+  print('* $url/greet/?name=jack');
+  print('* $url/nonexistent_page');
 }
 ```
diff --git a/example/main.dart b/example/main.dart
index d3e780ba..1b5cca7f 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -3,12 +3,19 @@ import 'package:angel_framework/angel_framework.dart';
 main() async {
   var app = new Angel();
 
+  // Index route. Returns JSON.
   app.get('/', () => 'Welcome to Angel!');
 
+  // Accepts a URL like /greet/foo or /greet/bob.
   app.get('/greet/:name', (String name) => 'Hello, $name!');
 
-  app.get('/greet', (@Session('name') String name) => 'Hello, $name!');
+  // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
+  app.get('/greet', (@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥');
 
+  // Handle any other query value of `name`.
+  app.get('/greet', (@Query('name') String name) => 'Hello, $name!');
+
+  // Simple fallback to throw a 404 on unknown paths.
   app.use((RequestContext req) async {
     throw new AngelHttpException.notFound(
       message: 'Unknown path: "${req.uri.path}"',
@@ -17,5 +24,11 @@ main() async {
 
   var http = new AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
-  print('Listening at http://${server.address.address}:${server.port}');
+  var url = 'http://${server.address.address}:${server.port}';
+  print('Listening at $url');
+  print('Visit these pages to see Angel in action:');
+  print('* $url/greet/bob');
+  print('* $url/greet/?name=emoji');
+  print('* $url/greet/?name=jack');
+  print('* $url/nonexistent_page');
 }

From 24de38151e9caa53fa7dddbbcf43e7da5a21e339 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 15 May 2018 22:05:13 -0400
Subject: [PATCH 200/414] Use dart2_constant

---
 .idea/libraries/Dart_Packages.xml  |   8 +
 .idea/workspace.xml                | 444 ++++++++++++++---------------
 CHANGELOG.md                       |   1 +
 example/json.dart                  |   4 +-
 lib/src/core/response_context.dart |   5 +-
 lib/src/core/server.dart           |   2 +-
 lib/src/http/angel_http.dart       |   4 +-
 pubspec.yaml                       |   1 +
 test/controller_test.dart          |   8 +-
 test/di_test.dart                  |   9 +-
 test/encoders_buffer_test.dart     |  12 +-
 test/parameter_meta_test.dart      |   1 +
 12 files changed, 253 insertions(+), 246 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 61931626..e74764aa 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -121,6 +121,13 @@
             </list>
           </value>
         </entry>
+        <entry key="dart2_constant">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="front_end">
           <value>
             <list>
@@ -463,6 +470,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2+2/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f9ebb579..ef48d400 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Update example">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/main.dart" afterPath="$PROJECT_DIR$/example/main.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/server.dart" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,7 +39,7 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="203">
+            <state relative-caret-position="0">
               <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
@@ -39,11 +48,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="324">
+              <first_editor relative-caret-position="750">
                 <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
                 <folding>
                   <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
@@ -54,11 +63,45 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="338">
+              <caret line="51" column="28" lean-forward="false" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
+              <folding>
+                <element signature="e#0#17#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="152">
+              <caret line="68" column="35" lean-forward="false" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="35" />
+              <folding>
+                <element signature="e#0#17#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="45">
+              <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="158">
-              <caret line="40" column="0" lean-forward="true" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
+            <state relative-caret-position="330">
+              <caret line="22" column="46" lean-forward="false" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -66,12 +109,12 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="15">
-                <caret line="1" column="47" lean-forward="false" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
+              <first_editor relative-caret-position="30">
+                <caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
                 <folding />
               </first_editor>
               <second_editor />
@@ -82,8 +125,8 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="188">
-              <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
+            <state relative-caret-position="107">
+              <caret line="149" column="6" lean-forward="false" selection-start-line="149" selection-start-column="6" selection-end-line="149" selection-end-column="6" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -91,31 +134,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="51" column="8" lean-forward="false" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="281">
-              <caret line="84" column="0" lean-forward="true" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="15" lean-forward="true" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
+              <caret line="26" column="64" lean-forward="false" selection-start-line="26" selection-start-column="64" selection-end-line="26" selection-end-column="64" />
               <folding />
             </state>
           </provider>
@@ -133,7 +156,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>HttpHeaders</find>
       <find>ContentType</find>
       <find>app</find>
       <find>handleRe</find>
@@ -163,6 +185,7 @@
       <find>hey</find>
       <find>match</find>
       <find>getV</find>
+      <find>zone</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -232,11 +255,9 @@
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
@@ -244,31 +265,33 @@
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -279,8 +302,8 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="73" />
-    <option name="y" value="25" />
+    <option name="x" value="39" />
+    <option name="y" value="23" />
     <option name="width" value="1360" />
     <option name="height" value="797" />
   </component>
@@ -302,6 +325,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="AndroidView" />
+      <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
       <pane id="Scratches" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -310,50 +336,10 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="example" type="cbb8eebc:String" user="example" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="stats" type="cbb8eebc:String" user="stats" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -394,7 +380,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.injects session or throws in parameter_meta_test.dart">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -700,14 +686,8 @@
       <workItem from="1517332581856" duration="858000" />
       <workItem from="1517973177718" duration="9736000" />
       <workItem from="1522434729364" duration="100000" />
-      <workItem from="1523041434716" duration="3129000" />
-    </task>
-    <task id="LOCAL-00030" summary="1.0.9+1">
-      <created>1503934167188</created>
-      <option name="number" value="00030" />
-      <option name="presentableId" value="LOCAL-00030" />
-      <option name="project" value="LOCAL" />
-      <updated>1503934167188</updated>
+      <workItem from="1523041434716" duration="3254000" />
+      <workItem from="1526435792950" duration="514000" />
     </task>
     <task id="LOCAL-00031" summary="1.1.0-alpha start">
       <created>1506055702294</created>
@@ -1045,18 +1025,25 @@
       <option name="project" value="LOCAL" />
       <updated>1523043988632</updated>
     </task>
-    <option name="localTasksCounter" value="79" />
+    <task id="LOCAL-00079" summary="Update example">
+      <created>1523044574359</created>
+      <option name="number" value="00079" />
+      <option name="presentableId" value="LOCAL-00079" />
+      <option name="project" value="LOCAL" />
+      <updated>1523044574359</updated>
+    </task>
+    <option name="localTasksCounter" value="80" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 38m 29s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.05.15 at 21h 56m 41s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 39m 23s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.05.15 at 21h 57m 16s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 39m 28s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.05.15 at 22h 00m 17s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
     <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 39m 59s.xml">
       <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
@@ -1081,7 +1068,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="131001000" />
+    <option name="totallyTimeSpent" value="131640000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1093,40 +1080,40 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="73" y="25" width="1360" height="797" extended-state="0" />
+    <frame x="39" y="23" width="1360" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1140,7 +1127,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Angel._flattened is now accessible via `optimizedRouter`" />
     <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
     <MESSAGE value="Deprecated all serving logic in `Angel`" />
     <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
@@ -1165,7 +1151,8 @@
     <MESSAGE value="Bring back zones; mysterious hang" />
     <MESSAGE value="Fixed tests" />
     <MESSAGE value="CHANGELOG" />
-    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG" />
+    <MESSAGE value="Update example" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update example" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1174,13 +1161,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="62" column="32" lean-forward="false" selection-start-line="62" selection-start-column="32" selection-end-line="62" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="276">
@@ -1224,13 +1204,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="29" column="36" lean-forward="true" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
@@ -1266,20 +1239,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="94" column="27" lean-forward="true" selection-start-line="94" selection-start-column="27" selection-end-line="94" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
@@ -1316,13 +1275,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="54" lean-forward="true" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
@@ -1351,13 +1303,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="32" lean-forward="true" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -1407,28 +1352,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="24" lean-forward="true" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="18" column="50" lean-forward="true" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
-          <folding>
-            <element signature="e#100#120#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1188">
-          <caret line="489" column="25" lean-forward="true" selection-start-line="489" selection-start-column="25" selection-end-line="490" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1436,7 +1363,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="318">
           <caret line="99" column="11" lean-forward="false" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1444,7 +1370,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
           <caret line="4" column="16" lean-forward="true" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1452,7 +1377,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="131">
           <caret line="659" column="12" lean-forward="false" selection-start-line="659" selection-start-column="12" selection-end-line="659" selection-end-column="12" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1460,58 +1384,20 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="389">
           <caret line="222" column="19" lean-forward="false" selection-start-line="222" selection-start-column="19" selection-end-line="222" selection-end-column="19" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
-          <caret line="2" column="15" lean-forward="true" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="40" column="0" lean-forward="true" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="15">
-            <caret line="1" column="47" lean-forward="false" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="51" column="8" lean-forward="false" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="84" column="0" lean-forward="true" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+          <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
+        <state relative-caret-position="0">
           <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
           <folding>
             <element signature="e#39#59#0" expanded="true" />
@@ -1523,14 +1409,83 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
           <caret line="25" column="18" lean-forward="true" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="546" column="50" lean-forward="true" selection-start-line="546" selection-start-column="50" selection-end-line="546" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="281">
+          <caret line="26" column="64" lean-forward="false" selection-start-line="26" selection-start-column="64" selection-end-line="26" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="74" column="47" lean-forward="true" selection-start-line="74" selection-start-column="47" selection-end-line="74" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="68" column="0" lean-forward="true" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" />
+        <state relative-caret-position="107">
+          <caret line="149" column="6" lean-forward="false" selection-start-line="149" selection-start-column="6" selection-end-line="149" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="406" column="11" lean-forward="false" selection-start-line="406" selection-start-column="11" selection-end-line="406" selection-end-column="11" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="22" column="46" lean-forward="false" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="302">
+          <caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1540,7 +1495,7 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="324">
+          <first_editor relative-caret-position="750">
             <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
             <folding>
               <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
@@ -1550,6 +1505,45 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="338">
+          <caret line="51" column="28" lean-forward="false" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="68" column="35" lean-forward="false" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="30">
+            <caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ad1cde5..8dad1665 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 1.1.3
 * `AngelHttp` now handles requests in a `Zone`.
+* Use `package:dart2_constant`.
 
 # 1.1.2
 * `MapService` will store `created_at` and `updated_at` as `String`.
diff --git a/example/json.dart b/example/json.dart
index 81e33562..1ab77456 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
+import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
@@ -41,7 +41,7 @@ serverMain(_) async {
   // Performance tuning
   app
     ..lazyParseBodies = true
-    ..serializer = JSON.encode;
+    ..serializer = json.encode;
 
   app.errorHandler = (e, req, res) {
     print(e.message ?? e.error ?? e);
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index b1ce733d..cf4bddac 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -1,8 +1,9 @@
 library angel_framework.http.response_context;
 
 import 'dart:async';
-import 'dart:convert';
+import 'dart:convert' show Converter, Encoding;
 import 'dart:io';
+import 'package:dart2_constant/convert.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
@@ -362,7 +363,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
   /// Writes data to the response.
   void write(value, {Encoding encoding}) {
-    encoding ??= UTF8;
+    encoding ??= utf8;
 
     if (!isOpen && !streaming)
       throw closed();
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index defe87d9..6666a2d0 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -519,7 +519,7 @@ class Angel extends AngelBase {
     var app = new Angel();
 
     app._http =
-        new AngelHttp.custom(app, (InternetAddress address, int port) async {
+        new AngelHttp.custom(app, (address, int port) async {
       return await HttpServer.bindSecure(address, port, context);
     });
 
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index f1fc7c6d..009740c5 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -39,7 +39,7 @@ class AngelHttp {
   factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context) {
     var http = new AngelHttp(app);
 
-    http._serverGenerator = (InternetAddress address, int port) async {
+    http._serverGenerator = (address, int port) async {
       return await HttpServer.bindSecure(address, port, context);
     };
 
@@ -150,7 +150,7 @@ class AngelHttp {
     );
 
     var zone = Zone.current.fork(specification: zoneSpec);
-    return await zone.runGuarded(() async {
+    return await zone.run(() async {
       var path = req.path;
       if (path == '/') path = '';
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 257a3f47..1768db77 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,6 +13,7 @@ dependencies:
   charcode: ^1.0.0
   combinator: ">=1.0.0-beta <2.0.0"
   container: ^0.1.2
+  dart2_constant: ^1.0.0
   json_god: ^2.0.0-beta
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 5a8d23a0..081eb5a1 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -93,8 +93,8 @@ main() {
         }, optional: ['bar']));
     var rq = new MockHttpRequest('GET', new Uri(path: 'foo'));
     await new AngelHttp(app).handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
-    expect(JSON.decode(body), 2);
+    var body = await rq.response.transform(utf8.decoder).join();
+    expect(json.decode(body), 2);
   });
 
   test('optional name', () async {
@@ -110,7 +110,7 @@ main() {
 
     expect(rgx.firstMatch(response.body)?.start, equals(0));
 
-    Map todo = JSON.decode(response.body.replaceAll(rgx, ""));
+    Map todo = json.decode(response.body.replaceAll(rgx, ""));
     print("Todo: $todo");
     // expect(todo.keys.length, equals(3));
     expect(todo['text'], equals("Hello"));
diff --git a/test/di_test.dart b/test/di_test.dart
index 793d887d..9f5d27e9 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,6 +1,6 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 import 'common.dart';
@@ -49,19 +49,19 @@ main() {
 
   test("make in route", () async {
     var response = await client.get("$url/errands3");
-    String text = await JSON.decode(response.body);
+    String text = await json.decode(response.body);
     expect(text, equals(TEXT));
   });
 
   test("make in controller", () async {
     var response = await client.get("$url/errands4");
-    String text = await JSON.decode(response.body);
+    String text = await json.decode(response.body);
     expect(text, equals(TEXT));
   });
 }
 
 void validateTodoSingleton(response) {
-  Map todo = JSON.decode(response.body);
+  Map todo = json.decode(response.body);
   // expect(todo.keys.length, equals(3));
   expect(todo["id"], equals(null));
   expect(todo["text"], equals(TEXT));
@@ -84,6 +84,7 @@ class ErrandController extends Controller {
 
 class Errand {
   Todo todo;
+
   String get text => todo.text;
 
   Errand(this.todo);
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index be44c15b..cdda8179 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,6 +1,6 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -41,7 +41,7 @@ void encodingTests(Angel getApp()) {
       var rs = rq.response;
       await http.handleRequest(rq);
 
-      var body = await rs.transform(UTF8.decoder).join();
+      var body = await rs.transform(utf8.decoder).join();
       expect(body, 'Hello, world!');
     });
 
@@ -54,7 +54,7 @@ void encodingTests(Angel getApp()) {
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
-      expect(body, ZLIB.encode(UTF8.encode('Hello, world!')));
+      expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
     });
 
     test('encodes if wildcard + multiple', () async {
@@ -66,7 +66,7 @@ void encodingTests(Angel getApp()) {
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
-      expect(body, ZLIB.encode(UTF8.encode('Hello, world!')));
+      expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
     });
 
     test('encodes if explicit', () async {
@@ -78,7 +78,7 @@ void encodingTests(Angel getApp()) {
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
-      expect(body, GZIP.encode(UTF8.encode('Hello, world!')));
+      expect(body, GZIP.encode(utf8.encode('Hello, world!')));
     });
 
     test('only uses one encoder', () async {
@@ -90,7 +90,7 @@ void encodingTests(Angel getApp()) {
 
       var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
-      expect(body, GZIP.encode(UTF8.encode('Hello, world!')));
+      expect(body, GZIP.encode(utf8.encode('Hello, world!')));
     });
   });
 }
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 546be9ac..198cd2d8 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -79,6 +79,7 @@ main() {
     print('Body: $body');
     expect(rs.statusCode, 200);
     expect(body, JSON.encode('bar'));
+    print('done');
   });
 
   test('injects session or throws', () async {

From 50e6d0d1a3dc70bde641cef7fb636c277818859a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 15 May 2018 22:40:57 -0400
Subject: [PATCH 201/414] Use dart2_constant

---
 ..._or_throws_in_parameter_meta_test_dart.xml |   8 +
 .idea/workspace.xml                           | 275 ++++++++----------
 lib/src/http/angel_http.dart                  |   4 +-
 3 files changed, 139 insertions(+), 148 deletions(-)
 create mode 100644 .idea/runConfigurations/injects_header_or_throws_in_parameter_meta_test_dart.xml

diff --git a/.idea/runConfigurations/injects_header_or_throws_in_parameter_meta_test_dart.xml b/.idea/runConfigurations/injects_header_or_throws_in_parameter_meta_test_dart.xml
new file mode 100644
index 00000000..92114127
--- /dev/null
+++ b/.idea/runConfigurations/injects_header_or_throws_in_parameter_meta_test_dart.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="injects header or throws in parameter_meta_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="injects header or throws" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ef48d400..513c70c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/injects_header_or_throws_in_parameter_meta_test_dart.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CHANGELOG.md" afterPath="$PROJECT_DIR$/CHANGELOG.md" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/example/json.dart" afterPath="$PROJECT_DIR$/example/json.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/core/server.dart" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/controller_test.dart" afterPath="$PROJECT_DIR$/test/controller_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/di_test.dart" afterPath="$PROJECT_DIR$/test/di_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -100,8 +92,8 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="22" column="46" lean-forward="false" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
+            <state relative-caret-position="345">
+              <caret line="23" column="20" lean-forward="true" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -109,24 +101,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="30">
-                <caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
-                <folding />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="107">
-              <caret line="149" column="6" lean-forward="false" selection-start-line="149" selection-start-column="6" selection-end-line="149" selection-end-column="6" />
+            <state relative-caret-position="101">
+              <caret line="188" column="44" lean-forward="true" selection-start-line="188" selection-start-column="44" selection-end-line="188" selection-end-column="44" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -156,8 +135,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>ContentType</find>
-      <find>app</find>
       <find>handleRe</find>
       <find>instead.</find>
       <find>io\b</find>
@@ -186,6 +163,8 @@
       <find>match</find>
       <find>getV</find>
       <find>zone</find>
+      <find>zone.run</find>
+      <find>aaa</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -221,8 +200,8 @@
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
-      <dir>$PROJECT_DIR$/lib</dir>
       <dir>$PROJECT_DIR$/test</dir>
+      <dir>$PROJECT_DIR$/lib</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -283,8 +262,6 @@
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
@@ -292,6 +269,8 @@
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -336,6 +315,11 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -380,7 +364,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -507,11 +491,6 @@
       <option name="testName" value="global injection added to injection map" />
       <option name="testRunnerOptions" value="-j 4" />
     </configuration>
-    <configuration name="injects header or throws in parameter_meta_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
-      <option name="filePath" value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
-      <option name="testName" value="injects header or throws" />
-    </configuration>
     <configuration name="middleware in controller_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/controller_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -576,41 +555,41 @@
       <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
       <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
       <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Test.tests in extension_test.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.middleware in controller_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="29" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="30" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="31" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="32" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="33" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="34" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="35" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="36" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="37" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
-      <item index="38" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
-      <item index="39" class="java.lang.String" itemvalue="Dart Command Line App.main.dart" />
+      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.main.dart" />
+      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in extension_test.dart" />
+      <item index="7" class="java.lang.String" itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
+      <item index="8" class="java.lang.String" itemvalue="Dart Test.middleware in controller_test.dart" />
+      <item index="9" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
+      <item index="10" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
+      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
+      <item index="12" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
+      <item index="13" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item index="14" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item index="15" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
+      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item index="20" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
+      <item index="21" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item index="22" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item index="24" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
+      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item index="27" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
+      <item index="28" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item index="29" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item index="30" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item index="31" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
+      <item index="32" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
+      <item index="33" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
+      <item index="34" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
+      <item index="35" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item index="36" class="java.lang.String" itemvalue="Dart Test.All Tests" />
+      <item index="37" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item index="38" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+      <item index="39" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
       <item index="40" class="java.lang.String" itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
     </list>
   </component>
@@ -687,14 +666,7 @@
       <workItem from="1517973177718" duration="9736000" />
       <workItem from="1522434729364" duration="100000" />
       <workItem from="1523041434716" duration="3254000" />
-      <workItem from="1526435792950" duration="514000" />
-    </task>
-    <task id="LOCAL-00031" summary="1.1.0-alpha start">
-      <created>1506055702294</created>
-      <option name="number" value="00031" />
-      <option name="presentableId" value="LOCAL-00031" />
-      <option name="project" value="LOCAL" />
-      <updated>1506055702294</updated>
+      <workItem from="1526435792950" duration="2628000" />
     </task>
     <task id="LOCAL-00032" summary="1.1.0-alpha">
       <created>1506089003709</created>
@@ -1032,43 +1004,50 @@
       <option name="project" value="LOCAL" />
       <updated>1523044574359</updated>
     </task>
-    <option name="localTasksCounter" value="80" />
+    <task id="LOCAL-00080" summary="Use dart2_constant">
+      <created>1526436313662</created>
+      <option name="number" value="00080" />
+      <option name="presentableId" value="LOCAL-00080" />
+      <option name="project" value="LOCAL" />
+      <updated>1526436313662</updated>
+    </task>
+    <option name="localTasksCounter" value="81" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.05.15 at 21h 56m 41s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 23m 35s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.05.15 at 21h 57m 16s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 26m 28s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.05.15 at 22h 00m 17s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 28m 19s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 39m 59s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 29m 32s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 41m 13s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 29m 46s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 42m 12s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 31m 10s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 45m 10s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 31m 39s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 45m 20s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 32m 26s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 45m 48s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 35m 07s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_session_or_throws_in_parameter_meta_test_dart - 2018.04.06 at 15h 49m 39s.xml">
-      <configuration name="injects session or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 35m 16s.xml">
+      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="131640000" />
+    <option name="totallyTimeSpent" value="133754000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1087,7 +1066,7 @@
       <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1102,10 +1081,11 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1116,7 +1096,6 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1127,7 +1106,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Used function syntax, deprecated `ResponseSerializer` typedef" />
     <MESSAGE value="Deprecated all serving logic in `Angel`" />
     <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
     <MESSAGE value="Deprecated createZoneForRequest" />
@@ -1152,7 +1130,8 @@
     <MESSAGE value="Fixed tests" />
     <MESSAGE value="CHANGELOG" />
     <MESSAGE value="Update example" />
-    <option name="LAST_COMMIT_MESSAGE" value="Update example" />
+    <MESSAGE value="Use dart2_constant" />
+    <option name="LAST_COMMIT_MESSAGE" value="Use dart2_constant" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1161,13 +1140,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="103" column="25" lean-forward="false" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/common.dart" />
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1363,6 +1335,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="318">
           <caret line="99" column="11" lean-forward="false" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1412,14 +1385,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="546" column="50" lean-forward="true" selection-start-line="546" selection-start-column="50" selection-end-line="546" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="281">
@@ -1436,16 +1401,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="107">
-          <caret line="149" column="6" lean-forward="false" selection-start-line="149" selection-start-column="6" selection-end-line="149" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="131">
@@ -1454,16 +1409,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="46" lean-forward="false" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -1477,7 +1422,7 @@
         <state relative-caret-position="302">
           <caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1487,7 +1432,7 @@
         <state relative-caret-position="151">
           <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1536,14 +1481,50 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="30">
-            <caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
+          <first_editor relative-caret-position="255">
+            <caret line="15" column="66" lean-forward="false" selection-start-line="15" selection-start-column="66" selection-end-line="15" selection-end-column="66" />
             <folding />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="345">
+          <caret line="23" column="20" lean-forward="true" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/io/io_sink.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="106">
+          <caret line="77" column="5" lean-forward="true" selection-start-line="77" selection-start-column="5" selection-end-line="77" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="10" column="61" lean-forward="true" selection-start-line="10" selection-start-column="61" selection-end-line="10" selection-end-column="61" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="101">
+          <caret line="188" column="44" lean-forward="true" selection-start-line="188" selection-start-column="44" selection-end-line="188" selection-end-column="44" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 009740c5..31b8a6e8 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -150,6 +150,7 @@ class AngelHttp {
     );
 
     var zone = Zone.current.fork(specification: zoneSpec);
+
     return await zone.run(() async {
       var path = req.path;
       if (path == '/') path = '';
@@ -276,7 +277,8 @@ class AngelHttp {
       ..add(outputBuffer);
 
     return finalizers.then((_) async {
-      request.response.close();
+      await request.response.flush();
+      await request.response.close();
 
       if (req.injections.containsKey(PoolResource)) {
         req.injections[PoolResource].release();

From cf796044bfa8d76bc08f38fafe3ed2eb326e65d0 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 15 May 2018 23:14:29 -0400
Subject: [PATCH 202/414] Fixed all broken tests

---
 .idea/libraries/Dart_Packages.xml | 116 ++++----
 .idea/workspace.xml               | 451 ++++++++++++++++--------------
 .travis.yml                       |   2 +
 lib/src/http/angel_http.dart      |   2 +
 test/encoders_buffer_test.dart    |  18 +-
 test/parameter_meta_test.dart     |  25 +-
 test/server_test.dart             |   9 +-
 7 files changed, 339 insertions(+), 284 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index e74764aa..ad9897bb 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,7 +5,7 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.1/lib" />
             </list>
           </value>
         </entry>
@@ -33,35 +33,35 @@
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.3.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="async">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="barback">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+14/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+16/lib" />
             </list>
           </value>
         </entry>
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="boolean_selector">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
             </list>
           </value>
         </entry>
@@ -82,7 +82,7 @@
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.9/lib" />
             </list>
           </value>
         </entry>
@@ -110,14 +110,14 @@
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.2+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
             </list>
           </value>
         </entry>
@@ -131,7 +131,7 @@
         <entry key="front_end">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.9/lib" />
             </list>
           </value>
         </entry>
@@ -145,7 +145,7 @@
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
             </list>
           </value>
         </entry>
@@ -166,14 +166,14 @@
         <entry key="http_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_server">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
             </list>
           </value>
         </entry>
@@ -208,7 +208,7 @@
         <entry key="kernel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.9/lib" />
             </list>
           </value>
         </entry>
@@ -222,7 +222,7 @@
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.1+4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
             </list>
           </value>
         </entry>
@@ -236,21 +236,21 @@
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="mock_request">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib" />
             </list>
           </value>
         </entry>
@@ -264,7 +264,7 @@
         <entry key="node_preamble">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
             </list>
           </value>
         </entry>
@@ -306,7 +306,7 @@
         <entry key="pub_semver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
             </list>
           </value>
         </entry>
@@ -327,7 +327,7 @@
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
             </list>
           </value>
         </entry>
@@ -348,7 +348,7 @@
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+1/lib" />
             </list>
           </value>
         </entry>
@@ -362,7 +362,7 @@
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
             </list>
           </value>
         </entry>
@@ -376,14 +376,14 @@
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
             </list>
           </value>
         </entry>
@@ -404,7 +404,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.30+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib" />
             </list>
           </value>
         </entry>
@@ -425,21 +425,21 @@
         <entry key="utf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
             </list>
           </value>
         </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
             </list>
           </value>
         </entry>
@@ -453,69 +453,69 @@
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.30.0+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.3.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-1.13.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+14/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+16/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.2+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.4.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.2+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.1+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.3.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.30+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
     </CLASSES>
     <JAVADOC />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 513c70c2..615a333c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/runConfigurations/injects_header_or_throws_in_parameter_meta_test_dart.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Fixed all broken tests">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.travis.yml" afterPath="$PROJECT_DIR$/.travis.yml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -28,40 +31,25 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
+            <state relative-caret-position="86">
+              <caret line="65" column="19" lean-forward="true" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
               <folding>
-                <element signature="e#39#59#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="750">
-                <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
-                <folding>
-                  <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
-                </folding>
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <file leaf-file-name="response.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="338">
-              <caret line="51" column="28" lean-forward="false" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
+            <state relative-caret-position="851">
+              <caret line="95" column="20" lean-forward="false" selection-start-line="95" selection-start-column="20" selection-end-line="95" selection-end-column="20" />
               <folding>
-                <element signature="e#0#17#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -70,42 +58,8 @@
       <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
-              <caret line="68" column="35" lean-forward="false" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="35" />
-              <folding>
-                <element signature="e#0#17#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="23" column="20" lean-forward="true" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="101">
-              <caret line="188" column="44" lean-forward="true" selection-start-line="188" selection-start-column="44" selection-end-line="188" selection-end-column="44" />
+            <state relative-caret-position="225">
+              <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -116,8 +70,70 @@
       <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="281">
-              <caret line="26" column="64" lean-forward="false" selection-start-line="26" selection-start-column="64" selection-end-line="26" selection-end-column="64" />
+            <state relative-caret-position="131">
+              <caret line="26" column="65" lean-forward="true" selection-start-line="26" selection-start-column="65" selection-end-line="26" selection-end-column="65" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="196">
+              <caret line="120" column="26" lean-forward="false" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="176">
+              <caret line="201" column="37" lean-forward="false" selection-start-line="201" selection-start-column="37" selection-end-line="201" selection-end-column="37" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.lock" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.lock">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.travis.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="30">
+              <caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -135,9 +151,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>handleRe</find>
-      <find>instead.</find>
-      <find>io\b</find>
       <find>_isOpen</find>
       <find>_isClosed</find>
       <find>end</find>
@@ -155,7 +168,6 @@
       <find>error</find>
       <find>trace</find>
       <find>zonesp</find>
-      <find>close(</find>
       <find>runGuar</find>
       <find>unca</find>
       <find>async</find>
@@ -165,6 +177,10 @@
       <find>zone</find>
       <find>zone.run</find>
       <find>aaa</find>
+      <find>close(</find>
+      <find>statusCode</find>
+      <find>.run</find>
+      <find>var body = await rs.fold&lt;List&lt;int&gt;&gt;([], (out, list) =&gt; []..addAll(list));</find>
     </findStrings>
     <replaceStrings>
       <replace>_isClosed</replace>
@@ -194,6 +210,7 @@
       <replace>!isOpen</replace>
       <replace>'server'</replace>
       <replace>FutureOr</replace>
+      <replace>var body = await getBody(rs);</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -220,8 +237,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/metrics.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
@@ -242,7 +257,6 @@
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
@@ -266,11 +280,14 @@
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/.travis.yml" />
       </list>
     </option>
   </component>
@@ -305,9 +322,9 @@
     </navigator>
     <panes>
       <pane id="AndroidView" />
-      <pane id="ProjectPane" />
       <pane id="PackagesPane" />
       <pane id="Scratches" />
+      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -318,7 +335,7 @@
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="tool" type="cbb8eebc:String" user="tool" />
             </path>
           </expand>
           <select />
@@ -364,7 +381,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -491,6 +508,11 @@
       <option name="testName" value="global injection added to injection map" />
       <option name="testRunnerOptions" value="-j 4" />
     </configuration>
+    <configuration name="handleAngelHttpException in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" temporary="true" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="handleAngelHttpException" />
+    </configuration>
     <configuration name="middleware in controller_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/controller_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -549,7 +571,7 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="41">
+    <list size="42">
       <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
       <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
       <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
@@ -591,7 +613,13 @@
       <item index="38" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
       <item index="39" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
       <item index="40" class="java.lang.String" itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
+      <item index="41" class="java.lang.String" itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
     </list>
+    <recent_temporary>
+      <list size="1">
+        <item index="0" class="java.lang.String" itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
@@ -666,14 +694,8 @@
       <workItem from="1517973177718" duration="9736000" />
       <workItem from="1522434729364" duration="100000" />
       <workItem from="1523041434716" duration="3254000" />
-      <workItem from="1526435792950" duration="2628000" />
-    </task>
-    <task id="LOCAL-00032" summary="1.1.0-alpha">
-      <created>1506089003709</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1506089003709</updated>
+      <workItem from="1526435792950" duration="2668000" />
+      <workItem from="1526439485584" duration="979000" />
     </task>
     <task id="LOCAL-00033" summary="pubspec">
       <created>1506089080836</created>
@@ -1011,43 +1033,50 @@
       <option name="project" value="LOCAL" />
       <updated>1526436313662</updated>
     </task>
-    <option name="localTasksCounter" value="81" />
+    <task id="LOCAL-00081" summary="Use dart2_constant">
+      <created>1526438457813</created>
+      <option name="number" value="00081" />
+      <option name="presentableId" value="LOCAL-00081" />
+      <option name="project" value="LOCAL" />
+      <updated>1526438457813</updated>
+    </task>
+    <option name="localTasksCounter" value="82" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 23m 35s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.05.15 at 23h 10m 38s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 26m 28s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.05.15 at 23h 13m 46s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 28m 19s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 09m 49s.xml">
+      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 29m 32s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 09m 58s.xml">
+      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 29m 46s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 08s.xml">
+      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 31m 10s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 12s.xml">
+      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 31m 39s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 16s.xml">
+      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 32m 26s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 11m 21s.xml">
+      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 35m 07s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_encoders_buffer_test_dart - 2018.05.15 at 23h 11m 31s.xml">
+      <configuration name="tests in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="injects_header_or_throws_in_parameter_meta_test_dart - 2018.05.15 at 22h 35m 16s.xml">
-      <configuration name="injects header or throws in parameter_meta_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_encoders_buffer_test_dart - 2018.05.15 at 23h 13m 34s.xml">
+      <configuration name="tests in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="133754000" />
+    <option name="totallyTimeSpent" value="134773000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1085,7 +1114,6 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1096,6 +1124,7 @@
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1140,35 +1169,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/example/common.dart" />
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="12" column="30" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.2/lib/meta.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="201" column="50" lean-forward="false" selection-start-line="201" selection-start-column="50" selection-end-line="201" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.0.3/lib/src/body_parse_result.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="31" lean-forward="true" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/io/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="820" column="15" lean-forward="false" selection-start-line="820" selection-start-column="15" selection-end-line="820" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="420">
@@ -1310,20 +1310,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="648">
-          <caret line="118" column="34" lean-forward="false" selection-start-line="118" selection-start-column="34" selection-end-line="118" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.lock">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="239" column="16" lean-forward="true" selection-start-line="239" selection-start-column="16" selection-end-line="239" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
@@ -1335,7 +1321,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="318">
           <caret line="99" column="11" lean-forward="false" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1364,13 +1349,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
+        <state relative-caret-position="1395">
           <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
           <folding>
             <element signature="e#39#59#0" expanded="true" />
@@ -1385,35 +1369,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="281">
-          <caret line="26" column="64" lean-forward="false" selection-start-line="26" selection-start-column="64" selection-end-line="26" selection-end-column="64" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="74" column="47" lean-forward="true" selection-start-line="74" selection-start-column="47" selection-end-line="74" selection-end-column="47" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="131">
           <caret line="406" column="11" lean-forward="false" selection-start-line="406" selection-start-column="11" selection-end-line="406" selection-end-column="11" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="18" lean-forward="true" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1440,7 +1399,7 @@
     <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="750">
+          <first_editor relative-caret-position="660">
             <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
             <folding>
               <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
@@ -1452,7 +1411,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
+        <state relative-caret-position="765">
           <caret line="51" column="28" lean-forward="false" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
@@ -1460,19 +1419,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="68" column="35" lean-forward="false" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="35" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
+        <state relative-caret-position="0">
           <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
           <folding />
         </state>
@@ -1489,16 +1438,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="20" lean-forward="true" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/io/io_sink.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="106">
@@ -1515,16 +1454,118 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="101">
-          <caret line="188" column="44" lean-forward="true" selection-start-line="188" selection-start-column="44" selection-end-line="188" selection-end-column="44" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="851">
+          <caret line="95" column="20" lean-forward="false" selection-start-line="95" selection-start-column="20" selection-end-line="95" selection-end-column="20" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="26" column="65" lean-forward="true" selection-start-line="26" selection-start-column="65" selection-end-line="26" selection-end-column="65" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="58" column="25" lean-forward="true" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="191">
+          <caret line="73" column="35" lean-forward="true" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/mock_request.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="19" lean-forward="false" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="86">
+          <caret line="65" column="19" lean-forward="true" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="196">
+          <caret line="120" column="26" lean-forward="false" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="201" column="37" lean-forward="false" selection-start-line="201" selection-start-column="37" selection-end-line="201" selection-end-column="37" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.lock">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/.travis.yml b/.travis.yml
index 274209f9..34a2a649 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: dart
+dart:
+  - dev
 before_script: chmod +x ./tool/travis.sh
 script: ./tool/travis.sh
\ No newline at end of file
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 31b8a6e8..3682d17d 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -118,6 +118,8 @@ class AngelHttp {
 
           if (error is FormatException) {
             e = new AngelHttpException.badRequest(message: error.message);
+          } else if (error is AngelHttpException) {
+            e = error;
           } else {
             e = new AngelHttpException(error,
                 stackTrace: stackTrace, message: error?.toString());
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index cdda8179..720cc2e4 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,9 +1,17 @@
+import 'dart:async';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
+Future<List<int>> getBody(MockHttpResponse rs) async {
+  var list = await rs.toList();
+  var bb = new BytesBuilder();
+  list.forEach(bb.add);
+  return bb.takeBytes();
+}
+
 main() {
   Angel app;
 
@@ -52,7 +60,7 @@ void encodingTests(Angel getApp()) {
       var rs = rq.response;
       await http.handleRequest(rq);
 
-      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      var body = await getBody(rs);
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
       expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
     });
@@ -64,7 +72,7 @@ void encodingTests(Angel getApp()) {
       var rs = rq.response;
       await http.handleRequest(rq);
 
-      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      var body = await getBody(rs);
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
       expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
     });
@@ -76,7 +84,7 @@ void encodingTests(Angel getApp()) {
       var rs = rq.response;
       await http.handleRequest(rq);
 
-      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      var body = await getBody(rs);
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
       expect(body, GZIP.encode(utf8.encode('Hello, world!')));
     });
@@ -87,8 +95,8 @@ void encodingTests(Angel getApp()) {
       await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
-
-      var body = await rs.fold<List<int>>([], (out, list) => []..addAll(list));
+      
+      var body = await getBody(rs);
       expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
       expect(body, GZIP.encode(utf8.encode('Hello, world!')));
     });
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 198cd2d8..ba55578c 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
 Future<String> readResponse(MockHttpResponse rs) {
-  return rs.transform(UTF8.decoder).join();
+  return rs.transform(utf8.decoder).join();
 }
 
 Future printResponse(MockHttpResponse rs) {
@@ -63,7 +63,7 @@ main() {
     // Invalid request
     var rq = new MockHttpRequest('GET', Uri.parse('/header'))..close();
     var rs = rq.response;
-    await http.handleRequest(rq);
+    http.handleRequest(rq);
 
     await printResponse(rs);
     expect(rs.statusCode, 400);
@@ -78,15 +78,14 @@ main() {
     var body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
-    expect(body, JSON.encode('bar'));
-    print('done');
+    expect(body, json.encode('bar'));
   });
 
   test('injects session or throws', () async {
     // Invalid request
     var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
     var rs = rq.response;
-    await http.handleRequest(rq).timeout(const Duration(seconds: 5)).catchError((_) => null);
+    http.handleRequest(rq).timeout(const Duration(seconds: 5)).catchError((_) => null);
 
     await printResponse(rs);
     expect(rs.statusCode, 500);
@@ -96,7 +95,7 @@ main() {
     rq.session['foo'] = 'bar';
     rq.close();
     rs = rq.response;
-    await http.handleRequest(rq);
+    http.handleRequest(rq);
 
     await printResponse(rs);
     expect(rs.statusCode, 200);
@@ -109,27 +108,27 @@ main() {
   test('pattern matching', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/match?mode=pos'))..close();
     var rs = rq.response;
-    await http.handleRequest(rq);
+    http.handleRequest(rq);
     var body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
-    expect(body, JSON.encode('YES pos'));
+    expect(body, json.encode('YES pos'));
 
     rq = new MockHttpRequest('GET', Uri.parse('/match?mode=neg'))..close();
     rs = rq.response;
-    await http.handleRequest(rq);
+    http.handleRequest(rq);
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
-    expect(body, JSON.encode('NO neg'));
+    expect(body, json.encode('NO neg'));
 
     // Fallback
     rq = new MockHttpRequest('GET', Uri.parse('/match?mode=ambi'))..close();
     rs = rq.response;
-    await http.handleRequest(rq);
+    http.handleRequest(rq);
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
-    expect(body, JSON.encode('DEFAULT ambi'));
+    expect(body, json.encode('DEFAULT ambi'));
   });
 }
diff --git a/test/server_test.dart b/test/server_test.dart
index 4e67aa47..fec73b5f 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -173,7 +173,8 @@ main() {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
         ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
       rq.close();
-      await http.handleRequest(rq);
+      http.handleRequest(rq);
+      await rq.response.toList();
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
       expect(
           rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
@@ -183,7 +184,8 @@ main() {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
         ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
       rq.close();
-      await http.handleRequest(rq);
+      http.handleRequest(rq);
+      await rq.response.toList();
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
       expect(
           rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
@@ -193,7 +195,8 @@ main() {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
       rq.headers.set(HttpHeaders.ACCEPT, ContentType.HTML.toString());
       rq.close();
-      await http.handleRequest(rq);
+      http.handleRequest(rq);
+      await rq.response.toList();
       expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
       expect(
           rq.response.headers.contentType?.mimeType, ContentType.HTML.mimeType);

From ef5a28b9561de23d6fdc0c46f03204f5cbee11d2 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 15 May 2018 23:18:03 -0400
Subject: [PATCH 203/414] 1.1.3

---
 .gitignore          |  3 +-
 .idea/workspace.xml | 99 +++++++++++++++++++--------------------------
 pubspec.yaml        |  4 +-
 3 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa1e2750..0104b702 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,4 +62,5 @@ packages
 # Include when developing application packages.
 pubspec.lock
 
-doc/api
\ No newline at end of file
+doc/api
+.dart_tool
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 615a333c..73da9b1a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Fixed all broken tests">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.travis.yml" afterPath="$PROJECT_DIR$/.travis.yml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/server_test.dart" afterPath="$PROJECT_DIR$/test/server_test.dart" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -43,18 +39,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="851">
-              <caret line="95" column="20" lean-forward="false" selection-start-line="95" selection-start-column="20" selection-end-line="95" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -119,21 +103,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="true">
+      <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/.travis.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
+            <state relative-caret-position="60">
+              <caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <state relative-caret-position="30">
+              <caret line="2" column="66" lean-forward="true" selection-start-line="2" selection-start-column="66" selection-end-line="2" selection-end-column="66" />
               <folding />
             </state>
           </provider>
@@ -237,7 +221,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
@@ -276,7 +259,6 @@
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
@@ -288,6 +270,8 @@
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/.travis.yml" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -695,14 +679,7 @@
       <workItem from="1522434729364" duration="100000" />
       <workItem from="1523041434716" duration="3254000" />
       <workItem from="1526435792950" duration="2668000" />
-      <workItem from="1526439485584" duration="979000" />
-    </task>
-    <task id="LOCAL-00033" summary="pubspec">
-      <created>1506089080836</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1506089080836</updated>
+      <workItem from="1526439485584" duration="1192000" />
     </task>
     <task id="LOCAL-00034" summary="Logging support">
       <created>1506092029287</created>
@@ -1040,7 +1017,14 @@
       <option name="project" value="LOCAL" />
       <updated>1526438457813</updated>
     </task>
-    <option name="localTasksCounter" value="82" />
+    <task id="LOCAL-00082" summary="Fixed all broken tests">
+      <created>1526440469836</created>
+      <option name="number" value="00082" />
+      <option name="presentableId" value="LOCAL-00082" />
+      <option name="project" value="LOCAL" />
+      <updated>1526440469836</updated>
+    </task>
+    <option name="localTasksCounter" value="83" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1076,7 +1060,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="134773000" />
+    <option name="totallyTimeSpent" value="134986000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1110,9 +1094,9 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -1135,7 +1119,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Deprecated all serving logic in `Angel`" />
     <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
     <MESSAGE value="Deprecated createZoneForRequest" />
     <MESSAGE value="Deprecated `ServerGenerator`" />
@@ -1160,7 +1143,8 @@
     <MESSAGE value="CHANGELOG" />
     <MESSAGE value="Update example" />
     <MESSAGE value="Use dart2_constant" />
-    <option name="LAST_COMMIT_MESSAGE" value="Use dart2_constant" />
+    <MESSAGE value="Fixed all broken tests" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed all broken tests" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1169,13 +1153,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="31" column="18" lean-forward="true" selection-start-line="31" selection-start-column="18" selection-end-line="31" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
@@ -1454,14 +1431,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="851">
@@ -1559,9 +1528,25 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="58" column="9" lean-forward="true" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
-          <caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
+          <caret line="2" column="66" lean-forward="true" selection-start-line="2" selection-start-column="66" selection-end-line="2" selection-end-column="66" />
           <folding />
         </state>
       </provider>
diff --git a/pubspec.yaml b/pubspec.yaml
index 1768db77..e9f209bb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,10 +1,10 @@
 name: angel_framework
-version: 1.1.2
+version: 1.1.3
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
-  sdk: ">=1.19.0 <2.0.0"
+  sdk: ">=1.19.0 <3.0.0"
 dependencies:
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0

From 954e8141ddb5ccbb047118b8e34cbe1d83884fa8 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 8 Jun 2018 03:06:26 -0400
Subject: [PATCH 204/414] 1.1.4

---
 .idea/libraries/Dart_Packages.xml             |    1 +
 .idea/libraries/Dart_SDK.xml                  |    1 +
 ...with_query_params_in_routing_test_dart.xml |    8 +
 .../can_fetch_data_in_services_test_dart.xml  |    9 +
 .idea/workspace.xml                           | 1265 ++++++++---------
 CHANGELOG.md                                  |    5 +
 analysis_options.yaml                         |    5 +-
 example/json.dart                             |    3 +-
 lib/hooks.dart                                |   52 +-
 lib/src/core/angel_base.dart                  |   10 +-
 lib/src/core/hooked_service.dart              |  443 ++----
 lib/src/core/injection.dart                   |    9 +-
 lib/src/core/map_service.dart                 |   91 +-
 lib/src/core/request_context.dart             |   14 +-
 lib/src/core/response_context.dart            |   31 +-
 lib/src/core/routable.dart                    |   31 +-
 lib/src/core/server.dart                      |  118 +-
 lib/src/core/service.dart                     |   81 +-
 lib/src/http/angel_http.dart                  |  298 ++--
 lib/src/http/controller.dart                  |    9 +-
 lib/src/http/http.dart                        |    4 +-
 lib/src/http/http_request_context.dart        |   18 +-
 lib/src/http/http_response_context.dart       |    7 +-
 lib/src/stats/metric_server.dart              |    6 +-
 performance/hello/main.dart                   |   13 +-
 performance/hello/raw.dart                    |    2 +-
 pubspec.yaml                                  |    4 +-
 test/encoders_buffer_test.dart                |   31 +-
 test/exception_test.dart                      |   13 +-
 test/general_test.dart                        |    4 +-
 test/parameter_meta_test.dart                 |    3 +-
 test/precontained_test.dart                   |    6 +-
 test/primitives_test.dart                     |   16 +-
 test/repeat_request_test.dart                 |    8 +-
 test/routing_test.dart                        |   34 +-
 test/server_test.dart                         |   20 +-
 test/services_test.dart                       |   15 +-
 test/streaming_test.dart                      |   15 +-
 38 files changed, 1315 insertions(+), 1388 deletions(-)
 create mode 100644 .idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml
 create mode 100644 .idea/runConfigurations/can_fetch_data_in_services_test_dart.xml

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index ad9897bb..fbbbfdf7 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -519,6 +519,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
     </CLASSES>
     <JAVADOC />
+    <LIBRARY_FILE />
     <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 2255dbd8..ed937c05 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -21,6 +21,7 @@
       <root url="file:///usr/local/opt/dart/libexec/lib/web_sql" />
     </CLASSES>
     <JAVADOC />
+    <LIBRARY_FILE />
     <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml b/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml
new file mode 100644
index 00000000..3df4dee3
--- /dev/null
+++ b/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml
@@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Match routes, even with query params in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="Match routes, even with query params" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml b/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml
new file mode 100644
index 00000000..5dbab496
--- /dev/null
+++ b/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="can fetch data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="can fetch data" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 73da9b1a..df55ab7d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,44 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/analysis_options.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/analysis_options.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/angel_base.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/angel_base.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/raw.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/raw.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,36 +62,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="86">
-              <caret line="65" column="19" lean-forward="true" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-1949">
+              <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-61">
+              <caret line="7" column="31" lean-forward="true" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="26" column="65" lean-forward="true" selection-start-line="26" selection-start-column="65" selection-end-line="26" selection-end-column="65" />
-              <folding />
+            <state relative-caret-position="243">
+              <caret line="28" column="33" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
             </state>
           </provider>
         </entry>
@@ -64,8 +92,8 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="196">
-              <caret line="120" column="26" lean-forward="false" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
+            <state relative-caret-position="363">
+              <caret line="162" column="32" lean-forward="true" selection-start-line="162" selection-start-column="32" selection-end-line="162" selection-end-column="32" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -73,52 +101,68 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="201" column="37" lean-forward="false" selection-start-line="201" selection-start-column="37" selection-end-line="201" selection-end-column="37" />
-              <folding />
+            <state relative-caret-position="115">
+              <caret line="399" column="31" lean-forward="true" selection-start-line="399" selection-start-column="31" selection-end-line="399" selection-end-column="31" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.lock" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.lock">
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="100">
+              <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="2275">
+              <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
+              <folding>
+                <element signature="e#39#59#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
-              <folding />
+            <state relative-caret-position="186">
+              <caret line="102" column="6" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
+              <folding>
+                <element signature="e#0#54#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="66" lean-forward="true" selection-start-line="2" selection-start-column="66" selection-end-line="2" selection-end-column="66" />
-              <folding />
+            <state relative-caret-position="165">
+              <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="48">
+                <caret line="3" column="63" selection-start-line="3" selection-start-column="63" selection-end-line="3" selection-end-column="63" />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -135,28 +179,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>_isOpen</find>
-      <find>_isClosed</find>
-      <find>end</find>
-      <find>isOpen</find>
-      <find>_useStream</find>
-      <find>isClosed</find>
-      <find>HttpHeaders.</find>
-      <find>= false</find>
-      <find>= true</find>
-      <find>Future</find>
-      <find>toId</find>
-      <find>createZ</find>
-      <find>default</find>
-      <find>catch</find>
-      <find>error</find>
-      <find>trace</find>
-      <find>zonesp</find>
-      <find>runGuar</find>
-      <find>unca</find>
-      <find>async</find>
-      <find>hey</find>
-      <find>match</find>
       <find>getV</find>
       <find>zone</find>
       <find>zone.run</find>
@@ -165,11 +187,30 @@
       <find>statusCode</find>
       <find>.run</find>
       <find>var body = await rs.fold&lt;List&lt;int&gt;&gt;([], (out, list) =&gt; []..addAll(list));</find>
+      <find>async =</find>
+      <find>async {</find>
+      <find>await</find>
+      <find>e read(</find>
+      <find>for (var ha</find>
+      <find>geth</find>
+      <find>pip</find>
+      <find>close</find>
+      <find>sendFile</find>
+      <find>getHan</find>
+      <find>gethandle</find>
+      <find>BANG</find>
+      <find>execute</find>
+      <find>lazyBod</find>
+      <find>lazyBody()</find>
+      <find>addRout</find>
+      <find>lazyBody</find>
+      <find>_body = nu</find>
+      <find>_body</find>
+      <find>MID</find>
+      <find>beforeIndex</find>
+      <find>read(</find>
     </findStrings>
     <replaceStrings>
-      <replace>_isClosed</replace>
-      <replace>// _printDebug</replace>
-      <replace>create</replace>
       <replace>modify</replace>
       <replace>update</replace>
       <replace>remove</replace>
@@ -195,6 +236,11 @@
       <replace>'server'</replace>
       <replace>FutureOr</replace>
       <replace>var body = await getBody(rs);</replace>
+      <replace />
+      <replace>=</replace>
+      <replace>=</replace>
+      <replace>{</replace>
+      <replace />
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -202,6 +248,7 @@
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
       <dir>$PROJECT_DIR$/test</dir>
+      <dir>$PROJECT_DIR$/lib/src/core</dir>
       <dir>$PROJECT_DIR$/lib</dir>
     </dirStrings>
   </component>
@@ -213,65 +260,60 @@
       </map>
     </option>
   </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/util/forwarded_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/forwarded_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/routable.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/map_service.dart" />
-        <option value="$PROJECT_DIR$/test/extension_test.dart" />
-        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/server.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/test/general_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
+        <option value="$PROJECT_DIR$/analysis_options.yaml" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
+        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/test/general_test.dart" />
+        <option value="$PROJECT_DIR$/test/exception_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -281,9 +323,12 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="39" />
-    <option name="y" value="23" />
+    <option name="x" value="24" />
+    <option name="y" value="22" />
     <option name="width" value="1360" />
     <option name="height" value="797" />
   </component>
@@ -292,23 +337,9 @@
   </component>
   <component name="ProjectView">
     <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -319,32 +350,36 @@
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="tool" type="cbb8eebc:String" user="tool" />
+              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="options.lastSelected" value="preferences.externalResources" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path" value="C:/Program Files (x86)/nodejs/node" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="dart.analysis.tool.window.force.activate" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
-    <property name="js.eslint.eslintPackage" value="" />
-    <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
-    <property name="settings.editor.selected.configurable" value="dart.settings" />
-    <property name="restartRequiresConfirmation" value="false" />
+    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/thosakwe/Source/Dart/framework/lib/src/http/request_context.dart" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+    <property name="dart.analysis.tool.window.force.activate" value="false" />
+    <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
+    <property name="js.eslint.eslintPackage" value="" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="nodejs_interpreter_path" value="node" />
+    <property name="options.lastSelected" value="preferences.externalResources" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.splitter.main.proportions" value="0.3" />
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/thosakwe/Source/Dart/framework/lib/src/http/request_context.dart" />
+    <property name="restartRequiresConfirmation" value="false" />
+    <property name="settings.editor.selected.configurable" value="dart.settings" />
+    <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -365,96 +400,17 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.performance::hello (PRODUCTION)">
+    <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="Can serialize function result as JSON" />
+    </configuration>
     <configuration name="Chained routes in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="Chained routes" />
     </configuration>
-    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="" />
-      <module name="" />
-      <envs />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <gulpfile />
-      <tasks />
-      <arguments />
-      <envs />
-    </configuration>
-    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
-      <method />
-    </configuration>
-    <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
-      <method />
-    </configuration>
-    <configuration default="true" type="FlutterRunConfigurationType" factoryName="Flutter">
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
-      <node-interpreter value="project" />
-      <working-dir value="" />
-      <envs />
-      <scope-kind value="ALL" />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="LLVMCommandLineRunConfigurationType" factoryName="LLVM Application" show_console_on_std_err="false" show_console_on_std_out="false">
-      <option name="VMOptions" />
-      <option name="arguments" />
-      <option name="filePath" />
-      <method />
-    </configuration>
-    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
-      <method />
-    </configuration>
-    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
-      <option name="cucumberJsArguments" value="" />
-      <option name="executablePath" />
-      <option name="filePath" />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <working-directory />
-      <pass-parent-env>true</pass-parent-env>
-      <envs />
-      <ui />
-      <extra-mocha-options />
-      <test-kind>DIRECTORY</test-kind>
-      <test-directory />
-      <recursive>false</recursive>
-      <method />
-    </configuration>
     <configuration name="can create data in services_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/services_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -492,11 +448,16 @@
       <option name="testName" value="global injection added to injection map" />
       <option name="testRunnerOptions" value="-j 4" />
     </configuration>
-    <configuration name="handleAngelHttpException in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" temporary="true" nameIsGenerated="true">
+    <configuration name="handleAngelHttpException in server_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/server_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
       <option name="testName" value="handleAngelHttpException" />
     </configuration>
+    <configuration name="listen before and after in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
+      <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
+      <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+      <option name="testName" value="listen before and after" />
+    </configuration>
     <configuration name="middleware in controller_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/controller_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -555,58 +516,86 @@
       <option name="filePath" value="$PROJECT_DIR$/test/typed_service_test.dart" />
       <option name="testName" value="typed_service_test.dart" />
     </configuration>
-    <list size="42">
-      <item index="0" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (DEV)" />
-      <item index="1" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
-      <item index="2" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item index="3" class="java.lang.String" itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
-      <item index="4" class="java.lang.String" itemvalue="Dart Command Line App.performance::hello::raw" />
-      <item index="5" class="java.lang.String" itemvalue="Dart Command Line App.main.dart" />
-      <item index="6" class="java.lang.String" itemvalue="Dart Test.tests in extension_test.dart" />
-      <item index="7" class="java.lang.String" itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
-      <item index="8" class="java.lang.String" itemvalue="Dart Test.middleware in controller_test.dart" />
-      <item index="9" class="java.lang.String" itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
-      <item index="10" class="java.lang.String" itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
-      <item index="11" class="java.lang.String" itemvalue="Dart Test.tests in parameter_meta_test.dart" />
-      <item index="12" class="java.lang.String" itemvalue="Dart Test.Chained routes in routing_test.dart" />
-      <item index="13" class="java.lang.String" itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
-      <item index="14" class="java.lang.String" itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
-      <item index="15" class="java.lang.String" itemvalue="Dart Test.can send html in server_test.dart" />
-      <item index="16" class="java.lang.String" itemvalue="Dart Test.tests in primitives_test.dart" />
-      <item index="17" class="java.lang.String" itemvalue="Dart Test.tests in repeat_request_test.dart" />
-      <item index="18" class="java.lang.String" itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
-      <item index="19" class="java.lang.String" itemvalue="Dart Test.tests in streaming_test.dart" />
-      <item index="20" class="java.lang.String" itemvalue="Dart Test.can create data in services_test.dart" />
-      <item index="21" class="java.lang.String" itemvalue="Dart Test.can delete data in services_test.dart" />
-      <item index="22" class="java.lang.String" itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
-      <item index="23" class="java.lang.String" itemvalue="Dart Test.tests in accepts_test.dart" />
-      <item index="24" class="java.lang.String" itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
-      <item index="25" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart" />
-      <item index="26" class="java.lang.String" itemvalue="Dart Test.tests in anonymous_service_test.dart" />
-      <item index="27" class="java.lang.String" itemvalue="Dart Test.tests in exception_test.dart" />
-      <item index="28" class="java.lang.String" itemvalue="Dart Test.tests in typed_service_test.dart" />
-      <item index="29" class="java.lang.String" itemvalue="Dart Test.default view generator in view_generator_test.dart" />
-      <item index="30" class="java.lang.String" itemvalue="Dart Test.tests in precontained_test.dart" />
-      <item index="31" class="java.lang.String" itemvalue="Dart Test.Controller Tests" />
-      <item index="32" class="java.lang.String" itemvalue="Dart Test.DI Tests" />
-      <item index="33" class="java.lang.String" itemvalue="Dart Test.Hooked Tests" />
-      <item index="34" class="java.lang.String" itemvalue="Dart Test.Routing Tests" />
-      <item index="35" class="java.lang.String" itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
-      <item index="36" class="java.lang.String" itemvalue="Dart Test.All Tests" />
-      <item index="37" class="java.lang.String" itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item index="38" class="java.lang.String" itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
-      <item index="39" class="java.lang.String" itemvalue="Dart Test.tests in framework" />
-      <item index="40" class="java.lang.String" itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
-      <item index="41" class="java.lang.String" itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
+    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="INTERPRETER_PATH" value="C:\Windows\system32\bash.exe" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
+      <config-file value="" />
+      <node-interpreter value="project" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
+      <option name="cucumberJsArguments" value="" />
+      <option name="executablePath" />
+      <option name="filePath" />
+      <method />
+    </configuration>
+    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
+    </configuration>
+    <list>
+      <item itemvalue="Dart Test.Can serialize function result as JSON in routing_test.dart" />
+      <item itemvalue="Dart Test.Match routes, even with query params in routing_test.dart" />
+      <item itemvalue="Dart Test.listen before and after in hooked_test.dart" />
+      <item itemvalue="Dart Command Line App.performance::hello (DEV)" />
+      <item itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
+      <item itemvalue="Dart Command Line App.All Tests (for coverage)" />
+      <item itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
+      <item itemvalue="Dart Command Line App.performance::hello::raw" />
+      <item itemvalue="Dart Command Line App.main.dart" />
+      <item itemvalue="Dart Test.tests in extension_test.dart" />
+      <item itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
+      <item itemvalue="Dart Test.middleware in controller_test.dart" />
+      <item itemvalue="Dart Test.injects header or throws in parameter_meta_test.dart" />
+      <item itemvalue="Dart Test.injects session or throws in parameter_meta_test.dart" />
+      <item itemvalue="Dart Test.tests in parameter_meta_test.dart" />
+      <item itemvalue="Dart Test.Chained routes in routing_test.dart" />
+      <item itemvalue="Dart Test.only match route with matching method in routing_test.dart" />
+      <item itemvalue="Dart Test.only uses one encoder in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.can send html in server_test.dart" />
+      <item itemvalue="Dart Test.tests in primitives_test.dart" />
+      <item itemvalue="Dart Test.tests in repeat_request_test.dart" />
+      <item itemvalue="Dart Test.tests in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.tests in streaming_test.dart" />
+      <item itemvalue="Dart Test.can create data in services_test.dart" />
+      <item itemvalue="Dart Test.can delete data in services_test.dart" />
+      <item itemvalue="Dart Test.can use app.properties like members in util_test.dart" />
+      <item itemvalue="Dart Test.tests in accepts_test.dart" />
+      <item itemvalue="Dart Test.contains provider in before and after in hooked_test.dart" />
+      <item itemvalue="Dart Test.tests in server_test.dart" />
+      <item itemvalue="Dart Test.tests in anonymous_service_test.dart" />
+      <item itemvalue="Dart Test.tests in exception_test.dart" />
+      <item itemvalue="Dart Test.tests in typed_service_test.dart" />
+      <item itemvalue="Dart Test.default view generator in view_generator_test.dart" />
+      <item itemvalue="Dart Test.tests in precontained_test.dart" />
+      <item itemvalue="Dart Test.Controller Tests" />
+      <item itemvalue="Dart Test.DI Tests" />
+      <item itemvalue="Dart Test.Hooked Tests" />
+      <item itemvalue="Dart Test.Routing Tests" />
+      <item itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
+      <item itemvalue="Dart Test.All Tests" />
+      <item itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
+      <item itemvalue="Dart Test.tests in framework" />
+      <item itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
+      <item itemvalue="Dart Test.can fetch data in services_test.dart" />
     </list>
-    <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
-      </list>
-    </recent_temporary>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
+  <component name="SvnConfiguration">
+    <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -679,14 +668,9 @@
       <workItem from="1522434729364" duration="100000" />
       <workItem from="1523041434716" duration="3254000" />
       <workItem from="1526435792950" duration="2668000" />
-      <workItem from="1526439485584" duration="1192000" />
-    </task>
-    <task id="LOCAL-00034" summary="Logging support">
-      <created>1506092029287</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1506092029287</updated>
+      <workItem from="1526439485584" duration="1904000" />
+      <workItem from="1528385352077" duration="29000" />
+      <workItem from="1528432209488" duration="9138000" />
     </task>
     <task id="LOCAL-00035" summary="Updated `use`">
       <created>1506092171442</created>
@@ -1024,43 +1008,50 @@
       <option name="project" value="LOCAL" />
       <updated>1526440469836</updated>
     </task>
-    <option name="localTasksCounter" value="83" />
+    <task id="LOCAL-00083" summary="1.1.3">
+      <created>1526440683707</created>
+      <option name="number" value="00083" />
+      <option name="presentableId" value="LOCAL-00083" />
+      <option name="project" value="LOCAL" />
+      <updated>1526440683707</updated>
+    </task>
+    <option name="localTasksCounter" value="84" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.05.15 at 23h 10m 38s.xml">
+    <history-entry file="All_Tests - 2018.06.08 at 02h 50m 09s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.05.15 at 23h 13m 46s.xml">
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 00s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 19s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 29s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 53m 25s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 54m 45s.xml">
+      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.06.08 at 02h 54m 57s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 09m 49s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_delete_data_in_services_test_dart - 2018.06.08 at 02h 55m 21s.xml">
+      <configuration name="can delete data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 09m 58s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="can_delete_data_in_services_test_dart - 2018.06.08 at 02h 55m 49s.xml">
+      <configuration name="can delete data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 08s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 12s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 10m 16s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="handleAngelHttpException_in_server_test_dart - 2018.05.15 at 23h 11m 21s.xml">
-      <configuration name="handleAngelHttpException in server_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_encoders_buffer_test_dart - 2018.05.15 at 23h 11m 31s.xml">
-      <configuration name="tests in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_encoders_buffer_test_dart - 2018.05.15 at 23h 13m 34s.xml">
-      <configuration name="tests in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="All_Tests - 2018.06.08 at 02h 56m 02s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="134986000" />
+    <option name="totallyTimeSpent" value="144865000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1072,43 +1063,47 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="39" y="23" width="1360" height="797" extended-state="0" />
+    <frame x="24" y="22" width="1360" height="797" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Tool Output" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34188035" sideWeight="0.5035524" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31196582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="ANTLR Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32763532" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3233618" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4017094" sideWeight="0.4964476" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.48005697" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23141123" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32998413" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="bottom" id="Tool Output" order="7" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
+      <window_info anchor="right" id="Maven Projects" order="3" />
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31142858" />
+      <window_info anchor="right" id="Flutter Outline" order="4" />
+      <window_info id="Capture Tool" order="2" />
+      <window_info id="Designer" order="2" />
+      <window_info anchor="right" id="Database" order="3" />
+      <window_info anchor="bottom" id="ANTLR Preview" order="7" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.24962063" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info id="UI Designer" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32763532" />
+      <window_info anchor="bottom" id="Messages" order="7" visible="true" weight="0.32285714" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info id="Image Layers" order="2" />
+      <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.40142858" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.48" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23748103" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info anchor="right" id="SciView" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="3" />
+      <window_info id="Favorites" order="3" side_tool="true" />
+      <window_info anchor="right" id="Flutter Inspector" order="4" />
+      <window_info anchor="bottom" id="DB Execution Console" order="8" />
+      <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Data View" order="4" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1119,7 +1114,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Removed use of `HttpHeaders` in `Angel`" />
     <MESSAGE value="Deprecated createZoneForRequest" />
     <MESSAGE value="Deprecated `ServerGenerator`" />
     <MESSAGE value="Updated tests to use `AngelHttp` API" />
@@ -1144,297 +1138,267 @@
     <MESSAGE value="Update example" />
     <MESSAGE value="Use dart2_constant" />
     <MESSAGE value="Fixed all broken tests" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fixed all broken tests" />
+    <MESSAGE value="1.1.3" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.1.3" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="5" />
+      <option name="time" value="6" />
     </breakpoint-manager>
-    <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="20" column="36" lean-forward="true" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
+        <state relative-caret-position="64">
+          <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="29" column="31" lean-forward="true" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="33" column="0" lean-forward="true" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="12" column="55" lean-forward="false" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/request.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="108" column="9" lean-forward="false" selection-start-line="108" selection-start-column="9" selection-end-line="108" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="107" column="19" lean-forward="true" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="26" lean-forward="false" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="45" column="54" lean-forward="false" selection-start-line="45" selection-start-column="54" selection-end-line="45" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="212">
-          <caret line="231" column="35" lean-forward="false" selection-start-line="231" selection-start-column="35" selection-end-line="231" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="52" lean-forward="false" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="104" column="46" lean-forward="true" selection-start-line="104" selection-start-column="46" selection-end-line="104" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="27" lean-forward="true" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="27" lean-forward="false" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="28" lean-forward="true" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/angel_framework.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+        <state relative-caret-position="133">
+          <caret line="58" column="9" lean-forward="true" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="26" column="78" lean-forward="false" selection-start-line="26" selection-start-column="78" selection-end-line="26" selection-end-column="78" />
+        <state relative-caret-position="256">
+          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="50" lean-forward="true" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
+        <state relative-caret-position="160">
+          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="318">
-          <caret line="99" column="11" lean-forward="false" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="11" />
+        <state relative-caret-position="240">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/mock_request.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="16" lean-forward="true" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
+        <state relative-caret-position="1600">
+          <caret line="104" column="46" lean-forward="true" selection-start-line="104" selection-start-column="46" selection-end-line="104" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/future.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="659" column="12" lean-forward="false" selection-start-line="659" selection-start-column="12" selection-end-line="659" selection-end-column="12" />
-        </state>
+        <state relative-caret-position="-394" />
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/1.24.2/libexec/lib/async/zone.dart">
+    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="389">
-          <caret line="222" column="19" lean-forward="false" selection-start-line="222" selection-start-column="19" selection-end-line="222" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="15" lean-forward="false" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1395">
-          <caret line="93" column="12" lean-forward="false" selection-start-line="93" selection-start-column="12" selection-end-line="93" selection-end-column="12" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="25" column="18" lean-forward="true" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="406" column="11" lean-forward="false" selection-start-line="406" selection-start-column="11" selection-end-line="406" selection-end-column="11" />
+        <state relative-caret-position="64">
+          <caret line="4" column="25" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
+        <state relative-caret-position="131">
+          <caret line="96" column="4" selection-start-line="96" selection-start-column="4" selection-end-line="96" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="28" lean-forward="true" selection-start-column="28" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-442">
+          <caret line="137" column="29" selection-start-line="137" selection-start-column="29" selection-end-line="137" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="1" column="28" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="88" column="47" selection-start-line="88" selection-start-column="47" selection-end-line="88" selection-end-column="47" />
           <folding>
-            <element signature="e#0#20#0" expanded="false" />
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="28" selection-start-column="28" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="169">
+          <caret line="17" column="49" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="36" column="24" lean-forward="true" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
+        <state>
+          <caret column="20" selection-start-column="20" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="126" column="30" selection-start-line="126" selection-start-column="30" selection-end-line="126" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="122">
+          <caret line="58" column="26" selection-start-line="58" selection-start-column="26" selection-end-line="58" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="44" column="6" selection-start-line="44" selection-start-column="6" selection-end-line="44" selection-end-column="6" />
           <folding>
-            <element signature="e#0#20#0" expanded="false" />
+            <element signature="e#40#60#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="660">
-            <caret line="44" column="1" lean-forward="false" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
-            <folding>
-              <marker date="1523044571000" expanded="true" signature="588:1671" ph="{...}" />
-            </folding>
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="313">
+          <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" />
+          <folding>
+            <element signature="e#1#18#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+    <entry file="file:///usr/local/opt/dart/libexec/lib/_http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="765">
-          <caret line="51" column="28" lean-forward="false" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" />
+        <state relative-caret-position="154">
+          <caret line="2027" column="23" lean-forward="true" selection-start-line="2027" selection-start-column="23" selection-end-line="2027" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="15" column="27" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="43" column="52" selection-start-line="43" selection-start-column="52" selection-end-line="43" selection-end-column="52" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="3" column="46" lean-forward="false" selection-start-line="3" selection-start-column="46" selection-end-line="3" selection-end-column="46" />
-          <folding />
+        <state relative-caret-position="109">
+          <caret line="64" column="24" lean-forward="true" selection-start-line="64" selection-start-column="24" selection-end-line="64" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="255">
-            <caret line="15" column="66" lean-forward="false" selection-start-line="15" selection-start-column="66" selection-end-line="15" selection-end-column="66" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/io/io_sink.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib/src/parse_body.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="106">
-          <caret line="77" column="5" lean-forward="true" selection-start-line="77" selection-start-column="5" selection-end-line="77" selection-end-column="5" />
-          <folding />
+        <state relative-caret-position="96">
+          <caret line="14" column="29" selection-start-line="13" selection-start-column="40" selection-end-line="20" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.50.0/libexec/lib/async/zone.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="71" column="38" selection-start-line="71" selection-start-column="38" selection-end-line="71" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="79">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="179">
+          <caret line="119" column="40" selection-start-line="119" selection-start-column="40" selection-end-line="119" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/opt/dart/libexec/lib/async/async.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
-          <caret line="10" column="61" lean-forward="true" selection-start-line="10" selection-start-column="61" selection-end-line="10" selection-end-column="61" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="851">
-          <caret line="95" column="20" lean-forward="false" selection-start-line="95" selection-start-column="20" selection-end-line="95" selection-end-column="20" />
+          <caret line="29" column="27" lean-forward="true" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1443,111 +1407,138 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="26" column="65" lean-forward="true" selection-start-line="26" selection-start-column="65" selection-end-line="26" selection-end-column="65" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="58" column="25" lean-forward="true" selection-start-line="58" selection-start-column="25" selection-end-line="58" selection-end-column="25" />
-          <folding />
+        <state relative-caret-position="187">
+          <caret line="21" column="15" lean-forward="true" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="73" column="35" lean-forward="true" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" />
-          <folding />
+        <state relative-caret-position="-742">
+          <caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/mock_request.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib/src/frontend/expect.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="19" lean-forward="false" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-          <folding />
+        <state relative-caret-position="387">
+          <caret line="164" column="29" selection-start-line="164" selection-start-column="29" selection-end-line="164" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="65" column="19" lean-forward="true" selection-start-line="65" selection-start-column="19" selection-end-line="65" selection-end-column="19" />
+        <state relative-caret-position="131">
+          <caret line="183" column="2" selection-start-line="183" selection-start-column="2" selection-end-line="183" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="399" column="31" lean-forward="true" selection-start-line="399" selection-start-column="31" selection-end-line="399" selection-end-column="31" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="67" column="45" selection-start-line="67" selection-start-column="45" selection-end-line="67" selection-end-column="45" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="102" column="6" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2275">
+          <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1949">
+          <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-61">
+          <caret line="7" column="31" lean-forward="true" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="16" column="59" lean-forward="true" selection-start-line="16" selection-start-column="59" selection-end-line="16" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/async/future.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="631">
+          <caret line="666" column="12" selection-start-line="666" selection-start-column="12" selection-end-line="666" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="196">
-          <caret line="120" column="26" lean-forward="false" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
+        <state relative-caret-position="363">
+          <caret line="162" column="32" lean-forward="true" selection-start-line="162" selection-start-column="32" selection-end-line="162" selection-end-column="32" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="201" column="37" lean-forward="false" selection-start-line="201" selection-start-column="37" selection-end-line="201" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.lock">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="24" lean-forward="true" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="58" column="9" lean-forward="true" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" />
-          <folding />
+        <state relative-caret-position="243">
+          <caret line="28" column="33" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="66" lean-forward="true" selection-start-line="2" selection-start-column="66" selection-end-line="2" selection-end-column="66" />
-          <folding />
+        <state relative-caret-position="165">
+          <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="48">
+            <caret line="3" column="63" selection-start-line="3" selection-start-column="63" selection-end-line="3" selection-end-column="63" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dad1665..7ecac991 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.1.4
+* Remove all usages of `async`/`await` in the core library.
+* `AngelConfigurer` now accepts `FutureOr`.
+* `AngelHttp` now has a `useZone` flag to disable custom zones.
+
 # 1.1.3
 * `AngelHttp` now handles requests in a `Zone`.
 * Use `package:dart2_constant`.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 518eb901..1167d894 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,2 +1,5 @@
 analyzer:
-  strong-mode: true
\ No newline at end of file
+  strong-mode: true
+linter:
+  rules:
+    - avoid_slow_async_io
\ No newline at end of file
diff --git a/example/json.dart b/example/json.dart
index 1ab77456..27426ba9 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'dart:isolate';
 import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
@@ -48,6 +47,6 @@ serverMain(_) async {
     print(e.stackTrace);
   };
 
-  var server = await http.startServer(InternetAddress.LOOPBACK_IP_V4, 3000);
+  var server = await http.startServer('127.0.0.1', 3000);
   print('Listening at http://${server.address.address}:${server.port}');
 }
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 13c18a3d..bcce6141 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -9,19 +9,19 @@ import 'angel_framework.dart';
 /// Sequentially runs a set of [listeners].
 HookedServiceEventListener chainListeners(
     Iterable<HookedServiceEventListener> listeners) {
-  return (HookedServiceEvent e) async {
-    for (HookedServiceEventListener listener in listeners) await listener(e);
+  return (HookedServiceEvent e) {
+    for (HookedServiceEventListener listener in listeners) listener(e);
   };
 }
 
 /// Runs a [callback] on every service, and listens for future services to run it again.
 AngelConfigurer hookAllServices(callback(Service service)) {
-  return (Angel app) async {
+  return (Angel app) {
     List<Service> touched = [];
 
     for (var service in app.services.values) {
       if (!touched.contains(service)) {
-        await callback(service);
+        callback(service);
         touched.add(service);
       }
     }
@@ -52,9 +52,9 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
   Iterable cond = condition is Iterable ? condition : [condition];
   if (condition == null) cond = [];
 
-  _condition(HookedServiceEvent e, condition) async {
+  _condition(HookedServiceEvent e, condition) {
     if (condition is Function)
-      return await condition(e);
+      return condition(e);
     else if (condition == Providers)
       return true;
     else {
@@ -70,11 +70,11 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
     }
   }
 
-  normalize(HookedServiceEvent e, obj) async {
+  normalize(HookedServiceEvent e, obj) {
     bool transform = true;
 
     for (var c in cond) {
-      var r = await _condition(e, c);
+      var r = _condition(e, c);
 
       if (r != true) {
         transform = false;
@@ -97,7 +97,7 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
       var r = [];
 
       for (var o in obj) {
-        r.add(await normalize(e, o));
+        r.add(normalize(e, o));
       }
 
       return r;
@@ -105,10 +105,10 @@ HookedServiceEventListener transform(transformer(obj), [condition]) {
       return transformer(obj);
   }
 
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     if (e.isBefore) {
-      e.data = await normalize(e, e.data);
-    } else if (e.isAfter) e.result = await normalize(e, e.result);
+      e.data = normalize(e, e.data);
+    } else if (e.isAfter) e.result = normalize(e, e.result);
   };
 }
 
@@ -135,7 +135,7 @@ HookedServiceEventListener toType(Type type) {
 /// Only applies to the client-side.
 HookedServiceEventListener remove(key, [remover(key, obj)]) {
   return (HookedServiceEvent e) async {
-    _remover(key, obj) {
+    _remover(key, obj) async {
       if (remover != null)
         return remover(key, obj);
       else if (obj is List)
@@ -171,15 +171,15 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
         if (obj is Iterable) {
           return await Future.wait(obj.map(_removeAll));
         } else
-          return await _removeAll(obj);
+          return _removeAll(obj);
       }
     }
 
     if (e.params?.containsKey('provider') == true) {
       if (e.isBefore) {
-        e.data = await normalize(e.data);
+        e.data = normalize(e.data);
       } else if (e.isAfter) {
-        e.result = await normalize(e.result);
+        e.result = normalize(e.result);
       }
     }
   };
@@ -193,12 +193,12 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
 ///
 /// If [provider] is `null`, then it will be disabled to all clients.
 HookedServiceEventListener disable([provider]) {
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     if (e.params.containsKey('provider')) {
       if (provider == null)
         throw new AngelHttpException.methodNotAllowed();
       else if (provider is Function) {
-        var r = await provider(e);
+        var r = provider(e);
         if (r != true) throw new AngelHttpException.methodNotAllowed();
       } else {
         _provide(p) => p is Providers ? p : new Providers(p.toString());
@@ -224,7 +224,7 @@ HookedServiceEventListener addCreatedAt(
     {assign(obj, now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'createdAt';
 
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     _assign(obj, now) {
       if (assign != null)
         return assign(obj, now);
@@ -242,17 +242,17 @@ HookedServiceEventListener addCreatedAt(
     var d = new DateTime.now().toUtc();
     var now = serialize == false ? d : d.toIso8601String();
 
-    normalize(obj) async {
+    normalize(obj) {
       if (obj != null) {
         if (obj is Iterable) {
           obj.forEach(normalize);
         } else {
-          await _assign(obj, now);
+          _assign(obj, now);
         }
       }
     }
 
-    await normalize(e.isBefore ? e.data : e.result);
+    normalize(e.isBefore ? e.data : e.result);
   };
 }
 
@@ -265,7 +265,7 @@ HookedServiceEventListener addUpdatedAt(
     {assign(obj, now), String key, bool serialize: true}) {
   var name = key?.isNotEmpty == true ? key : 'updatedAt';
 
-  return (HookedServiceEvent e) async {
+  return (HookedServiceEvent e) {
     _assign(obj, now) {
       if (assign != null)
         return assign(obj, now);
@@ -283,16 +283,16 @@ HookedServiceEventListener addUpdatedAt(
     var d = new DateTime.now().toUtc();
     var now = serialize == false ? d : d.toIso8601String();
 
-    normalize(obj) async {
+    normalize(obj) {
       if (obj != null) {
         if (obj is Iterable) {
           obj.forEach(normalize);
         } else {
-          await _assign(obj, now);
+          _assign(obj, now);
         }
       }
     }
 
-    await normalize(e.isBefore ? e.data : e.result);
+    normalize(e.isBefore ? e.data : e.result);
   };
 }
diff --git a/lib/src/core/angel_base.dart b/lib/src/core/angel_base.dart
index 3bc8c7b6..bf055630 100644
--- a/lib/src/core/angel_base.dart
+++ b/lib/src/core/angel_base.dart
@@ -9,9 +9,8 @@ typedef Future<String> ViewGenerator(String path, [Map data]);
 
 /// Base class for Angel servers. Do not bother extending this.
 class AngelBase extends Routable {
-  static ViewGenerator noViewEngineConfigured = (String view,
-          [Map data]) async =>
-      "No view engine has been configured yet.";
+  static ViewGenerator noViewEngineConfigured = (String view, [Map data]) =>
+      new Future<String>.value("No view engine has been configured yet.");
 
   Container _container = new Container();
 
@@ -35,9 +34,10 @@ class AngelBase extends Routable {
   ViewGenerator viewGenerator = noViewEngineConfigured;
 
   /// Closes this instance, rendering it **COMPLETELY DEFUNCT**.
-  Future close() async {
-    await super.close();
+  Future close() {
+    super.close();
     _container = null;
     viewGenerator = noViewEngineConfigured;
+    return new Future.value();
   }
 }
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 51580c8c..ef500a9a 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -67,7 +67,7 @@ class HookedService extends Service {
 
   /// Closes any open [StreamController]s on this instance. **Internal use only**.
   @override
-  Future close() async {
+  Future close() {
     _ctrl.forEach((c) => c.close());
     beforeIndexed._close();
     beforeRead._close();
@@ -81,7 +81,8 @@ class HookedService extends Service {
     afterModified._close();
     afterUpdated._close();
     afterRemoved._close();
-    await inner.close();
+    inner.close();
+    return new Future.value();
   }
 
   /// Adds hooks to this instance.
@@ -120,149 +121,16 @@ class HookedService extends Service {
     applyListeners(inner.remove, afterRemoved, true);
   }
 
-  /// Adds routes to this instance.
-  @override
-  void addRoutes() {
-    // Set up our routes. We still need to copy middleware from inner service
-    Map restProvider = {'provider': Providers.rest};
+  List get bootstrappers => new List.from(super.bootstrappers)
+    ..add((RequestContext req, ResponseContext res) {
+      req.serviceParams
+        ..['__requestctx'] = req
+        ..['__responsectx'] = res;
+      return true;
+    });
 
-    // Add global middleware if declared on the instance itself
-    Middleware before = getAnnotation(inner, Middleware);
-    List handlers = [
-      (RequestContext req, ResponseContext res) async {
-        req.serviceParams
-          ..['__requestctx'] = req
-          ..['__responsectx'] = res;
-        return true;
-      }
-    ];
-
-    if (before != null) handlers.addAll(before.handlers);
-
-    Middleware indexMiddleware = getAnnotation(inner.index, Middleware);
-    get('/', (req, res) async {
-      return await this.index(mergeMap([
-        {'query': req.query},
-        restProvider,
-        req.serviceParams
-      ]));
-    },
-        middleware: []
-          ..addAll(handlers)
-          ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
-
-    Middleware createMiddleware = getAnnotation(inner.create, Middleware);
-
-    post('/', (req, res) async {
-      var r = await this.create(
-          await req.lazyBody(),
-          mergeMap([
-            {'query': req.query},
-            restProvider,
-            req.serviceParams
-          ]));
-      res.statusCode = 201;
-      return r;
-    },
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (createMiddleware == null) ? [] : createMiddleware.handlers));
-
-    Middleware readMiddleware = getAnnotation(inner.read, Middleware);
-
-    get(
-        '/:id',
-        (req, res) async => await this.read(
-            toId(req.params['id']),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
-
-    Middleware modifyMiddleware = getAnnotation(inner.modify, Middleware);
-    patch(
-        '/:id',
-        (req, res) async => await this.modify(
-            toId(req.params['id']),
-            await req.lazyBody(),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
-
-    Middleware updateMiddleware = getAnnotation(inner.update, Middleware);
-    post(
-        '/:id',
-        (req, res) async => await this.update(
-            toId(req.params['id']),
-            await req.lazyBody(),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
-    put(
-        '/:id',
-        (req, res) async => await this.update(
-            toId(req.params['id']),
-            await req.lazyBody(),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (updateMiddleware == null) ? [] : updateMiddleware.handlers));
-
-    Middleware removeMiddleware = getAnnotation(inner.remove, Middleware);
-    delete(
-        '/',
-        (req, res) async => await this.remove(
-            null,
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
-    delete(
-        '/:id',
-        (req, res) async => await this.remove(
-            toId(req.params['id']),
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ])),
-        middleware: []
-          ..addAll(handlers)
-          ..addAll(
-              (removeMiddleware == null) ? [] : removeMiddleware.handlers));
-
-    // REST compliance
-    put('/', () => throw new AngelHttpException.notFound());
-    patch('/', () => throw new AngelHttpException.notFound());
-
-    addHooks();
+  void addRoutes([Service s]) {
+    super.addRoutes(s ?? inner);
   }
 
   /// Runs the [listener] before every service method specified.
@@ -388,192 +256,165 @@ class HookedService extends Service {
   }
 
   @override
-  Future index([Map _params]) async {
+  Future index([Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeIndexed._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeIndexed
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.indexed,
-            params: params));
-    if (before._canceled) {
-      HookedServiceEvent after = await beforeIndexed._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.indexed,
-              params: params, result: before.result));
-      return after.result;
-    }
+            params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeIndexed
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.indexed,
+                params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    var result = await inner.index(params);
-    HookedServiceEvent after = await afterIndexed._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.indexed,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.index(params).then((result) {
+        return afterIndexed
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.indexed,
+                params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future read(id, [Map _params]) async {
+  Future read(id, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeRead._emit(new HookedServiceEvent(
-        false,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.indexed,
-        id: id,
-        params: params));
+    return beforeRead
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+            _getResponse(_params), inner, HookedServiceEvent.read,
+            id: id, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeRead
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.read,
+                id: id, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterRead._emit(new HookedServiceEvent(
-          true,
-          _getRequest(_params),
-          _getResponse(_params),
-          inner,
-          HookedServiceEvent.read,
-          id: id,
-          params: params,
-          result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.read(id, params);
-    HookedServiceEvent after = await afterRead._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.read,
-        id: id,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.read(id, params).then((result) {
+        return afterRead
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.read,
+                id: id, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future create(data, [Map _params]) async {
+  Future create(data, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeCreated._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeCreated
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.created,
-            data: data, params: params));
+            data: data, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeCreated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.created,
+                data: data, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterCreated._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.created,
-              data: data, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.create(data, params);
-    HookedServiceEvent after = await afterCreated._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.created,
-        data: data,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.create(data, params).then((result) {
+        return afterCreated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.created,
+                data: data, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future modify(id, data, [Map _params]) async {
+  Future modify(id, data, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeModified._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeModified
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.modified,
-            id: id, data: data, params: params));
+            id: id, data: data, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeModified
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.modified,
+                id: id, data: data, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterModified._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.modified,
-              id: id, data: data, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.modify(id, data, params);
-    HookedServiceEvent after = await afterModified._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.modified,
-        id: id,
-        data: data,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.modify(id, data, params).then((result) {
+        return afterModified
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.created,
+                id: id, data: data, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future update(id, data, [Map _params]) async {
+  Future update(id, data, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeUpdated._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeUpdated
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.updated,
-            id: id, data: data, params: params));
+            id: id, data: data, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeUpdated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.updated,
+                id: id, data: data, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterUpdated._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.updated,
-              id: id, data: data, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.update(id, data, params);
-    HookedServiceEvent after = await afterUpdated._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.updated,
-        id: id,
-        data: data,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.update(id, data, params).then((result) {
+        return afterUpdated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.updated,
+                id: id, data: data, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   @override
-  Future remove(id, [Map _params]) async {
+  Future remove(id, [Map _params]) {
     var params = _stripReq(_params);
-    HookedServiceEvent before = await beforeRemoved._emit(
-        new HookedServiceEvent(false, _getRequest(_params),
+    return beforeRemoved
+        ._emit(new HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.removed,
-            id: id, params: params));
+            id: id, params: params))
+        .then((before) {
+      if (before._canceled) {
+        return beforeRemoved
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.removed,
+                id: id, params: params, result: before.result))
+            .then((after) => after.result);
+      }
 
-    if (before._canceled) {
-      HookedServiceEvent after = await afterRemoved._emit(
-          new HookedServiceEvent(true, _getRequest(_params),
-              _getResponse(_params), inner, HookedServiceEvent.removed,
-              id: id, params: params, result: before.result));
-      return after.result;
-    }
-
-    var result = await inner.remove(id, params);
-    HookedServiceEvent after = await afterRemoved._emit(new HookedServiceEvent(
-        true,
-        _getRequest(_params),
-        _getResponse(_params),
-        inner,
-        HookedServiceEvent.removed,
-        id: id,
-        params: params,
-        result: result));
-    return after.result;
+      return inner.remove(id, params).then((result) {
+        return afterRemoved
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.removed,
+                id: id, params: params, result: result))
+            .then((after) => after.result);
+      });
+    });
   }
 
   /// Fires an `after` event. This will not be propagated to clients,
   /// but will be broadcasted to WebSockets, etc.
   Future<HookedServiceEvent> fire(String eventName, result,
-      [HookedServiceEventListener callback]) async {
+      [HookedServiceEventListener callback]) {
     HookedServiceEventDispatcher dispatcher;
 
     switch (eventName) {
@@ -600,15 +441,15 @@ class HookedService extends Service {
     }
 
     var ev = new HookedServiceEvent(true, null, null, this, eventName);
-    return await fireEvent(dispatcher, ev, callback);
+    return fireEvent(dispatcher, ev, callback);
   }
 
   /// Sends an arbitrary event down the hook chain.
   Future<HookedServiceEvent> fireEvent(
       HookedServiceEventDispatcher dispatcher, HookedServiceEvent event,
-      [HookedServiceEventListener callback]) async {
-    if (callback != null && event?._canceled != true) await callback(event);
-    return await dispatcher._emit(event);
+      [HookedServiceEventListener callback]) {
+    if (callback != null && event?._canceled != true) callback(event);
+    return dispatcher._emit(event);
   }
 }
 
@@ -690,16 +531,16 @@ class HookedServiceEventDispatcher {
   }
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
-  Future<HookedServiceEvent> _emit(HookedServiceEvent event) async {
+  Future<HookedServiceEvent> _emit(HookedServiceEvent event) {
     if (event?._canceled != true) {
       for (var listener in listeners) {
-        await listener(event);
+        listener(event);
 
-        if (event._canceled) return event;
+        if (event._canceled) return new Future.value(event);
       }
     }
 
-    return event;
+    return new Future.value(event);
   }
 
   /// Returns a [Stream] containing all events fired by this dispatcher.
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index fba314ab..b9594642 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -78,10 +78,11 @@ bool suitableForInjection(
 
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(handler, InjectionRequest injection) {
-  return (RequestContext req, ResponseContext res) async {
+  return (RequestContext req, ResponseContext res) {
     if (injection.parameters.isNotEmpty &&
         injection.parameters.values.any((p) => p.match != null) &&
-        !suitableForInjection(req, res, injection)) return true;
+        !suitableForInjection(req, res, injection))
+      return new Future.value(true);
 
     List args = [];
 
@@ -94,8 +95,7 @@ RequestHandler handleContained(handler, InjectionRequest injection) {
       named[name] = resolveInjection([k, v], injection, req, res, false);
     });
 
-    var result = Function.apply(handler, args, named);
-    return result is Future ? await result : result;
+    return Function.apply(handler, args, named);
   };
 }
 
@@ -181,6 +181,5 @@ InjectionRequest preInject(Function handler) {
       injection.named[name] = type;
     }
   }
-
   return injection;
 }
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 9f89f0f0..3f2d9e90 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -45,13 +45,13 @@ class MapService extends Service {
   }
 
   @override
-  Future<List> index([Map params]) async {
+  Future<List> index([Map params]) {
     if (allowQuery == false || params == null || params['query'] is! Map)
-      return items;
+      return new Future.value(items);
     else {
       Map query = params['query'];
 
-      return items.where((item) {
+      return new Future.value(items.where((item) {
         for (var key in query.keys) {
           if (!item.containsKey(key))
             return false;
@@ -59,19 +59,19 @@ class MapService extends Service {
         }
 
         return true;
-      }).toList();
+      }).toList());
     }
   }
 
   @override
-  Future<Map> read(id, [Map params]) async {
-    return items.firstWhere(_matchesId(id),
+  Future<Map> read(id, [Map params]) {
+    return new Future.value(items.firstWhere(_matchesId(id),
         orElse: () => throw new AngelHttpException.notFound(
-            message: 'No record found for ID $id'));
+            message: 'No record found for ID $id')));
   }
 
   @override
-  Future<Map> create(data, [Map params]) async {
+  Future<Map> create(data, [Map params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
@@ -86,70 +86,71 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
     items.add(result);
-    return result;
+    return new Future.value(result);
   }
 
   @override
-  Future<Map> modify(id, data, [Map params]) async {
+  Future<Map> modify(id, data, [Map params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `modify` with ${data.runtimeType}.');
-    if (!items.any(_matchesId(id))) return await create(data, params);
+    if (!items.any(_matchesId(id))) return create(data, params);
 
-    var item = await read(id);
-    var result = item..addAll(data);
+    return read(id).then((item) {
+      var result = item..addAll(data);
 
-    if (autoIdAndDateFields == true)
-      result
-        ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-            new DateTime.now().toIso8601String();
-    return result;
+      if (autoIdAndDateFields == true)
+        result
+          ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
+              new DateTime.now().toIso8601String();
+      return new Future.value(result);
+    });
   }
 
   @override
-  Future<Map> update(id, data, [Map params]) async {
+  Future<Map> update(id, data, [Map params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `update` with ${data.runtimeType}.');
-    if (!items.any(_matchesId(id))) return await create(data, params);
+    if (!items.any(_matchesId(id))) return create(data, params);
 
-    var old = await read(id);
+    return read(id).then((old) {
+      if (!items.remove(old))
+        throw new AngelHttpException.notFound(
+            message: 'No record found for ID $id');
 
-    if (!items.remove(old))
-      throw new AngelHttpException.notFound(
-          message: 'No record found for ID $id');
-
-    var result = data;
-    if (autoIdAndDateFields == true) {
-      result
-        ..['id'] = id?.toString()
-        ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] =
-            old[autoSnakeCaseNames == false ? 'createdAt' : 'created_at']
-        ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-            new DateTime.now().toIso8601String();
-    }
-    items.add(result);
-    return result;
+      var result = data;
+      if (autoIdAndDateFields == true) {
+        result
+          ..['id'] = id?.toString()
+          ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] =
+              old[autoSnakeCaseNames == false ? 'createdAt' : 'created_at']
+          ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
+              new DateTime.now().toIso8601String();
+      }
+      items.add(result);
+      return new Future.value(result);
+    });
   }
 
   @override
-  Future<Map> remove(id, [Map params]) async {
+  Future<Map> remove(id, [Map params]) {
     if (id == null ||
         id == 'null' &&
             (allowRemoveAll == true ||
                 params?.containsKey('provider') != true)) {
       items.clear();
-      return {};
+      return new Future.value({});
     }
 
-    var result = await read(id, params);
-
-    if (items.remove(result))
-      return result;
-    else
-      throw new AngelHttpException.notFound(
-          message: 'No record found for ID $id');
+    return read(id, params).then((result) {
+      if (items.remove(result))
+        return result;
+      else
+        throw new AngelHttpException.notFound(
+            message: 'No record found for ID $id');
+    });
   }
 }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 4cb6d625..c926c792 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -10,6 +10,7 @@ import 'metadata.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'server.dart' show Angel;
+
 part 'injection.dart';
 
 /// A convenience wrapper around an incoming HTTP request.
@@ -167,8 +168,8 @@ abstract class RequestContext {
   void inject(type, value) {
     if (!app.isProduction && type is Type) {
       if (!reflect(value).type.isAssignableTo(reflectType(type)))
-        throw new ArgumentError(
-            'Cannot inject $value (${value.runtimeType}) as an instance of $type.');
+        throw new ArgumentError('Cannot inject $value (${value
+                .runtimeType}) as an instance of $type.');
     }
 
     _injections[type] = value;
@@ -230,12 +231,12 @@ abstract class RequestContext {
   }
 
   /// Manually parses the request body, if it has not already been parsed.
-  Future<BodyParseResult> parse() async {
+  Future<BodyParseResult> parse() {
     if (_body != null)
-      return _body;
+      return new Future.value(_body);
     else
       _provisionalQuery = null;
-    return _body = await parseOnce();
+    return parseOnce().then((body) => _body = body);
   }
 
   /// Override this method to one-time parse an incoming request.
@@ -243,7 +244,7 @@ abstract class RequestContext {
   Future<BodyParseResult> parseOnce();
 
   /// Disposes of all resources.
-  Future close() async {
+  Future close() {
     _body = null;
     _acceptsAllCache = null;
     _acceptHeaderCache = null;
@@ -252,5 +253,6 @@ abstract class RequestContext {
     _injections.clear();
     serviceParams.clear();
     params.clear();
+    return new Future.value();
   }
 }
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index cf4bddac..4851c21b 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -123,10 +123,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// If `true`, all response finalizers will be skipped.
   bool willCloseItself = false;
 
-  static StateError closed() => new StateError('Cannot modify a closed response.');
+  static StateError closed() =>
+      new StateError('Cannot modify a closed response.');
 
   /// Sends a download as a response.
-  Future download(File file, {String filename}) async {
+  void download(File file, {String filename}) {
     if (!isOpen) throw closed();
 
     headers["Content-Disposition"] =
@@ -135,9 +136,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     headers['content-length'] = file.lengthSync().toString();
 
     if (streaming) {
-      await file.openRead().pipe(this);
+      file.openRead().pipe(this);
     } else {
-      buffer.add(await file.readAsBytes());
+      buffer.add(file.readAsBytesSync());
       end();
     }
   }
@@ -157,8 +158,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Disposes of all resources.
-  Future dispose() async {
-    await close();
+  void dispose() {
+    close();
     properties.clear();
     encoders.clear();
     _buffer.clear();
@@ -197,11 +198,12 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Renders a view to the response stream, and closes the response.
-  Future render(String view, [Map data]) async {
+  Future render(String view, [Map data]) {
     if (!isOpen) throw closed();
-    write(await app.viewGenerator(view, data));
+    write(app.viewGenerator(view, data));
     headers['content-type'] = ContentType.HTML.toString();
     end();
+    return new Future.value();
   }
 
   /// Redirects to user to the given URL.
@@ -293,11 +295,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Copies a file's contents into the response buffer.
-  Future sendFile(File file) async {
+  void sendFile(File file) {
     if (!isOpen) throw closed();
 
     headers['content-type'] = lookupMimeType(file.path);
-    buffer.add(await file.readAsBytes());
+    buffer.add(file.readAsBytesSync());
     end();
   }
 
@@ -309,8 +311,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
     var text = serializer(value);
 
-    if (text.isEmpty)
-      return;
+    if (text.isEmpty) return;
 
     if (contentType is String)
       headers['content-type'] = contentType;
@@ -337,10 +338,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
       (correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
     }
 
-    if (correspondingRequest?.injections?.containsKey(PoolResource) ==
-        true) {
-      (correspondingRequest.injections[PoolResource] as PoolResource)
-          .release();
+    if (correspondingRequest?.injections?.containsKey(PoolResource) == true) {
+      (correspondingRequest.injections[PoolResource] as PoolResource).release();
     }
   }
 
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 1b46fd2a..8dafb635 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -2,7 +2,6 @@ library angel_framework.http.routable;
 
 import 'dart:async';
 import 'package:angel_route/angel_route.dart';
-import 'package:meta/meta.dart';
 import '../util.dart';
 import 'angel_base.dart';
 import 'hooked_service.dart';
@@ -22,13 +21,23 @@ typedef Future RequestHandler(RequestContext req, ResponseContext res);
 /// Sequentially runs a list of [handlers] of middleware, and returns early if any does not
 /// return `true`. Works well with [Router].chain.
 RequestMiddleware waterfall(List handlers) {
-  return (RequestContext req, res) async {
+  return (req, res) {
+    Future<bool> Function() runPipeline;
+
     for (var handler in handlers) {
-      var result = await req.app.executeHandler(handler, req, res);
-      if (result != true) return result;
+      if (handler == null) break;
+
+      if (runPipeline == null)
+        runPipeline = () => req.app.executeHandler(handler, req, res);
+      else {
+        var current = runPipeline;
+        runPipeline = () => current().then((result) =>
+            !result ? result : req.app.executeHandler(handler, req, res));
+      }
     }
 
-    return true;
+    runPipeline ??= () => new Future.value(true);
+    return runPipeline();
   };
 }
 
@@ -39,7 +48,7 @@ class Routable extends Router {
 
   Routable() : super();
 
-  Future close() async {
+  void close() {
     _services.clear();
     configuration.clear();
     requestMiddleware.clear();
@@ -63,9 +72,11 @@ class Routable extends Router {
 
   /// Assigns a middleware to a name for convenience.
   @override
-  registerMiddleware(String name, @checked RequestHandler middleware) =>
-      // ignore: deprecated_member_use
-      super.registerMiddleware(name, middleware);
+  registerMiddleware(String name, middleware) {
+    assert(middleware is RequestMiddleware);
+    // ignore: deprecated_member_use
+    super.registerMiddleware(name, middleware);
+  }
 
   /// Retrieves the service assigned to the given path.
   Service service(Pattern path) =>
@@ -116,7 +127,7 @@ class Routable extends Router {
     final handlers = [];
 
     if (_router is AngelBase) {
-      handlers.add((RequestContext req, ResponseContext res) async {
+      handlers.add((RequestContext req, ResponseContext res) {
         req.app = _router;
         res.app = _router;
         return true;
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 6666a2d0..50b67c4a 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -9,7 +9,6 @@ import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 export 'package:container/container.dart';
 import 'package:logging/logging.dart';
-import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
 import '../http/http.dart';
 import 'angel_base.dart';
@@ -27,7 +26,7 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef Future<HttpServer> ServerGenerator(address, int port);
 
 /// A function that configures an [Angel] server in some way.
-typedef Future AngelConfigurer(Angel app);
+typedef FutureOr AngelConfigurer(Angel app);
 
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
@@ -202,12 +201,12 @@ class Angel extends AngelBase {
   /// Shuts down the server, and closes any open [StreamController]s.
   ///
   /// The server will be **COMPLETE DEFUNCT** after this operation!
-  Future close() async {
-    await Future.forEach(services.values, (Service service) async {
-      await service.close();
+  Future close() {
+    Future.forEach(services.values, (Service service) {
+      service.close();
     });
 
-    await super.close();
+    super.close();
     _preContained.clear();
     handlerCache.clear();
     _injections.clear();
@@ -220,8 +219,8 @@ class Angel extends AngelBase {
     shutdownHooks.clear();
     responseFinalizers.clear();
     _flattened = null;
-    await _http?.close();
-    return _http?.httpServer;
+    _http?.close();
+    return new Future.value(_http?.httpServer);
   }
 
   @override
@@ -269,52 +268,50 @@ class Angel extends AngelBase {
     this.serializer = serializer;
   }
 
-  Future getHandlerResult(
-      handler, RequestContext req, ResponseContext res) async {
+  Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
     if (handler is RequestHandler) {
-      var result = await handler(req, res);
-      return await getHandlerResult(result, req, res);
+      var result = handler(req, res);
+      return getHandlerResult(result, req, res);
     }
 
     if (handler is Future) {
-      var result = await handler;
-      return await getHandlerResult(result, req, res);
+      return handler.then((result) => getHandlerResult(result, req, res));
     }
 
     if (handler is Function) {
-      var result = await runContained(handler, req, res);
-      return await getHandlerResult(result, req, res);
+      var result = runContained(handler, req, res);
+      return getHandlerResult(result, req, res);
     }
 
     if (handler is Stream) {
-      return await getHandlerResult(await handler.toList(), req, res);
+      return getHandlerResult(handler.toList(), req, res);
     }
 
     var middleware = (req.app ?? this).findMiddleware(handler);
     if (middleware != null) {
-      return await getHandlerResult(middleware, req, res);
+      return getHandlerResult(middleware, req, res);
     }
 
-    return handler;
+    return new Future.value(handler);
   }
 
   /// Runs some [handler]. Returns `true` if request execution should continue.
   Future<bool> executeHandler(
-      handler, RequestContext req, ResponseContext res) async {
-    var result = await getHandlerResult(handler, req, res);
-
-    if (result == null)
-      return false;
-    else if (result is bool) {
-      return result;
-    } else if (result != null) {
-      // TODO: Make `serialize` return a bool, return this as the value.
-      // Do this wherever applicable
-      res.serialize(result,
-          contentType: res.headers['content-type'] ?? 'application/json');
-      return false;
-    } else
-      return res.isOpen;
+      handler, RequestContext req, ResponseContext res) {
+    return getHandlerResult(handler, req, res).then((result) {
+      if (result == null)
+        return false;
+      else if (result is bool) {
+        return result;
+      } else if (result != null) {
+        // TODO: Make `serialize` return a bool, return this as the value.
+        // Do this wherever applicable
+        res.serialize(result,
+            contentType: res.headers['content-type'] ?? 'application/json');
+        return false;
+      } else
+        return res.isOpen;
+    });
   }
 
   /// Use the serving methods in [AngelHttp] instead.
@@ -400,20 +397,22 @@ class Angel extends AngelBase {
   /// the execution will be faster, as the injection requirements were stored beforehand.
   Future runContained(
       Function handler, RequestContext req, ResponseContext res) {
-    if (_preContained.containsKey(handler)) {
-      return handleContained(handler, _preContained[handler])(req, res);
-    }
+    return new Future.sync(() {
+      if (_preContained.containsKey(handler)) {
+        return handleContained(handler, _preContained[handler])(req, res);
+      }
 
-    return runReflected(handler, req, res);
+      return runReflected(handler, req, res);
+    });
   }
 
   /// Runs with DI, and *always* reflects. Prefer [runContained].
   Future runReflected(
-      Function handler, RequestContext req, ResponseContext res) async {
+      Function handler, RequestContext req, ResponseContext res) {
     var h =
         handleContained(handler, _preContained[handler] = preInject(handler));
-    return await h(req, res);
-    // return await closureMirror.apply(args).reflectee;
+    return new Future.sync(() => h(req, res));
+    // return   closureMirror.apply(args).reflectee;
   }
 
   /// Use the serving methods in [AngelHttp] instead.
@@ -432,8 +431,8 @@ class Angel extends AngelBase {
   }
 
   /// Applies an [AngelConfigurer] to this instance.
-  Future configure(AngelConfigurer configurer) async {
-    await configurer(this);
+  Future configure(AngelConfigurer configurer) {
+    return new Future.sync(() => configurer(this));
   }
 
   /// Mounts the child on this router. If [routable] is `null`,
@@ -447,7 +446,7 @@ class Angel extends AngelBase {
   /// NOTE: The above will not be properly copied if [path] is
   /// a [RegExp].
   @override
-  use(path, [@checked Routable routable, String namespace = null]) {
+  use(path, [Router routable, String namespace = null]) {
     if (routable == null) return all('*', path);
 
     var head = path.toString().replaceAll(_straySlashes, '');
@@ -457,13 +456,13 @@ class Angel extends AngelBase {
       _preContained.addAll(routable._preContained);
 
       if (routable.responseFinalizers.isNotEmpty) {
-        responseFinalizers.add((req, res) async {
+        responseFinalizers.add((req, res) {
           if (req.path.replaceAll(_straySlashes, '').startsWith(head)) {
             for (var finalizer in routable.responseFinalizers)
-              await finalizer(req, res);
+              finalizer(req, res);
           }
 
-          return true;
+          return new Future.value(true);
         });
       }
 
@@ -493,15 +492,17 @@ class Angel extends AngelBase {
   }
 
   @deprecated
-  Future<ZoneSpecification> defaultZoneCreator(request, req, res) async {
-    return new ZoneSpecification(
-      print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
-        if (logger != null) {
-          logger.info(line);
-        } else {
-          return parent.print(zone, line);
-        }
-      },
+  Future<ZoneSpecification> defaultZoneCreator(request, req, res) {
+    return new Future.value(
+      new ZoneSpecification(
+        print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
+          if (logger != null) {
+            logger.info(line);
+          } else {
+            return parent.print(zone, line);
+          }
+        },
+      ),
     );
   }
 
@@ -518,9 +519,8 @@ class Angel extends AngelBase {
   factory Angel.fromSecurityContext(SecurityContext context) {
     var app = new Angel();
 
-    app._http =
-        new AngelHttp.custom(app, (address, int port) async {
-      return await HttpServer.bindSecure(address, port, context);
+    app._http = new AngelHttp.custom(app, (address, int port) {
+      return HttpServer.bindSecure(address, port, context);
     });
 
     return app;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index ea6f7f2a..3cd6e6fd 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -7,6 +7,7 @@ import '../util.dart';
 import 'angel_base.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
+import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
 
@@ -54,11 +55,14 @@ class Service extends Routable {
     'token'
   ];
 
+  /// Handlers that must run to ensure this service's functionality.
+  List get bootstrappers => [];
+
   /// The [Angel] app powering this service.
   AngelBase app;
 
   /// Closes this service, including any database connections or stream controllers.
-  Future close() async {}
+  void close() {}
 
   /// Retrieves all resources.
   Future index([Map params]) {
@@ -99,18 +103,22 @@ class Service extends Routable {
   }
 
   /// Generates RESTful routes pointing to this class's methods.
-  void addRoutes() {
+  void addRoutes([Service service]) {
+    _addRoutesInner(service ?? this, bootstrappers);
+  }
+
+  void _addRoutesInner(Service service,
+      List handlers) {
     Map restProvider = {'provider': Providers.rest};
 
     // Add global middleware if declared on the instance itself
-    Middleware before = getAnnotation(this, Middleware);
-    final handlers = [];
+    Middleware before = getAnnotation(service, Middleware);
 
     if (before != null) handlers.addAll(before.handlers);
 
-    Middleware indexMiddleware = getAnnotation(this.index, Middleware);
-    get('/', (req, res) async {
-      return await this.index(mergeMap([
+    Middleware indexMiddleware = getAnnotation(service.index, Middleware);
+    get('/', (req, res) {
+      return this.index(mergeMap([
         {'query': req.query},
         restProvider,
         req.serviceParams
@@ -120,28 +128,33 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
-    Middleware createMiddleware = getAnnotation(this.create, Middleware);
-    post('/', (req, ResponseContext res) async {
-      var r = await this.create(
-          await req.lazyBody(),
-          mergeMap([
-            {'query': req.query},
-            restProvider,
-            req.serviceParams
-          ]));
-      res.statusCode = 201;
-      return r;
+    Middleware createMiddleware = getAnnotation(service.create, Middleware);
+    post('/', (RequestContext req, ResponseContext res) {
+      return req.lazyBody().then((body) {
+        return this
+            .create(
+                body,
+                mergeMap([
+                  {'query': req.query},
+                  restProvider,
+                  req.serviceParams
+                ]))
+            .then((r) {
+          res.statusCode = 201;
+          return r;
+        });
+      });
     },
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (createMiddleware == null) ? [] : createMiddleware.handlers));
 
-    Middleware readMiddleware = getAnnotation(this.read, Middleware);
+    Middleware readMiddleware = getAnnotation(service.read, Middleware);
 
     get(
         '/:id',
-        (req, res) async => await this.read(
+        (req, res) => this.read(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
@@ -152,56 +165,56 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
-    Middleware modifyMiddleware = getAnnotation(this.modify, Middleware);
+    Middleware modifyMiddleware = getAnnotation(service.modify, Middleware);
     patch(
         '/:id',
-        (req, res) async => await this.modify(
+        (RequestContext req, res) => req.lazyBody().then((body) => this.modify(
             toId(req.params['id']),
-            await req.lazyBody(),
+            body,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
-            ])),
+            ]))),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
-    Middleware updateMiddleware = getAnnotation(this.update, Middleware);
+    Middleware updateMiddleware = getAnnotation(service.update, Middleware);
     post(
         '/:id',
-        (req, res) async => await this.update(
+        (RequestContext req, res) => req.lazyBody().then((body) => this.update(
             toId(req.params['id']),
-            await req.lazyBody(),
+            body,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
-            ])),
+            ]))),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put(
         '/:id',
-        (req, res) async => await this.update(
+        (RequestContext req, res) => req.lazyBody().then((body) => this.update(
             toId(req.params['id']),
-            await req.lazyBody(),
+            body,
             mergeMap([
               {'query': req.query},
               restProvider,
               req.serviceParams
-            ])),
+            ]))),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
-    Middleware removeMiddleware = getAnnotation(this.remove, Middleware);
+    Middleware removeMiddleware = getAnnotation(service.remove, Middleware);
     delete(
         '/',
-        (req, res) async => await this.remove(
+        (req, res) => this.remove(
             null,
             mergeMap([
               {'query': req.query},
@@ -214,7 +227,7 @@ class Service extends Routable {
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
-        (req, res) async => await this.remove(
+        (req, res) => this.remove(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 3682d17d..72c83eb0 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -1,9 +1,17 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
+import 'dart:io'
+    show
+        stderr,
+        HttpRequest,
+        HttpResponse,
+        HttpServer,
+        Platform,
+        SecurityContext;
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
+import 'package:dart2_constant/io.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:pool/pool.dart';
 import 'package:stack_trace/stack_trace.dart';
@@ -17,6 +25,7 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 /// Adapts `dart:io`'s [HttpServer] to serve Angel.
 class AngelHttp {
   final Angel app;
+  final bool useZone;
   bool _closed = false;
   HttpServer _server;
   Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
@@ -24,7 +33,7 @@ class AngelHttp {
 
   Pool _pool;
 
-  AngelHttp(this.app);
+  AngelHttp(this.app, {this.useZone: true});
 
   /// The function used to bind this instance to an HTTP server.
   Future<HttpServer> Function(dynamic, int) get serverGenerator =>
@@ -32,15 +41,18 @@ class AngelHttp {
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory AngelHttp.custom(
-      Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator) {
-    return new AngelHttp(app).._serverGenerator = serverGenerator;
+      Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator,
+      {bool useZone: true}) {
+    return new AngelHttp(app, useZone: useZone)
+      .._serverGenerator = serverGenerator;
   }
 
-  factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context) {
-    var http = new AngelHttp(app);
+  factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context,
+      {bool useZone: true}) {
+    var http = new AngelHttp(app, useZone: useZone);
 
-    http._serverGenerator = (address, int port) async {
-      return await HttpServer.bindSecure(address, port, context);
+    http._serverGenerator = (address, int port) {
+      return HttpServer.bindSecure(address, port, context);
     };
 
     return http;
@@ -53,7 +65,7 @@ class AngelHttp {
   /// the server.
   factory AngelHttp.secure(
       Angel app, String certificateChainPath, String serverKeyPath,
-      {bool debug: false, String password}) {
+      {bool debug: false, String password, bool useZone: true}) {
     var certificateChain =
         Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
@@ -61,7 +73,8 @@ class AngelHttp {
     serverContext.useCertificateChain(certificateChain, password: password);
     serverContext.usePrivateKey(serverKey, password: password);
 
-    return new AngelHttp.fromSecurityContext(app, serverContext);
+    return new AngelHttp.fromSecurityContext(app, serverContext,
+        useZone: useZone);
   }
 
   /// The native HttpServer running this instance.
@@ -70,139 +83,153 @@ class AngelHttp {
   /// Starts the server.
   ///
   /// Returns false on failure; otherwise, returns the HttpServer.
-  Future<HttpServer> startServer([address, int port]) async {
-    var host = address ?? InternetAddress.LOOPBACK_IP_V4;
-    _server = await _serverGenerator(host, port ?? 0);
-
-    for (var configurer in app.startupHooks) {
-      await app.configure(configurer);
-    }
-
-    app.optimizeForProduction();
-    _sub = _server.listen(handleRequest);
-    return _server;
+  Future<HttpServer> startServer([address, int port]) {
+    var host = address ?? '127.0.0.1';
+    return _serverGenerator(host, port ?? 0).then((server) {
+      _server = server;
+      return Future.wait(app.startupHooks.map(app.configure)).then((_) {
+        app.optimizeForProduction();
+        _sub = _server.listen(handleRequest);
+        return _server;
+      });
+    });
   }
 
   /// Shuts down the underlying server.
-  Future<HttpServer> close() async {
-    if (_closed) return _server;
+  Future<HttpServer> close() {
+    if (_closed) return new Future.value(_server);
     _closed = true;
     _sub?.cancel();
 
     // TODO: Remove this try/catch in 1.2.0
-    try {
-      await app.close();
-    } catch (_) {}
-
-    for (var configurer in app.shutdownHooks) await app.configure(configurer);
-    return _server;
+    var close = app.close().catchError((_) => null);
+    return close.then((_) =>
+        Future.wait(app.shutdownHooks.map(app.configure)).then((_) => _server));
   }
 
   /// Handles a single request.
-  Future handleRequest(HttpRequest request) async {
-    var req = await createRequestContext(request);
-    var res = await createResponseContext(request.response, req);
+  Future handleRequest(HttpRequest request) {
+    return createRequestContext(request).then((req) {
+      return createResponseContext(request.response, req).then((res) {
+        handle() {
+          var path = req.path;
+          if (path == '/') path = '';
 
-    var zoneSpec = new ZoneSpecification(
-      print: (self, parent, zone, line) {
-        if (app.logger != null)
-          app.logger.info(line);
-        else
-          parent.print(zone, line);
-      },
-      handleUncaughtError: (self, parent, zone, error, stackTrace) async {
-        var trace = new Trace.from(stackTrace).terse;
+          Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
+            Router r = app.optimizedRouter;
+            var resolved =
+                r.resolveAbsolute(path, method: req.method, strip: false);
 
-        try {
-          AngelHttpException e;
-
-          if (error is FormatException) {
-            e = new AngelHttpException.badRequest(message: error.message);
-          } else if (error is AngelHttpException) {
-            e = error;
-          } else {
-            e = new AngelHttpException(error,
-                stackTrace: stackTrace, message: error?.toString());
+            return new Tuple3(
+              new MiddlewarePipeline(resolved).handlers,
+              resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
+              resolved.isEmpty ? null : resolved.first.parseResult,
+            );
           }
 
-          if (app.logger != null) {
-            app.logger.severe(e.message ?? e.toString(), error, trace);
+          var cacheKey = req.method + path;
+          var tuple = app.isProduction
+              ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
+              : resolveTuple();
+
+          req.params.addAll(tuple.item2);
+          req.inject(ParseResult, tuple.item3);
+
+          if (app.logger != null)
+            req.inject(Stopwatch, new Stopwatch()..start());
+
+          var pipeline = tuple.item1;
+
+          Future<bool> Function() runPipeline;
+
+          for (var handler in pipeline) {
+            if (handler == null) break;
+
+            if (runPipeline == null)
+              runPipeline = () => app.executeHandler(handler, req, res);
+            else {
+              var current = runPipeline;
+              runPipeline = () => current().then((result) =>
+                  !result ? result : app.executeHandler(handler, req, res));
+            }
           }
 
-          await handleAngelHttpException(e, trace, req, res, request);
-        } catch (e, st) {
-          var trace = new Trace.from(st).terse;
-          request.response.close();
-          // Ideally, we won't be in a position where an absolutely fatal error occurs,
-          // but if so, we'll need to log it.
-          if (app.logger != null) {
-            app.logger.severe(
-                'Fatal error occurred when processing ${request.uri}.',
-                e,
-                trace);
-          } else {
-            stderr
-              ..writeln('Fatal error occurred when processing '
-                  '${request.uri}:')
-              ..writeln(e)
-              ..writeln(trace);
-          }
+          return runPipeline == null
+              ? sendResponse(request, req, res)
+              : runPipeline().then((_) => sendResponse(request, req, res));
         }
-      },
-    );
 
-    var zone = Zone.current.fork(specification: zoneSpec);
+        if (useZone == false) {
+          return handle().whenComplete(() => res.dispose());
+        } else {
+          var zoneSpec = new ZoneSpecification(
+            print: (self, parent, zone, line) {
+              if (app.logger != null)
+                app.logger.info(line);
+              else
+                parent.print(zone, line);
+            },
+            handleUncaughtError: (self, parent, zone, error, stackTrace) {
+              var trace = new Trace.from(stackTrace).terse;
 
-    return await zone.run(() async {
-      var path = req.path;
-      if (path == '/') path = '';
+              return new Future(() {
+                AngelHttpException e;
 
-      Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
-        Router r = app.optimizedRouter;
-        var resolved =
-            r.resolveAbsolute(path, method: req.method, strip: false);
+                if (error is FormatException) {
+                  e = new AngelHttpException.badRequest(message: error.message);
+                } else if (error is AngelHttpException) {
+                  e = error;
+                } else {
+                  e = new AngelHttpException(error,
+                      stackTrace: stackTrace, message: error?.toString());
+                }
 
-        return new Tuple3(
-          new MiddlewarePipeline(resolved).handlers,
-          resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
-          resolved.isEmpty ? null : resolved.first.parseResult,
-        );
-      }
+                if (app.logger != null) {
+                  app.logger.severe(e.message ?? e.toString(), error, trace);
+                }
 
-      var cacheKey = req.method + path;
-      var tuple = app.isProduction
-          ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
-          : resolveTuple();
+                return handleAngelHttpException(e, trace, req, res, request);
+              }).catchError((e, st) {
+                var trace = new Trace.from(st).terse;
+                request.response.close();
+                // Ideally, we won't be in a position where an absolutely fatal error occurs,
+                // but if so, we'll need to log it.
+                if (app.logger != null) {
+                  app.logger.severe(
+                      'Fatal error occurred when processing ${request.uri}.',
+                      e,
+                      trace);
+                } else {
+                  stderr
+                    ..writeln('Fatal error occurred when processing '
+                        '${request.uri}:')
+                    ..writeln(e)
+                    ..writeln(trace);
+                }
+              });
+            },
+          );
 
-      req.inject(Zone, zone);
-      req.inject(ZoneSpecification, zoneSpec);
-      req.params.addAll(tuple.item2);
-      req.inject(ParseResult, tuple.item3);
-
-      if (app.logger != null) req.inject(Stopwatch, new Stopwatch()..start());
-
-      var pipeline = tuple.item1;
-
-      for (var handler in pipeline) {
-        if (handler == null || !await app.executeHandler(handler, req, res))
-          break;
-      }
-
-      await sendResponse(request, req, res);
-    }).whenComplete(() {
-      res.dispose();
+          var zone = Zone.current.fork(specification: zoneSpec);
+          req.inject(Zone, zone);
+          req.inject(ZoneSpecification, zoneSpec);
+          return zone.run(handle).whenComplete(() {
+            res.dispose();
+          });
+        }
+      });
     });
   }
 
   /// Handles an [AngelHttpException].
   Future handleAngelHttpException(AngelHttpException e, StackTrace st,
       RequestContext req, ResponseContext res, HttpRequest request,
-      {bool ignoreFinalizers: false}) async {
+      {bool ignoreFinalizers: false}) {
     if (req == null || res == null) {
       try {
         app.logger?.severe(e, st);
         request.response
-          ..statusCode = HttpStatus.INTERNAL_SERVER_ERROR
+          ..statusCode = HttpStatus.internalServerError
           ..write('500 Internal Server Error')
           ..close();
       } finally {
@@ -212,12 +239,12 @@ class AngelHttp {
 
     if (res.isOpen) {
       res.statusCode = e.statusCode;
-      var result = await app.errorHandler(e, req, res);
-      await app.executeHandler(result, req, res);
+      var result = app.errorHandler(e, req, res);
+      app.executeHandler(result, req, res);
       res.end();
     }
 
-    return await sendResponse(request, req, res,
+    return sendResponse(request, req, res,
         ignoreFinalizers: ignoreFinalizers == true);
   }
 
@@ -244,8 +271,12 @@ class AngelHttp {
     List<int> outputBuffer = res.buffer.toBytes();
 
     if (res.encoders.isNotEmpty) {
-      var allowedEncodings =
-          req.headers[HttpHeaders.ACCEPT_ENCODING]?.map((str) {
+      var allowedEncodings = req.headers
+          .value('accept-encoding')
+          ?.split(',')
+          ?.map((s) => s.trim())
+          ?.where((s) => s.isNotEmpty)
+          ?.map((str) {
         // Ignore quality specifications in accept-encoding
         // ex. gzip;q=0.8
         if (!str.contains(';')) return str;
@@ -264,7 +295,7 @@ class AngelHttp {
           }
 
           if (encoder != null) {
-            request.response.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+            request.response.headers.set('content-encoding', key);
             outputBuffer = res.encoders[key].convert(outputBuffer);
             request.response.contentLength = outputBuffer.length;
             break;
@@ -278,31 +309,30 @@ class AngelHttp {
       ..cookies.addAll(res.cookies)
       ..add(outputBuffer);
 
-    return finalizers.then((_) async {
-      await request.response.flush();
-      await request.response.close();
-
-      if (req.injections.containsKey(PoolResource)) {
-        req.injections[PoolResource].release();
-      }
-
-      if (app.logger != null) {
-        var sw = req.grab<Stopwatch>(Stopwatch);
-
-        if (sw.isRunning) {
-          sw?.stop();
-          app.logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
-              ?.elapsedMilliseconds ?? 'unknown'} ms)");
+    return finalizers.then((_) {
+      return request.response.close().then((_) {
+        if (req.injections.containsKey(PoolResource)) {
+          req.injections[PoolResource].release();
         }
-      }
+
+        if (app.logger != null) {
+          var sw = req.grab<Stopwatch>(Stopwatch);
+
+          if (sw.isRunning) {
+            sw?.stop();
+            app.logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
+                ?.elapsedMilliseconds ?? 'unknown'} ms)");
+          }
+        }
+      });
     });
   }
 
   Future<HttpRequestContextImpl> createRequestContext(HttpRequest request) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
     if (path.length == 0) path = '/';
-    return HttpRequestContextImpl.from(request, app, path).then((req) async {
-      if (_pool != null) req.inject(PoolResource, await _pool.request());
+    return HttpRequestContextImpl.from(request, app, path).then((req) {
+      if (_pool != null) req.inject(PoolResource, _pool.request());
       if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
       return req;
     });
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 3b4f7f33..40493bb2 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -27,7 +27,7 @@ class Controller {
   Controller({this.debug: false, this.injectSingleton: true});
 
   @mustCallSuper
-  Future configureServer(Angel app) async {
+  Future configureServer(Angel app)  {
     _app = app;
 
     if (injectSingleton != false) _app.container.singleton(this);
@@ -56,6 +56,7 @@ class Controller {
     final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
     classMirror.instanceMembers.forEach(routeBuilder);
     configureRoutes(routable);
+    return new Future.value();
   }
 
   Function _routeBuilder(
@@ -85,9 +86,9 @@ class Controller {
             method.parameters[1].type.reflectedType == ResponseContext) {
           // Create a regular route
           routeMappings[name] = routable
-              .addRoute(exposeDecl.method, exposeDecl.path, (req, res) async {
-            var result = await reflectedMethod(req, res);
-            return result is RequestHandler ? await result(req, res) : result;
+              .addRoute(exposeDecl.method, exposeDecl.path, (req, res)  {
+            var result =   reflectedMethod(req, res);
+            return result is RequestHandler ?   result(req, res) : result;
           }, middleware: middleware);
           return;
         }
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 00c08977..71ec5e6a 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -14,10 +14,10 @@ export 'http_response_context.dart';
 
 /// Boots a shared server instance. Use this if launching multiple isolates
 Future<HttpServer> startShared(address, int port) => HttpServer
-    .bind(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, shared: true);
+    .bind(address ?? '127.0.0.1', port ?? 0, shared: true);
 
 Future<HttpServer> Function(dynamic, int) startSharedSecure(SecurityContext securityContext) {
   return (address, int port) => HttpServer.bindSecure(
-      address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0, securityContext,
+      address ?? '127.0.0.1', port ?? 0, securityContext,
       shared: true);
 }
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index e75e2405..c483de8a 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:body_parser/body_parser.dart';
+import 'package:http_parser/http_parser.dart';
 import '../core/core.dart';
 
 /// An implementation of [RequestContext] that wraps a [HttpRequest].
@@ -34,7 +35,7 @@ class HttpRequestContextImpl extends RequestContext {
 
   @override
   String get method {
-    return  _override ?? originalMethod;
+    return _override ?? originalMethod;
   }
 
   @override
@@ -70,7 +71,7 @@ class HttpRequestContextImpl extends RequestContext {
 
   /// Magically transforms an [HttpRequest] into a [RequestContext].
   static Future<HttpRequestContextImpl> from(
-      HttpRequest request, Angel app, String path) async {
+      HttpRequest request, Angel app, String path) {
     HttpRequestContextImpl ctx = new HttpRequestContextImpl();
 
     String override = request.method;
@@ -116,10 +117,10 @@ class HttpRequestContextImpl extends RequestContext {
     ctx._io = request;
 
     if (app.lazyParseBodies != true) {
-      await ctx.parse();
+      return ctx.parse().then((_) => ctx);
     }
 
-    return ctx;
+    return new Future.value(ctx);
   }
 
   @override
@@ -131,8 +132,13 @@ class HttpRequestContextImpl extends RequestContext {
   }
 
   @override
-  Future<BodyParseResult> parseOnce() async {
-    return await parseBody(io,
+  Future<BodyParseResult> parseOnce() {
+    return parseBodyFromStream(
+        io,
+        io.headers.contentType != null
+            ? new MediaType.parse(io.headers.contentType.toString())
+            : null,
+        io.uri,
         storeOriginalBuffer: app.storeOriginalBuffer == true);
   }
 }
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 01f950ce..743fa4fd 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -111,10 +111,10 @@ class HttpResponseContextImpl extends ResponseContext {
   }
 
   @override
-  Future close() async {
+  Future close()  {
     if (_useStream) {
       try {
-        await io.close();
+          io.close();
       } catch(_) {
         // This only seems to occur on `MockHttpRequest`, but
         // this try/catch prevents a crash.
@@ -122,7 +122,8 @@ class HttpResponseContextImpl extends ResponseContext {
     }
 
     _isClosed = true;
-    await super.close();
+      super.close();
     _useStream = false;
+    return new Future.value();
   }
 }
\ No newline at end of file
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
index 06cbe0a3..5aa7463a 100644
--- a/lib/src/stats/metric_server.dart
+++ b/lib/src/stats/metric_server.dart
@@ -58,10 +58,10 @@ class AngelMetrics extends Angel {
   final AngelMetricsStats stats = new AngelMetricsStats._();
 
   @override
-  Future<HttpServer> close() async {
+  Future<HttpServer> close()  {
     _sub?.cancel();
-    await _inner.close();
-    return await super.close();
+      _inner.close();
+    return   super.close();
   }
 
   @override
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 6322b678..ea5eaaf1 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -23,13 +23,14 @@ main() async {
 
 void start(int id) {
   var app = new Angel()..lazyParseBodies = true;
-  var http = new AngelHttp.custom(app, startShared);
+  var http = new AngelHttp.custom(app, startShared, useZone: false);
 
     app.get('/', (req, ResponseContext res) {
-      res.willCloseItself = true;
-      res.io
-        ..write('Hello, world!')
-        ..close();
+      res.write('Hello, world!');
+      //res.willCloseItself = true;
+      //res.io
+      //  ..write('Hello, world!')
+      //  ..close();
       return false;
     });
 
@@ -41,7 +42,7 @@ void start(int id) {
     return oldHandler(e, req, res);
   };
 
-  http.startServer(InternetAddress.LOOPBACK_IP_V4, 3000).then((server) {
+  http.startServer('127.0.0.1', 3000).then((server) {
     print(
         'Instance #$id listening at http://${server.address.address}:${server.port}');
   });
diff --git a/performance/hello/raw.dart b/performance/hello/raw.dart
index 6fb20f5d..72d96ef3 100644
--- a/performance/hello/raw.dart
+++ b/performance/hello/raw.dart
@@ -12,7 +12,7 @@ main() {
 
 void start(int id) {
   HttpServer
-      .bind(InternetAddress.LOOPBACK_IP_V4, 3000, shared: true)
+      .bind('127.0.0.1', 3000, shared: true)
       .then((server) {
     print(
         'Instance #$id listening at http://${server.address.address}:${server.port}');
diff --git a/pubspec.yaml b/pubspec.yaml
index e9f209bb..4bbfed57 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.3
+version: 1.1.4
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -14,6 +14,7 @@ dependencies:
   combinator: ">=1.0.0-beta <2.0.0"
   container: ^0.1.2
   dart2_constant: ^1.0.0
+  http_parser: ^3.0.0
   json_god: ^2.0.0-beta
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
@@ -23,6 +24,7 @@ dependencies:
   path: ">=1.0.0 <2.0.0"
   pool: ^1.0.0
   random_string: ^0.0.1
+  stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
   mock_request: ^1.0.0
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 720cc2e4..d8193967 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
-import 'dart:io';
+import 'dart:io' show BytesBuilder;
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
+import 'package:dart2_constant/io.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -19,8 +20,8 @@ main() {
     app = new Angel();
     app.injectEncoders(
       {
-        'deflate': ZLIB.encoder,
-        'gzip': GZIP.encoder,
+        'deflate': zlib.encoder,
+        'gzip': gzip.encoder,
       },
     );
 
@@ -55,50 +56,50 @@ void encodingTests(Angel getApp()) {
 
     test('encodes if wildcard', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, '*')
+        ..headers.set('accept-encoding', '*')
         ..close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
-      expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'deflate');
+      expect(body, zlib.encode(utf8.encode('Hello, world!')));
     });
 
     test('encodes if wildcard + multiple', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['foo', 'bar', '*'])
+        ..headers.set('accept-encoding', ['foo', 'bar', '*'])
         ..close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'deflate');
-      expect(body, ZLIB.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'deflate');
+      expect(body, zlib.encode(utf8.encode('Hello, world!')));
     });
 
     test('encodes if explicit', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, 'gzip');
+        ..headers.set('accept-encoding', 'gzip');
       await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
-      expect(body, GZIP.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'gzip');
+      expect(body, gzip.encode(utf8.encode('Hello, world!')));
     });
 
     test('only uses one encoder', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set(HttpHeaders.ACCEPT_ENCODING, ['gzip', 'deflate']);
+        ..headers.set('accept-encoding', ['gzip', 'deflate']);
       await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
       
       var body = await getBody(rs);
-      expect(rs.headers.value(HttpHeaders.CONTENT_ENCODING), 'gzip');
-      expect(body, GZIP.encode(utf8.encode('Hello, world!')));
+      expect(rs.headers.value('content-encoding'), 'gzip');
+      expect(body, gzip.encode(utf8.encode('Hello, world!')));
     });
   });
 }
diff --git a/test/exception_test.dart b/test/exception_test.dart
index ae00dc5d..0a852a9a 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -1,8 +1,7 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:matcher/matcher.dart';
-import 'package:meta/meta.dart';
 import 'package:test/test.dart';
 
 main() {
@@ -41,8 +40,8 @@ main() {
   test('toMap = toJson', () {
     var exc = new AngelHttpException.badRequest();
     expect(exc.toMap(), exc.toJson());
-    var json = JSON.encode(exc.toJson());
-    var exc2 = new AngelHttpException.fromJson(json);
+    var json_ = json.encode(exc.toJson());
+    var exc2 = new AngelHttpException.fromJson(json_);
     expect(exc2.toJson(), exc.toJson());
   });
 
@@ -68,7 +67,9 @@ class _IsException extends Matcher {
       description.add('has status code $statusCode and message "$message"');
 
   @override
-  bool matches(@checked AngelHttpException item, Map matchState) {
-    return item.statusCode == statusCode && item.message == message;
+  bool matches(item, Map matchState) {
+    return item is AngelHttpException &&
+        item.statusCode == statusCode &&
+        item.message == message;
   }
 }
diff --git a/test/general_test.dart b/test/general_test.dart
index d08b6876..36550b70 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -1,6 +1,6 @@
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
@@ -32,6 +32,6 @@ main() {
     var response = await client
         .get('$url/foo', headers: {'X-HTTP-Method-Override': 'POST'});
     print('Response: ${response.body}');
-    expect(JSON.decode(response.body), equals({'hello': 'world'}));
+    expect(json.decode(response.body), equals({'hello': 'world'}));
   });
 }
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index ba55578c..20af59cb 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -51,12 +51,13 @@ main() {
       return 'DEFAULT $mode';
     });
 
-    app.logger = new Logger('parameter_meta_test')
+    /*app.logger = new Logger('parameter_meta_test')
       ..onRecord.listen((rec) {
         print(rec);
         if (rec.error != null) print(rec.error);
         if (rec.stackTrace != null) print(rec.stackTrace);
       });
+    */
   });
 
   test('injects header or throws', () async {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 5c9fb0c6..64a67096 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -1,5 +1,5 @@
-import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -16,8 +16,8 @@ main() {
     rq.close();
     await new AngelHttp(app).handleRequest(rq);
     var rs = rq.response;
-    var body = await rs.transform(UTF8.decoder).join();
-    expect(body, JSON.encode('bar'));
+    var body = await rs.transform(utf8.decoder).join();
+    expect(body, json.encode('bar'));
   });
 }
 
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index b53d04ef..ec0fada9 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -1,6 +1,6 @@
-import 'dart:convert';
-import 'dart:io';
+import 'dart:io' show stderr;
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -36,22 +36,22 @@ main() {
   test('String type annotation', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/string/hello'))..close();
     await http.handleRequest(rq);
-    var rs = await rq.response.transform(UTF8.decoder).join();
-    expect(rs, JSON.encode('hello'));
+    var rs = await rq.response.transform(utf8.decoder).join();
+    expect(rs, json.encode('hello'));
   });
 
   test('Primitive after parsed param injection', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/num/parsed/24'))..close();
     await http.handleRequest(rq);
-    var rs = await rq.response.transform(UTF8.decoder).join();
-    expect(rs, JSON.encode(24));
+    var rs = await rq.response.transform(utf8.decoder).join();
+    expect(rs, json.encode(24));
   });
 
   test('globally-injected primitive', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/num/global'))..close();
     await http.handleRequest(rq);
-    var rs = await rq.response.transform(UTF8.decoder).join();
-    expect(rs, JSON.encode(305));
+    var rs = await rq.response.transform(utf8.decoder).join();
+    expect(rs, json.encode(305));
   });
 
   test('unparsed primitive throws error', () async {
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index f4fb9edf..294066b4 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
-import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -13,9 +13,9 @@ main() {
     var app = new Angel()..get('/test/:id', (id) => 'Hello $id');
     var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
     await Future.wait([rq1, rq2, rq3].map(new AngelHttp(app).handleRequest));
-    var body1 = await rq1.response.transform(UTF8.decoder).join(),
-        body2 = await rq2.response.transform(UTF8.decoder).join(),
-        body3 = await rq3.response.transform(UTF8.decoder).join();
+    var body1 = await rq1.response.transform(utf8.decoder).join(),
+        body2 = await rq2.response.transform(utf8.decoder).join(),
+        body3 = await rq3.response.transform(utf8.decoder).join();
     print('Response #1: $body1');
     print('Response #2: $body2');
     print('Response #3: $body3');
diff --git a/test/routing_test.dart b/test/routing_test.dart
index d8eb93cd..4e95e7d0 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -1,6 +1,5 @@
-import 'dart:convert';
-import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
@@ -96,7 +95,7 @@ main() {
 
     client = new http.Client();
     var server =
-        await new AngelHttp(app).startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+        await new AngelHttp(app).startServer('127.0.0.1', 0);
     url = "http://${server.address.host}:${server.port}";
   });
 
@@ -118,10 +117,10 @@ main() {
   test('Can match url with multiple parameters', () async {
     var response = await client.get('$url/name/HELLO/last/WORLD');
     print('Response: ${response.body}');
-    var json = JSON.decode(response.body);
-    expect(json, new isInstanceOf<Map<String, String>>());
-    expect(json['first'], equals('HELLO'));
-    expect(json['last'], equals('WORLD'));
+    var json_ = json.decode(response.body);
+    expect(json_, new isInstanceOf<Map<String, String>>());
+    expect(json_['first'], equals('HELLO'));
+    expect(json_['last'], equals('WORLD'));
   });
 
   test('Chained routes', () async {
@@ -131,16 +130,16 @@ main() {
 
   test('Can nest another Angel instance', () async {
     var response = await client.post('$url/nes/ted/foo');
-    var json = JSON.decode(response.body);
-    expect(json['route'], equals('foo'));
+    var json_ = json.decode(response.body);
+    expect(json_['route'], equals('foo'));
   });
 
   test('Can parse parameters from a nested Angel instance', () async {
     var response = await client.get('$url/todos/1337/action/test');
-    var json = JSON.decode(response.body);
-    print('JSON: $json');
-    expect(json['id'], equals('1337'));
-    expect(json['action'], equals('test'));
+    var json_ = json.decode(response.body);
+    print('JSON: $json_');
+    expect(json_['id'], equals('1337'));
+    expect(json_['action'], equals('test'));
   });
 
   test('Can add and use named middleware', () async {
@@ -156,10 +155,11 @@ main() {
 
   test('Can serialize function result as JSON', () async {
     Map headers = {'Content-Type': 'application/json'};
-    String postData = JSON.encode({'it': 'works'});
+    String postData = json.encode({'it': 'works'});
     var response =
         await client.post("$url/lambda", headers: headers, body: postData);
-    expect(JSON.decode(response.body)['it'], equals('works'));
+    print('Response: ${response.body}');
+    expect(json.decode(response.body)['it'], equals('works'));
   });
 
   test('Fallback routes', () async {
@@ -178,14 +178,14 @@ main() {
   test('Redirect to named routes', () async {
     var response = await client.get('$url/named');
     print(response.body);
-    expect(JSON.decode(response.body), equals('Hello tests'));
+    expect(json.decode(response.body), equals('Hello tests'));
   });
 
   test('Match routes, even with query params', () async {
     var response =
         await client.get("$url/log?foo=bar&bar=baz&baz.foo=bar&baz.bar=foo");
     print(response.body);
-    expect(JSON.decode(response.body), equals('Logged'));
+    expect(json.decode(response.body), equals('Logged'));
 
     response = await client.get("$url/query/foo?bar=baz");
     print(response.body);
diff --git a/test/server_test.dart b/test/server_test.dart
index fec73b5f..558ffbaa 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:matcher/matcher.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -51,7 +51,7 @@ main() {
       ContentType.HTML.mimeType,
     );
     expect(rs.statusCode, e.statusCode);
-    var body = await rs.transform(UTF8.decoder).join();
+    var body = await rs.transform(utf8.decoder).join();
     expect(body, contains('<title>${e.message}</title>'));
     expect(body, contains('<li>foo</li>'));
     expect(body, contains('<li>bar</li>'));
@@ -59,9 +59,7 @@ main() {
 
   test('plug-ins run on startup', () async {
     var app = new Angel();
-    app.startupHooks.add((app) async {
-      app.configuration['two'] = 2;
-    });
+    app.startupHooks.add((app) => app.configuration['two'] = 2);
 
     var http = new AngelHttp(app);
     await http.startServer();
@@ -92,8 +90,8 @@ main() {
     app.get('/', (String a) => a);
     var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
-    expect(body, JSON.encode('b'));
+    var body = await rq.response.transform(utf8.decoder).join();
+    expect(body, json.encode('b'));
   });
 
   test('global injected serializer', () async {
@@ -102,7 +100,7 @@ main() {
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
     var rq = new MockHttpRequest('GET', $foo)..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
+    var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'x');
   });
 
@@ -157,7 +155,7 @@ main() {
       app.get('/wtf', () => throw new AngelHttpException.forbidden());
       app.get('/wtf2', () => throw new AngelHttpException.forbidden());
       http = new AngelHttp(app);
-      await http.startServer(InternetAddress.LOOPBACK_IP_V4, 0);
+      await http.startServer('127.0.0.1', 0);
 
       var oldHandler = app.errorHandler;
       app.errorHandler = (e, req, res) {
@@ -208,9 +206,9 @@ class CustomCloseService extends Service {
   int value = 2;
 
   @override
-  Future close() {
+  void close() {
     value = 3;
-    return super.close();
+    super.close();
   }
 }
 
diff --git a/test/services_test.dart b/test/services_test.dart
index a8909aaa..7ea687fe 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,7 +1,8 @@
-import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
+import 'package:stack_trace/stack_trace.dart';
 import 'package:test/test.dart';
 
 class Todo extends Model {
@@ -23,7 +24,7 @@ main() {
       ..use('/todos', new TypedService<Todo>(new MapService()))
       ..errorHandler = (e, req, res) {
         print('Whoops: ${e.error}');
-        print(e.stackTrace);
+        if (e.stackTrace != null) print(new Chain.forTrace(e.stackTrace).terse);
       };
 
     var server = await new AngelHttp(app).startServer();
@@ -45,7 +46,7 @@ main() {
       print(response.body);
       expect(response.body, equals('[]'));
       print(response.body);
-      expect(JSON.decode(response.body).length, 0);
+      expect(json.decode(response.body).length, 0);
     });
 
     test('can create data', () async {
@@ -97,12 +98,12 @@ main() {
       String postData = god.serialize({'text': 'Hello, world!'});
       var created = await client
           .post("$url/todos", headers: headers, body: postData)
-          .then((r) => JSON.decode(r.body));
+          .then((r) => json.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);
-      var json = god.deserialize(response.body);
-      print(json);
-      expect(json['text'], equals('Hello, world!'));
+      var json_ = god.deserialize(response.body);
+      print(json_);
+      expect(json_['text'], equals('Hello, world!'));
     });
   });
 }
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index e2e9e489..798442ab 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
+import 'dart:io' show stderr;
 import 'package:angel_framework/angel_framework.dart';
+import 'package:dart2_constant/convert.dart';
+import 'package:dart2_constant/io.dart';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -23,8 +24,8 @@ main() {
 
     app.injectEncoders(
       {
-        'deflate': ZLIB.encoder,
-        'gzip': GZIP.encoder,
+        'deflate': zlib.encoder,
+        'gzip': gzip.encoder,
       },
     );
 
@@ -73,7 +74,7 @@ main() {
   _expectHelloBye(String path) async {
     var rq = new MockHttpRequest('GET', Uri.parse(path))..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
+    var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'Hello, world!bye');
   }
 
@@ -84,7 +85,7 @@ main() {
   test('cannot write after close', () async {
     var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
     await http.handleRequest(rq);
-    var body = await rq.response.transform(UTF8.decoder).join();
+    var body = await rq.response.transform(utf8.decoder).join();
 
     if (rq.response.statusCode != 32)
       throw 'overwrite should throw error; response: $body';
@@ -94,7 +95,7 @@ main() {
     try {
       var rq = new MockHttpRequest('GET', Uri.parse('/error'))..close();
       await http.handleRequest(rq);
-      var body = await rq.response.transform(UTF8.decoder).join();
+      var body = await rq.response.transform(utf8.decoder).join();
       throw 'addError should throw error; response: $body';
     } on StateError {
       // Should throw error...

From e2b388b10729fe39f90184db0ec093ad4d82a523 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 8 Jun 2018 03:09:54 -0400
Subject: [PATCH 205/414] Test against Dart 1.x

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 34a2a649..14148ad6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: dart
 dart:
   - dev
+  - stable
 before_script: chmod +x ./tool/travis.sh
 script: ./tool/travis.sh
\ No newline at end of file

From 00ed942c4eeb17175a56087cdb4ef7f23469948d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 8 Jun 2018 03:20:09 -0400
Subject: [PATCH 206/414] 1.1.4+1

---
 .idea/workspace.xml          | 182 +++++++++++++++--------------------
 CHANGELOG.md                 |   3 +
 lib/src/http/angel_http.dart |  11 ++-
 pubspec.yaml                 |   2 +-
 4 files changed, 90 insertions(+), 108 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index df55ab7d..d82f86ce 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,44 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/Match_routes__even_with_query_params_in_routing_test_dart.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/can_fetch_data_in_services_test_dart.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/analysis_options.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/analysis_options.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/angel_base.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/angel_base.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/performance/hello/raw.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/raw.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -101,27 +65,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="399" column="31" lean-forward="true" selection-start-line="399" selection-start-column="31" selection-end-line="399" selection-end-column="31" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="100">
-              <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -134,6 +77,24 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/.travis.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="48">
+              <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/example/main.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="138">
+              <caret line="24" column="46" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -149,18 +110,18 @@
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
+            <state relative-caret-position="130">
+              <caret line="28" column="17" lean-forward="true" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="48">
-                <caret line="3" column="63" selection-start-line="3" selection-start-column="63" selection-end-line="3" selection-end-column="63" />
+              <first_editor relative-caret-position="128">
+                <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
               </first_editor>
               <second_editor />
             </state>
@@ -277,7 +238,6 @@
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
@@ -296,7 +256,6 @@
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
@@ -312,8 +271,10 @@
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/.travis.yml" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
       </list>
     </option>
   </component>
@@ -347,11 +308,21 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="example" type="cbb8eebc:String" user="example" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
               <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="tool" type="cbb8eebc:String" user="tool" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -400,7 +371,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.performance::hello (PRODUCTION)">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -670,14 +641,7 @@
       <workItem from="1526435792950" duration="2668000" />
       <workItem from="1526439485584" duration="1904000" />
       <workItem from="1528385352077" duration="29000" />
-      <workItem from="1528432209488" duration="9138000" />
-    </task>
-    <task id="LOCAL-00035" summary="Updated `use`">
-      <created>1506092171442</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1506092171442</updated>
+      <workItem from="1528432209488" duration="9720000" />
     </task>
     <task id="LOCAL-00036" summary="+2">
       <created>1506092186428</created>
@@ -1015,7 +979,14 @@
       <option name="project" value="LOCAL" />
       <updated>1526440683707</updated>
     </task>
-    <option name="localTasksCounter" value="84" />
+    <task id="LOCAL-00084" summary="Test against Dart 1.x">
+      <created>1528441794043</created>
+      <option name="number" value="00084" />
+      <option name="presentableId" value="LOCAL-00084" />
+      <option name="project" value="LOCAL" />
+      <updated>1528441794044</updated>
+    </task>
+    <option name="localTasksCounter" value="85" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1051,7 +1022,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="144865000" />
+    <option name="totallyTimeSpent" value="145447000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1064,7 +1035,6 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="24" y="22" width="1360" height="797" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Tool Output" order="7" />
@@ -1082,14 +1052,14 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32763532" />
-      <window_info anchor="bottom" id="Messages" order="7" visible="true" weight="0.32285714" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.32285714" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.40142858" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.40142858" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.48" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23748103" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23748103" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1114,7 +1084,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Deprecated createZoneForRequest" />
     <MESSAGE value="Deprecated `ServerGenerator`" />
     <MESSAGE value="Updated tests to use `AngelHttp` API" />
     <MESSAGE value="Added example/main.dart" />
@@ -1139,7 +1108,8 @@
     <MESSAGE value="Use dart2_constant" />
     <MESSAGE value="Fixed all broken tests" />
     <MESSAGE value="1.1.3" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.1.3" />
+    <MESSAGE value="Test against Dart 1.x" />
+    <option name="LAST_COMMIT_MESSAGE" value="Test against Dart 1.x" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1150,13 +1120,6 @@
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="24" selection-start-line="4" selection-start-column="24" selection-end-line="4" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="133">
@@ -1324,13 +1287,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
@@ -1525,23 +1481,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="48">
-            <caret line="3" column="63" selection-start-line="3" selection-start-column="63" selection-end-line="3" selection-end-column="63" />
+          <first_editor relative-caret-position="128">
+            <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="130">
+          <caret line="28" column="17" lean-forward="true" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="138">
+          <caret line="24" column="46" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ecac991..d0752ddd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.4+1
+* Ensure correct error handling when `useZone` is `false`.
+ 
 # 1.1.4
 * Remove all usages of `async`/`await` in the core library.
 * `AngelConfigurer` now accepts `FutureOr`.
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 72c83eb0..64e0e0f9 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -160,7 +160,16 @@ class AngelHttp {
         }
 
         if (useZone == false) {
-          return handle().whenComplete(() => res.dispose());
+          return handle().catchError((e, st) {
+            if (e is FormatException)
+              throw new AngelHttpException.badRequest(message: e.message)
+                ..stackTrace = st;
+            throw new AngelHttpException(e, stackTrace: st, statusCode: 500);
+          }, test: (e) => e is! AngelHttpException).catchError(
+              (AngelHttpException e, StackTrace st) {
+            return handleAngelHttpException(
+                e, e.stackTrace ?? st, req, res, request);
+          }).whenComplete(() => res.dispose());
         } else {
           var zoneSpec = new ZoneSpecification(
             print: (self, parent, zone, line) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 4bbfed57..52612af4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4
+version: 1.1.4+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 156d5290c57bfc3c4bf6daa755adc98a916210fb Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 10 Jun 2018 18:34:05 -0400
Subject: [PATCH 207/414] 1.1.4+2

---
 .idea/runConfigurations/handle_error_dart.xml |   7 +
 .idea/runConfigurations/view_dart.xml         |   7 +
 .idea/workspace.xml                           | 582 ++++++++++--------
 CHANGELOG.md                                  |   6 +
 example/handle_error.dart                     |  18 +
 example/view.dart                             |  16 +
 lib/src/core/response_context.dart            |   9 +-
 lib/src/http/angel_http.dart                  |   4 +-
 lib/src/http/http_response_context.dart       |  49 +-
 performance/hello/main.dart                   |  14 +-
 pubspec.yaml                                  |   2 +-
 11 files changed, 429 insertions(+), 285 deletions(-)
 create mode 100644 .idea/runConfigurations/handle_error_dart.xml
 create mode 100644 .idea/runConfigurations/view_dart.xml
 create mode 100644 example/handle_error.dart
 create mode 100644 example/view.dart

diff --git a/.idea/runConfigurations/handle_error_dart.xml b/.idea/runConfigurations/handle_error_dart.xml
new file mode 100644
index 00000000..5df40720
--- /dev/null
+++ b/.idea/runConfigurations/handle_error_dart.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="handle_error.dart" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/example/handle_error.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/view_dart.xml b/.idea/runConfigurations/view_dart.xml
new file mode 100644
index 00000000..de62a90c
--- /dev/null
+++ b/.idea/runConfigurations/view_dart.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="view.dart" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/example/view.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d82f86ce..8b2f7e8b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/handle_error_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/view_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/example/view.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -29,7 +38,7 @@
       <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1949">
+            <state relative-caret-position="6336">
               <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
             </state>
           </provider>
@@ -38,26 +47,17 @@
       <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-61">
-              <caret line="7" column="31" lean-forward="true" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+            <state relative-caret-position="96">
+              <caret line="7" column="31" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
-              <caret line="28" column="33" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="363">
-              <caret line="162" column="32" lean-forward="true" selection-start-line="162" selection-start-column="32" selection-end-line="162" selection-end-column="32" />
+            <state relative-caret-position="192">
+              <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -65,14 +65,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2275">
-              <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
-              <folding>
-                <element signature="e#39#59#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="18">
+              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
             </state>
           </provider>
         </entry>
@@ -81,28 +78,7 @@
         <entry file="file://$PROJECT_DIR$/.travis.yml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="48">
-              <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/example/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="138">
-              <caret line="24" column="46" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="186">
-              <caret line="102" column="6" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
-              <folding>
-                <element signature="e#0#54#0" expanded="true" />
-              </folding>
+              <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -110,20 +86,82 @@
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="130">
-              <caret line="28" column="17" lean-forward="true" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
+            <state relative-caret-position="16">
+              <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="128">
-                <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1024">
+              <caret line="100" column="30" lean-forward="true" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
+              <folding>
+                <element signature="e#477#533#0" />
+                <element signature="e#575#591#0" />
+                <element signature="e#594#637#0" />
+                <element signature="e#1288#1362#0" />
+                <element signature="e#1760#1959#0" />
+                <element signature="e#1883#1899#0" />
+                <element signature="e#1912#1922#0" />
+                <element signature="e#1963#2006#0" />
+                <element signature="e#2585#2672#0" />
+                <element signature="e#3283#3337#0" />
+                <element signature="e#3406#3426#0" />
+                <element signature="e#3465#3504#0" />
+                <element signature="e#3595#3654#0" />
+                <element signature="e#3658#3719#0" />
+                <element signature="e#3992#4376#0" />
+                <element signature="e#4380#4480#0" />
+                <element signature="e#4899#5066#0" />
+                <element signature="e#5070#5169#0" />
+                <element signature="e#5309#5369#0" />
+                <element signature="e#6228#6267#0" />
+                <element signature="e#6511#7181#0" />
+                <element signature="e#6747#7164#1" />
+                <element signature="e#7282#7806#0" />
+                <element signature="e#7348#7593#0" />
+                <element signature="e#7769#7801#0" />
+                <element signature="e#7921#8819#0" />
+                <element signature="e#8079#8175#0" />
+                <element signature="e#8325#8376#0" />
+                <element signature="e#8486#8573#0" />
+                <element signature="e#8905#9052#0" />
+                <element signature="e#9056#9092#0" />
+                <element signature="e#9204#9488#0" />
+                <element signature="e#9492#9528#0" />
+                <element signature="e#9874#10200#0" />
+                <element signature="e#10316#10367#0" />
+                <element signature="e#10761#10843#0" />
+                <element signature="e#10921#11280#0" />
+                <element signature="e#11329#11475#0" />
+                <element signature="e#11523#11574#0" />
+                <element signature="e#11647#11688#0" />
+                <element signature="n#!!block;n#_LockableBytesBuilder#0" />
+                <element signature="e#11786#11835#0" />
+                <element signature="n#!!block;n#_LockableBytesBuilderImpl#0" />
+                <element signature="e#11967#11980#0" />
+                <element signature="e#12051#12099#0" />
+                <element signature="e#12129#12154#0" />
+                <element signature="e#12196#12271#0" />
+                <element signature="e#12310#12388#0" />
+                <element signature="e#12417#12440#0" />
+                <element signature="e#12628#12662#0" />
+                <element signature="e#12698#12730#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="201">
+              <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -140,7 +178,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>getV</find>
       <find>zone</find>
       <find>zone.run</find>
       <find>aaa</find>
@@ -170,6 +207,7 @@
       <find>MID</find>
       <find>beforeIndex</find>
       <find>read(</find>
+      <find>new Trac</find>
     </findStrings>
     <replaceStrings>
       <replace>modify</replace>
@@ -199,9 +237,7 @@
       <replace>var body = await getBody(rs);</replace>
       <replace />
       <replace>=</replace>
-      <replace>=</replace>
       <replace>{</replace>
-      <replace />
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -224,9 +260,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
@@ -248,9 +281,7 @@
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
@@ -269,12 +300,17 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/example/async.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/example/view.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/example/handle_error.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
       </list>
     </option>
   </component>
@@ -288,8 +324,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="24" />
-    <option name="y" value="22" />
+    <option name="x" value="50" />
+    <option name="y" value="23" />
     <option name="width" value="1360" />
     <option name="height" value="797" />
   </component>
@@ -313,6 +349,31 @@
               <item name="framework" type="cbb8eebc:String" user="framework" />
               <item name="example" type="cbb8eebc:String" user="example" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="core" type="cbb8eebc:String" user="core" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -371,7 +432,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Command Line App.performance::hello (PRODUCTION)">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -563,6 +624,8 @@
       <item itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
       <item itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
       <item itemvalue="Dart Test.can fetch data in services_test.dart" />
+      <item itemvalue="Dart Command Line App.view.dart" />
+      <item itemvalue="Dart Command Line App.handle_error.dart" />
     </list>
   </component>
   <component name="SvnConfiguration">
@@ -641,14 +704,8 @@
       <workItem from="1526435792950" duration="2668000" />
       <workItem from="1526439485584" duration="1904000" />
       <workItem from="1528385352077" duration="29000" />
-      <workItem from="1528432209488" duration="9720000" />
-    </task>
-    <task id="LOCAL-00036" summary="+2">
-      <created>1506092186428</created>
-      <option name="number" value="00036" />
-      <option name="presentableId" value="LOCAL-00036" />
-      <option name="project" value="LOCAL" />
-      <updated>1506092186428</updated>
+      <workItem from="1528432209488" duration="9947000" />
+      <workItem from="1528668755509" duration="1233000" />
     </task>
     <task id="LOCAL-00037" summary="+3">
       <created>1506275793202</created>
@@ -986,7 +1043,14 @@
       <option name="project" value="LOCAL" />
       <updated>1528441794044</updated>
     </task>
-    <option name="localTasksCounter" value="85" />
+    <task id="LOCAL-00085" summary="1.1.4+1">
+      <created>1528442409476</created>
+      <option name="number" value="00085" />
+      <option name="presentableId" value="LOCAL-00085" />
+      <option name="project" value="LOCAL" />
+      <updated>1528442409476</updated>
+    </task>
+    <option name="localTasksCounter" value="86" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1022,7 +1086,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="145447000" />
+    <option name="totallyTimeSpent" value="146907000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1034,7 +1098,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="24" y="22" width="1360" height="797" extended-state="0" />
+    <frame x="50" y="23" width="1360" height="797" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Tool Output" order="7" />
@@ -1056,24 +1121,24 @@
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.40142858" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.48" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23748103" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24051593" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Data View" order="4" />
       <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" id="Data View" order="4" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1084,7 +1149,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Deprecated `ServerGenerator`" />
     <MESSAGE value="Updated tests to use `AngelHttp` API" />
     <MESSAGE value="Added example/main.dart" />
     <MESSAGE value="Create HttpRequestContextImpl" />
@@ -1109,7 +1173,8 @@
     <MESSAGE value="Fixed all broken tests" />
     <MESSAGE value="1.1.3" />
     <MESSAGE value="Test against Dart 1.x" />
-    <option name="LAST_COMMIT_MESSAGE" value="Test against Dart 1.x" />
+    <MESSAGE value="1.1.4+1" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.1.4+1" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1117,30 +1182,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="58" column="9" lean-forward="true" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
@@ -1206,9 +1247,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="116">
           <caret line="88" column="47" selection-start-line="88" selection-start-column="47" selection-end-line="88" selection-end-column="47" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1216,9 +1254,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
           <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1233,9 +1268,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="169">
           <caret line="17" column="49" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1246,13 +1278,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="126" column="30" selection-start-line="126" selection-start-column="30" selection-end-line="126" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="122">
@@ -1264,9 +1289,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="152">
           <caret line="44" column="6" selection-start-line="44" selection-start-column="6" selection-end-line="44" selection-end-column="6" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1274,9 +1296,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="313">
           <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" />
-          <folding>
-            <element signature="e#1#18#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1287,23 +1306,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="15" column="27" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="114">
           <caret line="43" column="52" selection-start-line="43" selection-start-column="52" selection-end-line="43" selection-end-column="52" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1311,9 +1317,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="109">
           <caret line="64" column="24" lean-forward="true" selection-start-line="64" selection-start-column="24" selection-end-line="64" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1331,23 +1334,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="79">
-          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="119" column="40" selection-start-line="119" selection-start-column="40" selection-end-line="119" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/opt/dart/libexec/lib/async/async.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1355,16 +1341,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
           <caret line="29" column="27" lean-forward="true" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="21" column="15" lean-forward="true" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
         </state>
       </provider>
     </entry>
@@ -1389,16 +1365,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="399" column="31" lean-forward="true" selection-start-line="399" selection-start-column="31" selection-end-line="399" selection-end-column="31" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
@@ -1410,9 +1376,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="131">
           <caret line="67" column="45" selection-start-line="67" selection-start-column="45" selection-end-line="67" selection-end-column="45" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1420,15 +1383,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="186">
           <caret line="102" column="6" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2275">
+        <state relative-caret-position="3520">
           <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
           <folding>
             <element signature="e#39#59#0" expanded="true" />
@@ -1438,25 +1398,11 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1949">
+        <state relative-caret-position="6336">
           <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-61">
-          <caret line="7" column="31" lean-forward="true" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="16" column="59" lean-forward="true" selection-start-line="16" selection-start-column="59" selection-end-line="16" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/async/future.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="631">
@@ -1464,10 +1410,187 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="28" column="33" lean-forward="true" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="7" lean-forward="true" selection-end-line="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="83">
+          <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1024">
+          <caret line="100" column="30" lean-forward="true" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
+          <folding>
+            <element signature="e#477#533#0" />
+            <element signature="e#575#591#0" />
+            <element signature="e#594#637#0" />
+            <element signature="e#1288#1362#0" />
+            <element signature="e#1760#1959#0" />
+            <element signature="e#1883#1899#0" />
+            <element signature="e#1912#1922#0" />
+            <element signature="e#1963#2006#0" />
+            <element signature="e#2585#2672#0" />
+            <element signature="e#3283#3337#0" />
+            <element signature="e#3406#3426#0" />
+            <element signature="e#3465#3504#0" />
+            <element signature="e#3595#3654#0" />
+            <element signature="e#3658#3719#0" />
+            <element signature="e#3992#4376#0" />
+            <element signature="e#4380#4480#0" />
+            <element signature="e#4899#5066#0" />
+            <element signature="e#5070#5169#0" />
+            <element signature="e#5309#5369#0" />
+            <element signature="e#6228#6267#0" />
+            <element signature="e#6511#7181#0" />
+            <element signature="e#6747#7164#1" />
+            <element signature="e#7282#7806#0" />
+            <element signature="e#7348#7593#0" />
+            <element signature="e#7769#7801#0" />
+            <element signature="e#7921#8819#0" />
+            <element signature="e#8079#8175#0" />
+            <element signature="e#8325#8376#0" />
+            <element signature="e#8486#8573#0" />
+            <element signature="e#8905#9052#0" />
+            <element signature="e#9056#9092#0" />
+            <element signature="e#9204#9488#0" />
+            <element signature="e#9492#9528#0" />
+            <element signature="e#9874#10200#0" />
+            <element signature="e#10316#10367#0" />
+            <element signature="e#10761#10843#0" />
+            <element signature="e#10921#11280#0" />
+            <element signature="e#11329#11475#0" />
+            <element signature="e#11523#11574#0" />
+            <element signature="e#11647#11688#0" />
+            <element signature="n#!!block;n#_LockableBytesBuilder#0" />
+            <element signature="e#11786#11835#0" />
+            <element signature="n#!!block;n#_LockableBytesBuilderImpl#0" />
+            <element signature="e#11967#11980#0" />
+            <element signature="e#12051#12099#0" />
+            <element signature="e#12129#12154#0" />
+            <element signature="e#12196#12271#0" />
+            <element signature="e#12310#12388#0" />
+            <element signature="e#12417#12440#0" />
+            <element signature="e#12628#12662#0" />
+            <element signature="e#12698#12730#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="237" column="31" lean-forward="true" selection-start-line="237" selection-start-column="31" selection-end-line="237" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="201">
+          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="261" column="35" lean-forward="true" selection-start-line="261" selection-start-column="35" selection-end-line="261" selection-end-column="35" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="16" column="59" lean-forward="true" selection-start-line="16" selection-start-column="59" selection-end-line="16" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/core/stacktrace.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="28" column="15" lean-forward="true" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="363">
-          <caret line="162" column="32" lean-forward="true" selection-start-line="162" selection-start-column="32" selection-end-line="162" selection-end-column="32" />
+        <state relative-caret-position="402">
+          <caret line="191" column="45" selection-start-line="191" selection-start-column="45" selection-end-line="191" selection-end-column="45" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="7" column="31" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="64">
+            <caret line="4" column="67" selection-start-line="4" selection-start-column="67" selection-end-line="4" selection-end-column="67" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1476,39 +1599,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="28" column="33" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="128">
-            <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="130">
-          <caret line="28" column="17" lean-forward="true" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="24" column="46" selection-start-line="24" selection-start-column="46" selection-end-line="24" selection-end-column="46" />
+        <state relative-caret-position="18">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0752ddd..f900158d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.1.4+2
+* Fix a bug that prevented proper rendering of views.
+* Fixed a hidden bug that prevents error handling when a
+stack trace is `null`.
+* Fixed a bug that prevented proper handling of `content-encoding`.
+
 # 1.1.4+1
 * Ensure correct error handling when `useZone` is `false`.
  
diff --git a/example/handle_error.dart b/example/handle_error.dart
new file mode 100644
index 00000000..5b5b2d50
--- /dev/null
+++ b/example/handle_error.dart
@@ -0,0 +1,18 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:logging/logging.dart';
+
+main() async {
+  var app = new Angel()
+    ..lazyParseBodies = true
+    ..logger = (new Logger('angel')..onRecord.listen(print))
+    ..encoders.addAll({'gzip': gzip.encoder});
+
+  app.use(() => new Future.error('Throwing just because I feel like!'));
+
+  var http = new AngelHttp(app);
+  var server = await http.startServer('127.0.0.1', 3000);
+  var url = 'http://${server.address.address}:${server.port}';
+  print('Listening at $url');
+}
diff --git a/example/view.dart b/example/view.dart
new file mode 100644
index 00000000..72cd14f9
--- /dev/null
+++ b/example/view.dart
@@ -0,0 +1,16 @@
+import 'package:angel_framework/angel_framework.dart';
+
+main() async {
+  var app = new Angel();
+
+  app.viewGenerator = (name, [data]) async =>
+      'View generator invoked with name $name and data: $data';
+
+  // Index route. Returns JSON.
+  app.get('/', (ResponseContext res) => res.render('index', {'foo': 'bar'}));
+
+  var http = new AngelHttp(app);
+  var server = await http.startServer('127.0.0.1', 3000);
+  var url = 'http://${server.address.address}:${server.port}';
+  print('Listening at $url');
+}
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 4851c21b..1f3e8ab2 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -200,10 +200,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) {
     if (!isOpen) throw closed();
-    write(app.viewGenerator(view, data));
-    headers['content-type'] = ContentType.HTML.toString();
-    end();
-    return new Future.value();
+    return app.viewGenerator(view, data).then((content) {
+      write(content);
+      headers['content-type'] = ContentType.HTML.toString();
+      end();
+    });
   }
 
   /// Redirects to user to the given URL.
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 64e0e0f9..0f3a8945 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -179,7 +179,7 @@ class AngelHttp {
                 parent.print(zone, line);
             },
             handleUncaughtError: (self, parent, zone, error, stackTrace) {
-              var trace = new Trace.from(stackTrace).terse;
+              var trace = new Trace.from(stackTrace ?? StackTrace.current).terse;
 
               return new Future(() {
                 AngelHttpException e;
@@ -199,7 +199,7 @@ class AngelHttp {
 
                 return handleAngelHttpException(e, trace, req, res, request);
               }).catchError((e, st) {
-                var trace = new Trace.from(st).terse;
+                var trace = new Trace.from(st ?? StackTrace.current).terse;
                 request.response.close();
                 // Ideally, we won't be in a position where an absolutely fatal error occurs,
                 // but if so, we'll need to log it.
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 743fa4fd..56f3b324 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -67,32 +67,37 @@ class HttpResponseContextImpl extends ResponseContext {
     Stream<List<int>> output = stream;
 
     if (encoders.isNotEmpty && correspondingRequest != null) {
-      var allowedEncodings =
-      (correspondingRequest.headers[HttpHeaders.ACCEPT_ENCODING] ?? [])
-          .map((str) {
+      var allowedEncodings = correspondingRequest.headers
+          .value(HttpHeaders.ACCEPT_ENCODING)
+          ?.split(',')
+          ?.map((s) => s.trim())
+          ?.where((s) => s.isNotEmpty)
+          ?.map((str) {
         // Ignore quality specifications in accept-encoding
         // ex. gzip;q=0.8
         if (!str.contains(';')) return str;
         return str.split(';')[0];
       });
 
-      for (var encodingName in allowedEncodings) {
-        Converter<List<int>, List<int>> encoder;
-        String key = encodingName;
+      if (allowedEncodings != null) {
+        for (var encodingName in allowedEncodings) {
+          Converter<List<int>, List<int>> encoder;
+          String key = encodingName;
 
-        if (encoders.containsKey(encodingName))
-          encoder = encoders[encodingName];
-        else if (encodingName == '*') {
-          encoder = encoders[key = encoders.keys.first];
-        }
-
-        if (encoder != null) {
-          if (firstStream) {
-            io.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+          if (encoders.containsKey(encodingName))
+            encoder = encoders[encodingName];
+          else if (encodingName == '*') {
+            encoder = encoders[key = encoders.keys.first];
           }
 
-          output = encoders[key].bind(output);
-          break;
+          if (encoder != null) {
+            if (firstStream) {
+              io.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+            }
+
+            output = encoders[key].bind(output);
+            break;
+          }
         }
       }
     }
@@ -111,19 +116,19 @@ class HttpResponseContextImpl extends ResponseContext {
   }
 
   @override
-  Future close()  {
+  Future close() {
     if (_useStream) {
       try {
-          io.close();
-      } catch(_) {
+        io.close();
+      } catch (_) {
         // This only seems to occur on `MockHttpRequest`, but
         // this try/catch prevents a crash.
       }
     }
 
     _isClosed = true;
-      super.close();
+    super.close();
     _useStream = false;
     return new Future.value();
   }
-}
\ No newline at end of file
+}
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index ea5eaaf1..6127e30c 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -25,15 +25,7 @@ void start(int id) {
   var app = new Angel()..lazyParseBodies = true;
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
-    app.get('/', (req, ResponseContext res) {
-      res.write('Hello, world!');
-      //res.willCloseItself = true;
-      //res.io
-      //  ..write('Hello, world!')
-      //  ..close();
-      return false;
-    });
-
+  app.get('/', (ResponseContext res) => res.write('Hello, world!'));
 
   var oldHandler = app.errorHandler;
   app.errorHandler = (e, req, res) {
@@ -43,7 +35,7 @@ void start(int id) {
   };
 
   http.startServer('127.0.0.1', 3000).then((server) {
-    print(
-        'Instance #$id listening at http://${server.address.address}:${server.port}');
+    print('Instance #$id listening at http://${server.address.address}:${server
+            .port}');
   });
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 52612af4..1bdec0f0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+1
+version: 1.1.4+2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 5ea8ac31ff613914e1001a3245a2dcac5bb5d0bf Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 10 Jun 2018 19:17:11 -0400
Subject: [PATCH 208/414] Fix async bugs

---
 .idea/libraries/Dart_Packages.xml           |  56 +++
 .idea/runConfigurations/templating_dart.xml |   7 +
 .idea/workspace.xml                         | 521 +++++++++-----------
 CHANGELOG.md                                |   5 +
 example/templating.dart                     |  23 +
 example/views/index.jl                      |   9 +
 lib/src/core/response_context.dart          |   5 +-
 lib/src/core/server.dart                    |   5 +-
 lib/src/http/angel_http.dart                |  29 +-
 pubspec.yaml                                |   3 +-
 test/controller_test.dart                   |   1 -
 test/di_test.dart                           |   1 -
 12 files changed, 352 insertions(+), 313 deletions(-)
 create mode 100644 .idea/runConfigurations/templating_dart.xml
 create mode 100644 example/templating.dart
 create mode 100644 example/views/index.jl

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index fbbbfdf7..69c608f9 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -16,6 +16,13 @@
             </list>
           </value>
         </entry>
+        <entry key="angel_jael">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="angel_model">
           <value>
             <list>
@@ -79,6 +86,13 @@
             </list>
           </value>
         </entry>
+        <entry key="code_buffer">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.0/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="collection">
           <value>
             <list>
@@ -128,6 +142,13 @@
             </list>
           </value>
         </entry>
+        <entry key="file">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-2.3.7/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="front_end">
           <value>
             <list>
@@ -177,6 +198,13 @@
             </list>
           </value>
         </entry>
+        <entry key="intl">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="io">
           <value>
             <list>
@@ -191,6 +219,20 @@
             </list>
           </value>
         </entry>
+        <entry key="jael">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="jael_preprocessor">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="js">
           <value>
             <list>
@@ -394,6 +436,13 @@
             </list>
           </value>
         </entry>
+        <entry key="symbol_table">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/symbol_table-1.0.4/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="term_glyph">
           <value>
             <list>
@@ -455,6 +504,7 @@
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
@@ -464,6 +514,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
@@ -471,6 +522,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-2.3.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
@@ -478,8 +530,11 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.9/lib" />
@@ -509,6 +564,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/symbol_table-1.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
diff --git a/.idea/runConfigurations/templating_dart.xml b/.idea/runConfigurations/templating_dart.xml
new file mode 100644
index 00000000..618351c8
--- /dev/null
+++ b/.idea/runConfigurations/templating_dart.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="templating.dart" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/example/templating.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8b2f7e8b..215b5c91 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/handle_error_dart.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/view_dart.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/view.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/templating_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/example/templating.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/example/views/index.jl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -35,29 +36,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6336">
-              <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="raw.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="96">
-              <caret line="7" column="31" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="192">
-              <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+            <state relative-caret-position="131">
+              <caret line="253" column="62" selection-start-line="253" selection-start-column="62" selection-end-line="253" selection-end-column="62" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -65,20 +48,52 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="18">
-              <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+            <state relative-caret-position="113">
+              <caret line="110" column="21" lean-forward="true" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="48">
-              <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
+            <state relative-caret-position="132">
+              <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="131">
+              <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="83" column="14" lean-forward="true" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -92,75 +107,24 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <file leaf-file-name="core.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1024">
-              <caret line="100" column="30" lean-forward="true" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
+            <state>
               <folding>
-                <element signature="e#477#533#0" />
-                <element signature="e#575#591#0" />
-                <element signature="e#594#637#0" />
-                <element signature="e#1288#1362#0" />
-                <element signature="e#1760#1959#0" />
-                <element signature="e#1883#1899#0" />
-                <element signature="e#1912#1922#0" />
-                <element signature="e#1963#2006#0" />
-                <element signature="e#2585#2672#0" />
-                <element signature="e#3283#3337#0" />
-                <element signature="e#3406#3426#0" />
-                <element signature="e#3465#3504#0" />
-                <element signature="e#3595#3654#0" />
-                <element signature="e#3658#3719#0" />
-                <element signature="e#3992#4376#0" />
-                <element signature="e#4380#4480#0" />
-                <element signature="e#4899#5066#0" />
-                <element signature="e#5070#5169#0" />
-                <element signature="e#5309#5369#0" />
-                <element signature="e#6228#6267#0" />
-                <element signature="e#6511#7181#0" />
-                <element signature="e#6747#7164#1" />
-                <element signature="e#7282#7806#0" />
-                <element signature="e#7348#7593#0" />
-                <element signature="e#7769#7801#0" />
-                <element signature="e#7921#8819#0" />
-                <element signature="e#8079#8175#0" />
-                <element signature="e#8325#8376#0" />
-                <element signature="e#8486#8573#0" />
-                <element signature="e#8905#9052#0" />
-                <element signature="e#9056#9092#0" />
-                <element signature="e#9204#9488#0" />
-                <element signature="e#9492#9528#0" />
-                <element signature="e#9874#10200#0" />
-                <element signature="e#10316#10367#0" />
-                <element signature="e#10761#10843#0" />
-                <element signature="e#10921#11280#0" />
-                <element signature="e#11329#11475#0" />
-                <element signature="e#11523#11574#0" />
-                <element signature="e#11647#11688#0" />
-                <element signature="n#!!block;n#_LockableBytesBuilder#0" />
-                <element signature="e#11786#11835#0" />
-                <element signature="n#!!block;n#_LockableBytesBuilderImpl#0" />
-                <element signature="e#11967#11980#0" />
-                <element signature="e#12051#12099#0" />
-                <element signature="e#12129#12154#0" />
-                <element signature="e#12196#12271#0" />
-                <element signature="e#12310#12388#0" />
-                <element signature="e#12417#12440#0" />
-                <element signature="e#12628#12662#0" />
-                <element signature="e#12698#12730#0" />
+                <element signature="e#0#25#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/templating.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="201">
-              <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
+            <state relative-caret-position="272">
+              <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#0#17#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -178,12 +142,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>zone</find>
-      <find>zone.run</find>
-      <find>aaa</find>
-      <find>close(</find>
-      <find>statusCode</find>
-      <find>.run</find>
       <find>var body = await rs.fold&lt;List&lt;int&gt;&gt;([], (out, list) =&gt; []..addAll(list));</find>
       <find>async =</find>
       <find>async {</find>
@@ -208,6 +166,12 @@
       <find>beforeIndex</find>
       <find>read(</find>
       <find>new Trac</find>
+      <find>frame</find>
+      <find>logger.</find>
+      <find>Stopwa</find>
+      <find>handleAnge</find>
+      <find>errorHandl</find>
+      <find>handl</find>
     </findStrings>
     <replaceStrings>
       <replace>modify</replace>
@@ -260,16 +224,12 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/core.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
@@ -295,7 +255,6 @@
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
@@ -303,14 +262,19 @@
         <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/async.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/example/templating.dart" />
+        <option value="$PROJECT_DIR$/example/views/index.jl" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -337,6 +301,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -388,7 +353,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane" />
       <pane id="AndroidView" />
       <pane id="PackagesPane" />
     </panes>
@@ -432,7 +396,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.performance::hello (PRODUCTION)">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -626,6 +590,7 @@
       <item itemvalue="Dart Test.can fetch data in services_test.dart" />
       <item itemvalue="Dart Command Line App.view.dart" />
       <item itemvalue="Dart Command Line App.handle_error.dart" />
+      <item itemvalue="Dart Command Line App.templating.dart" />
     </list>
   </component>
   <component name="SvnConfiguration">
@@ -705,14 +670,8 @@
       <workItem from="1526439485584" duration="1904000" />
       <workItem from="1528385352077" duration="29000" />
       <workItem from="1528432209488" duration="9947000" />
-      <workItem from="1528668755509" duration="1233000" />
-    </task>
-    <task id="LOCAL-00037" summary="+3">
-      <created>1506275793202</created>
-      <option name="number" value="00037" />
-      <option name="presentableId" value="LOCAL-00037" />
-      <option name="project" value="LOCAL" />
-      <updated>1506275793202</updated>
+      <workItem from="1528668755509" duration="1661000" />
+      <workItem from="1528671477893" duration="1061000" />
     </task>
     <task id="LOCAL-00038" summary="+4">
       <created>1506282194150</created>
@@ -1050,16 +1009,17 @@
       <option name="project" value="LOCAL" />
       <updated>1528442409476</updated>
     </task>
-    <option name="localTasksCounter" value="86" />
+    <task id="LOCAL-00086" summary="1.1.4+2">
+      <created>1528670046042</created>
+      <option name="number" value="00086" />
+      <option name="presentableId" value="LOCAL-00086" />
+      <option name="project" value="LOCAL" />
+      <updated>1528670046044</updated>
+    </task>
+    <option name="localTasksCounter" value="87" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.06.08 at 02h 50m 09s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 00s.xml">
-      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 19s.xml">
       <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1084,9 +1044,15 @@
     <history-entry file="All_Tests - 2018.06.08 at 02h 56m 02s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.06.10 at 19h 13m 34s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.06.10 at 19h 15m 03s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="146907000" />
+    <option name="totallyTimeSpent" value="148396000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1116,7 +1082,7 @@
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32763532" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.32285714" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
@@ -1124,7 +1090,8 @@
       <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.40142858" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.48" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24051593" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24430956" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1135,7 +1102,6 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
@@ -1149,7 +1115,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Updated tests to use `AngelHttp` API" />
     <MESSAGE value="Added example/main.dart" />
     <MESSAGE value="Create HttpRequestContextImpl" />
     <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
@@ -1174,7 +1139,8 @@
     <MESSAGE value="1.1.3" />
     <MESSAGE value="Test against Dart 1.x" />
     <MESSAGE value="1.1.4+1" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.1.4+1" />
+    <MESSAGE value="1.1.4+2" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.1.4+2" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1182,53 +1148,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1600">
-          <caret line="104" column="46" lean-forward="true" selection-start-line="104" selection-start-column="46" selection-end-line="104" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-394" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="25" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="96" column="4" selection-start-line="96" selection-start-column="4" selection-end-line="96" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="28" lean-forward="true" selection-start-column="28" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-442">
@@ -1313,13 +1232,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="109">
-          <caret line="64" column="24" lean-forward="true" selection-start-line="64" selection-start-column="24" selection-end-line="64" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib/src/parse_body.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
@@ -1337,13 +1249,6 @@
     <entry file="file:///usr/local/opt/dart/libexec/lib/async/async.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="29" column="27" lean-forward="true" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-742">
@@ -1424,13 +1329,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" lean-forward="true" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -1445,10 +1343,86 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="243">
+          <caret line="237" column="31" lean-forward="true" selection-start-line="237" selection-start-column="31" selection-end-line="237" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="496">
+          <caret line="31" selection-start-line="31" selection-end-line="31" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/core/stacktrace.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="28" column="15" lean-forward="true" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.lock">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="150" column="4" selection-start-line="150" selection-start-column="4" selection-end-line="150" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="6" selection-start-line="6" selection-end-line="9" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret line="7" column="31" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="113">
+          <caret line="19" column="15" lean-forward="true" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="98">
+          <caret line="25" column="68" selection-start-line="25" selection-start-column="68" selection-end-line="25" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/views/index.jl">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1024">
-          <caret line="100" column="30" lean-forward="true" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
+        <state relative-caret-position="90">
+          <caret line="307" column="5" lean-forward="true" selection-start-line="307" selection-start-column="5" selection-end-line="307" selection-end-column="5" />
           <folding>
             <element signature="e#477#533#0" />
             <element signature="e#575#591#0" />
@@ -1469,80 +1443,45 @@
             <element signature="e#4899#5066#0" />
             <element signature="e#5070#5169#0" />
             <element signature="e#5309#5369#0" />
-            <element signature="e#6228#6267#0" />
-            <element signature="e#6511#7181#0" />
-            <element signature="e#6747#7164#1" />
-            <element signature="e#7282#7806#0" />
-            <element signature="e#7348#7593#0" />
-            <element signature="e#7769#7801#0" />
-            <element signature="e#7921#8819#0" />
-            <element signature="e#8079#8175#0" />
-            <element signature="e#8325#8376#0" />
-            <element signature="e#8486#8573#0" />
-            <element signature="e#8905#9052#0" />
-            <element signature="e#9056#9092#0" />
-            <element signature="e#9204#9488#0" />
-            <element signature="e#9492#9528#0" />
-            <element signature="e#9874#10200#0" />
-            <element signature="e#10316#10367#0" />
-            <element signature="e#10761#10843#0" />
-            <element signature="e#10921#11280#0" />
-            <element signature="e#11329#11475#0" />
-            <element signature="e#11523#11574#0" />
-            <element signature="e#11647#11688#0" />
             <element signature="n#!!block;n#_LockableBytesBuilder#0" />
-            <element signature="e#11786#11835#0" />
             <element signature="n#!!block;n#_LockableBytesBuilderImpl#0" />
-            <element signature="e#11967#11980#0" />
-            <element signature="e#12051#12099#0" />
-            <element signature="e#12129#12154#0" />
-            <element signature="e#12196#12271#0" />
-            <element signature="e#12310#12388#0" />
-            <element signature="e#12417#12440#0" />
-            <element signature="e#12628#12662#0" />
-            <element signature="e#12698#12730#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+    <entry file="file://$PROJECT_DIR$/example/templating.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="237" column="31" lean-forward="true" selection-start-line="237" selection-start-column="31" selection-end-line="237" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
+        <state relative-caret-position="272">
+          <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#17#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/view.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="261" column="35" lean-forward="true" selection-start-line="261" selection-start-column="35" selection-end-line="261" selection-end-column="35" />
+        <state relative-caret-position="118">
+          <caret line="207" lean-forward="true" selection-start-line="207" selection-end-line="207" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="16" column="59" lean-forward="true" selection-start-line="16" selection-start-column="59" selection-end-line="16" selection-end-column="59" />
+        <state>
+          <folding>
+            <element signature="e#0#25#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="83" column="14" lean-forward="true" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
         </state>
       </provider>
     </entry>
@@ -1553,54 +1492,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/core/stacktrace.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="28" column="15" lean-forward="true" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="402">
-          <caret line="191" column="45" selection-start-line="191" selection-start-column="45" selection-end-line="191" selection-end-column="45" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="7" column="31" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="64">
-            <caret line="4" column="67" selection-start-line="4" selection-start-column="67" selection-end-line="4" selection-end-column="67" />
+          <first_editor relative-caret-position="48">
+            <caret line="3" column="51" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="113">
+          <caret line="110" column="21" lean-forward="true" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="18">
-          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+        <state relative-caret-position="132">
+          <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="253" column="62" selection-start-line="253" selection-start-column="62" selection-end-line="253" selection-end-column="62" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f900158d..c0a0e689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.1.4+3
+* Don't create a Stopwatch in production.
+* Fix a bug where `handleAngelHttpException` created a race condition.
+* `ResponseContext.serialize` now returns a `bool`.
+
 # 1.1.4+2
 * Fix a bug that prevented proper rendering of views.
 * Fixed a hidden bug that prevents error handling when a
diff --git a/example/templating.dart b/example/templating.dart
new file mode 100644
index 00000000..728d65b1
--- /dev/null
+++ b/example/templating.dart
@@ -0,0 +1,23 @@
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_jael/angel_jael.dart';
+import 'package:file/local.dart';
+import 'package:logging/logging.dart';
+import 'package:path/path.dart' as p;
+
+main() async {
+  var app = new Angel()
+    ..lazyParseBodies = true
+    ..logger = (new Logger('angel')..onRecord.listen(print))
+    ..encoders.addAll({'gzip': gzip.encoder});
+  var fs = const LocalFileSystem();
+  var viewsDirPath = p.join(p.dirname(p.fromUri(Platform.script)), 'views');
+  await app.configure(jael(fs.directory(viewsDirPath)));
+
+  app.get('/', (ResponseContext res) => res.render('index'));
+
+  var http = new AngelHttp(app);
+  var server = await http.startServer('127.0.0.1', 3000);
+  var url = 'http://${server.address.address}:${server.port}';
+  print('Listening at $url');
+}
diff --git a/example/views/index.jl b/example/views/index.jl
new file mode 100644
index 00000000..53ac639b
--- /dev/null
+++ b/example/views/index.jl
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Title</title>
+</head>
+<body>
+<h1>Hello!</h1>
+</body>
+</html>
\ No newline at end of file
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 1f3e8ab2..25f0445a 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -307,12 +307,12 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// Serializes data to the response.
   ///
   /// [contentType] can be either a [String], or a [ContentType].
-  void serialize(value, {contentType}) {
+  bool serialize(value, {contentType}) {
     if (!isOpen) throw closed();
 
     var text = serializer(value);
 
-    if (text.isEmpty) return;
+    if (text.isEmpty) return true;
 
     if (contentType is String)
       headers['content-type'] = contentType;
@@ -321,6 +321,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     write(text);
 
     end();
+    return false;
   }
 
   /// Streams a file to this response.
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 50b67c4a..f9d07318 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -304,11 +304,8 @@ class Angel extends AngelBase {
       else if (result is bool) {
         return result;
       } else if (result != null) {
-        // TODO: Make `serialize` return a bool, return this as the value.
-        // Do this wherever applicable
-        res.serialize(result,
+        return res.serialize(result,
             contentType: res.headers['content-type'] ?? 'application/json');
-        return false;
       } else
         return res.isOpen;
     });
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 0f3a8945..0c5ec736 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -100,10 +100,7 @@ class AngelHttp {
     if (_closed) return new Future.value(_server);
     _closed = true;
     _sub?.cancel();
-
-    // TODO: Remove this try/catch in 1.2.0
-    var close = app.close().catchError((_) => null);
-    return close.then((_) =>
+    return app.close().then((_) =>
         Future.wait(app.shutdownHooks.map(app.configure)).then((_) => _server));
   }
 
@@ -135,7 +132,7 @@ class AngelHttp {
           req.params.addAll(tuple.item2);
           req.inject(ParseResult, tuple.item3);
 
-          if (app.logger != null)
+          if (!app.isProduction && app.logger != null)
             req.inject(Stopwatch, new Stopwatch()..start());
 
           var pipeline = tuple.item1;
@@ -179,7 +176,8 @@ class AngelHttp {
                 parent.print(zone, line);
             },
             handleUncaughtError: (self, parent, zone, error, stackTrace) {
-              var trace = new Trace.from(stackTrace ?? StackTrace.current).terse;
+              var trace =
+                  new Trace.from(stackTrace ?? StackTrace.current).terse;
 
               return new Future(() {
                 AngelHttpException e;
@@ -246,15 +244,20 @@ class AngelHttp {
       }
     }
 
-    if (res.isOpen) {
+    Future handleError;
+
+    if (!res.isOpen)
+      handleError = new Future.value();
+    else {
       res.statusCode = e.statusCode;
-      var result = app.errorHandler(e, req, res);
-      app.executeHandler(result, req, res);
-      res.end();
+      handleError =
+          new Future.sync(() => app.errorHandler(e, req, res)).then((result) {
+        return app.executeHandler(result, req, res).then((_) => res.end());
+      });
     }
 
-    return sendResponse(request, req, res,
-        ignoreFinalizers: ignoreFinalizers == true);
+    return handleError.then((_) => sendResponse(request, req, res,
+        ignoreFinalizers: ignoreFinalizers == true));
   }
 
   /// Sends a response.
@@ -324,7 +327,7 @@ class AngelHttp {
           req.injections[PoolResource].release();
         }
 
-        if (app.logger != null) {
+        if (!app.isProduction && app.logger != null) {
           var sw = req.grab<Stopwatch>(Stopwatch);
 
           if (sw.isRunning) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 1bdec0f0..fa1230e9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+2
+version: 1.1.4+3
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -27,6 +27,7 @@ dependencies:
   stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
+  angel_jael: ^1.0.0
   mock_request: ^1.0.0
   http: ^0.11.3
   test: ^0.12.13
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 081eb5a1..a4307b2e 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -112,7 +112,6 @@ main() {
 
     Map todo = json.decode(response.body.replaceAll(rgx, ""));
     print("Todo: $todo");
-    // expect(todo.keys.length, equals(3));
     expect(todo['text'], equals("Hello"));
     expect(todo['over'], equals("world"));
   });
diff --git a/test/di_test.dart b/test/di_test.dart
index 9f5d27e9..56b2a966 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -62,7 +62,6 @@ main() {
 
 void validateTodoSingleton(response) {
   Map todo = json.decode(response.body);
-  // expect(todo.keys.length, equals(3));
   expect(todo["id"], equals(null));
   expect(todo["text"], equals(TEXT));
   expect(todo["over"], equals(OVER));

From b1c4529b8401544a0c221370e07ac458a03da5e9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 20 Jun 2018 15:44:44 -0400
Subject: [PATCH 209/414] Fix hooking bug

---
 .idea/workspace.xml              | 214 ++++++++++---------------------
 CHANGELOG.md                     |   3 +
 lib/src/core/hooked_service.dart |  23 ++--
 pubspec.yaml                     |   2 +-
 4 files changed, 89 insertions(+), 153 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 215b5c91..99d3b52f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,18 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/templating_dart.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/templating.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/example/views/index.jl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -36,14 +26,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="253" column="62" selection-start-line="253" selection-start-column="62" selection-end-line="253" selection-end-column="62" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="4064">
+              <caret line="254" column="9" selection-start-line="254" selection-start-column="9" selection-end-line="254" selection-end-column="9" />
             </state>
           </provider>
         </entry>
@@ -51,8 +38,8 @@
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="113">
-              <caret line="110" column="21" lean-forward="true" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
+            <state relative-caret-position="1760">
+              <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -60,7 +47,7 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="132">
+            <state relative-caret-position="1024">
               <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
             </state>
           </provider>
@@ -69,7 +56,7 @@
       <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
+            <state relative-caret-position="2608">
               <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
             </state>
           </provider>
@@ -92,8 +79,8 @@
       <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/di_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="186">
-              <caret line="83" column="14" lean-forward="true" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
+            <state relative-caret-position="1248">
+              <caret line="83" column="14" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -101,8 +88,17 @@
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="16">
-              <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+            <state relative-caret-position="152">
+              <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="272">
+              <caret line="543" column="26" lean-forward="true" selection-start-line="543" selection-start-column="26" selection-end-line="543" selection-end-column="26" />
             </state>
           </provider>
         </entry>
@@ -118,18 +114,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/templating.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
-              <folding>
-                <element signature="e#0#17#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -258,7 +242,6 @@
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/async.dart" />
@@ -275,6 +258,7 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
       </list>
     </option>
   </component>
@@ -301,6 +285,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -309,11 +295,6 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="example" type="cbb8eebc:String" user="example" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -332,29 +313,10 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="core" type="cbb8eebc:String" user="core" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="tool" type="cbb8eebc:String" user="tool" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -671,14 +633,9 @@
       <workItem from="1528385352077" duration="29000" />
       <workItem from="1528432209488" duration="9947000" />
       <workItem from="1528668755509" duration="1661000" />
-      <workItem from="1528671477893" duration="1061000" />
-    </task>
-    <task id="LOCAL-00038" summary="+4">
-      <created>1506282194150</created>
-      <option name="number" value="00038" />
-      <option name="presentableId" value="LOCAL-00038" />
-      <option name="project" value="LOCAL" />
-      <updated>1506282194150</updated>
+      <workItem from="1528671477893" duration="1263000" />
+      <workItem from="1529435353495" duration="592000" />
+      <workItem from="1529523346006" duration="479000" />
     </task>
     <task id="LOCAL-00039" summary="+6">
       <created>1507654580167</created>
@@ -1016,13 +973,17 @@
       <option name="project" value="LOCAL" />
       <updated>1528670046044</updated>
     </task>
-    <option name="localTasksCounter" value="87" />
+    <task id="LOCAL-00087" summary="Fix async bugs">
+      <created>1528672631391</created>
+      <option name="number" value="00087" />
+      <option name="presentableId" value="LOCAL-00087" />
+      <option name="project" value="LOCAL" />
+      <updated>1528672631392</updated>
+    </task>
+    <option name="localTasksCounter" value="88" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 19s.xml">
-      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 29s.xml">
       <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1050,9 +1011,12 @@
     <history-entry file="All_Tests - 2018.06.10 at 19h 15m 03s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.06.10 at 19h 15m 55s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="148396000" />
+    <option name="totallyTimeSpent" value="149669000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1083,28 +1047,28 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.32285714" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.40142858" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.40142858" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.48" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24430956" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2518968" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.32285714" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1115,7 +1079,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Added example/main.dart" />
     <MESSAGE value="Create HttpRequestContextImpl" />
     <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
     <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
@@ -1140,7 +1103,8 @@
     <MESSAGE value="Test against Dart 1.x" />
     <MESSAGE value="1.1.4+1" />
     <MESSAGE value="1.1.4+2" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.1.4+2" />
+    <MESSAGE value="Fix async bugs" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix async bugs" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1295,16 +1259,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3520">
           <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6336">
-          <caret line="403" column="30" selection-start-line="403" selection-start-column="30" selection-end-line="403" selection-end-column="30" />
         </state>
       </provider>
     </entry>
@@ -1354,9 +1308,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="496">
           <caret line="31" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1385,9 +1336,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
           <caret line="6" selection-start-line="6" selection-end-line="9" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1423,35 +1371,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="307" column="5" lean-forward="true" selection-start-line="307" selection-start-column="5" selection-end-line="307" selection-end-column="5" />
-          <folding>
-            <element signature="e#477#533#0" />
-            <element signature="e#575#591#0" />
-            <element signature="e#594#637#0" />
-            <element signature="e#1288#1362#0" />
-            <element signature="e#1760#1959#0" />
-            <element signature="e#1883#1899#0" />
-            <element signature="e#1912#1922#0" />
-            <element signature="e#1963#2006#0" />
-            <element signature="e#2585#2672#0" />
-            <element signature="e#3283#3337#0" />
-            <element signature="e#3406#3426#0" />
-            <element signature="e#3465#3504#0" />
-            <element signature="e#3595#3654#0" />
-            <element signature="e#3658#3719#0" />
-            <element signature="e#3992#4376#0" />
-            <element signature="e#4380#4480#0" />
-            <element signature="e#4899#5066#0" />
-            <element signature="e#5070#5169#0" />
-            <element signature="e#5309#5369#0" />
-            <element signature="n#!!block;n#_LockableBytesBuilder#0" />
-            <element signature="n#!!block;n#_LockableBytesBuilderImpl#0" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/example/templating.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
+        <state relative-caret-position="208">
           <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
@@ -1463,9 +1388,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="118">
           <caret line="207" lean-forward="true" selection-start-line="207" selection-end-line="207" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1480,15 +1402,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="83" column="14" lean-forward="true" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="1" column="16" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="16" />
+        <state relative-caret-position="1248">
+          <caret line="83" column="14" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
         </state>
       </provider>
     </entry>
@@ -1507,14 +1422,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="113">
-          <caret line="110" column="21" lean-forward="true" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
+        <state relative-caret-position="1760">
+          <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
+        <state relative-caret-position="1024">
           <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
         </state>
       </provider>
@@ -1528,18 +1443,29 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
+        <state relative-caret-position="2608">
           <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="253" column="62" selection-start-line="253" selection-start-column="62" selection-end-line="253" selection-end-column="62" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="4064">
+          <caret line="254" column="9" selection-start-line="254" selection-start-column="9" selection-end-line="254" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="543" column="26" lean-forward="true" selection-start-line="543" selection-start-column="26" selection-end-line="543" selection-end-column="26" />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0a0e689..a40f76bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.4+4
+* Fix a bug that caused a race condition in hooked services.
+
 # 1.1.4+3
 * Don't create a Stopwatch in production.
 * Fix a bug where `handleAngelHttpException` created a race condition.
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index ef500a9a..3fae479c 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -448,8 +448,11 @@ class HookedService extends Service {
   Future<HookedServiceEvent> fireEvent(
       HookedServiceEventDispatcher dispatcher, HookedServiceEvent event,
       [HookedServiceEventListener callback]) {
-    if (callback != null && event?._canceled != true) callback(event);
-    return dispatcher._emit(event);
+    Future f;
+    if (callback != null && event?._canceled != true)
+      f = new Future.sync(() => callback(event));
+    f ??= new Future.value();
+    return f.then((_) => dispatcher._emit(event));
   }
 }
 
@@ -532,15 +535,19 @@ class HookedServiceEventDispatcher {
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
   Future<HookedServiceEvent> _emit(HookedServiceEvent event) {
-    if (event?._canceled != true) {
-      for (var listener in listeners) {
-        listener(event);
+    if (event?._canceled == true || event == null || listeners.isEmpty)
+      return new Future.value(event);
 
-        if (event._canceled) return new Future.value(event);
-      }
+    var f = new Future<HookedServiceEvent>.value(event);
+
+    for (var listener in listeners) {
+      f = f.then((event) {
+        if (event._canceled) return event;
+        return new Future.sync(() => listener(event)).then((_) => event);
+      });
     }
 
-    return new Future.value(event);
+    return f;
   }
 
   /// Returns a [Stream] containing all events fired by this dispatcher.
diff --git a/pubspec.yaml b/pubspec.yaml
index fa1230e9..37e15872 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+3
+version: 1.1.4+4
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 5d851b6cdeb026a7f7761d7022132da4b7415410 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Jun 2018 23:29:38 -0400
Subject: [PATCH 210/414] +5

---
 .idea/libraries/Dart_Packages.xml       | 136 ++--
 .idea/workspace.xml                     | 806 +++++++++++++-----------
 CHANGELOG.md                            |   5 +
 analysis_options.yaml                   |   3 +-
 lib/hooks.dart                          |   4 +-
 lib/metrics.dart                        |   2 -
 lib/src/core/anonymous_service.dart     |  16 +-
 lib/src/core/hooked_service.dart        |  12 +-
 lib/src/core/injection.dart             |   4 +-
 lib/src/core/map_service.dart           |  10 +-
 lib/src/core/request_context.dart       |  12 +-
 lib/src/core/response_context.dart      |  12 +-
 lib/src/core/routable.dart              |  19 +-
 lib/src/core/server.dart                |   4 +-
 lib/src/core/service.dart               |   8 +-
 lib/src/core/typed_service.dart         |   8 +-
 lib/src/http/angel_http.dart            |  10 +-
 lib/src/http/controller.dart            |  16 +-
 lib/src/http/http_request_context.dart  |   2 +-
 lib/src/http/http_response_context.dart |   4 +-
 lib/src/stats/metric_server.dart        | 118 ----
 lib/src/stats/stats.dart                |  53 --
 lib/src/util.dart                       |   2 +-
 pubspec.yaml                            |   2 +-
 test/accepts_test.dart                  |  21 +-
 test/controller_test.dart               |   2 +-
 test/di_test.dart                       |   2 +-
 test/exception_test.dart                |  23 +-
 test/hooked_test.dart                   |   8 +-
 test/parameter_meta_test.dart           |   1 -
 test/primitives_test.dart               |   2 +-
 test/routing_test.dart                  |   4 +-
 test/serialize_test.dart                |   8 +-
 test/server_test.dart                   |  22 +-
 test/services_test.dart                 |  14 +-
 test/streaming_test.dart                |   4 +-
 test/typed_service_test.dart            |   6 +-
 37 files changed, 628 insertions(+), 757 deletions(-)
 delete mode 100644 lib/metrics.dart
 delete mode 100644 lib/src/stats/metric_server.dart
 delete mode 100644 lib/src/stats/stats.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 69c608f9..1f841d46 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,7 +5,7 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
             </list>
           </value>
         </entry>
@@ -33,7 +33,7 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
             </list>
           </value>
         </entry>
@@ -51,13 +51,6 @@
             </list>
           </value>
         </entry>
-        <entry key="barback">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+16/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="body_parser">
           <value>
             <list>
@@ -79,13 +72,6 @@
             </list>
           </value>
         </entry>
-        <entry key="cli_util">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="code_buffer">
           <value>
             <list>
@@ -96,14 +82,14 @@
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
             </list>
           </value>
         </entry>
         <entry key="combinator">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0+3/lib" />
             </list>
           </value>
         </entry>
@@ -124,7 +110,7 @@
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.5/lib" />
             </list>
           </value>
         </entry>
@@ -152,21 +138,21 @@
         <entry key="front_end">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
             </list>
           </value>
         </entry>
@@ -180,7 +166,7 @@
         <entry key="http_multi_server">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
             </list>
           </value>
         </entry>
@@ -212,13 +198,6 @@
             </list>
           </value>
         </entry>
-        <entry key="isolate">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="jael">
           <value>
             <list>
@@ -243,14 +222,21 @@
         <entry key="json_god">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="json_rpc_2">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="kernel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.1/lib" />
             </list>
           </value>
         </entry>
@@ -264,7 +250,7 @@
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib" />
             </list>
           </value>
         </entry>
@@ -306,7 +292,7 @@
         <entry key="node_preamble">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.2/lib" />
             </list>
           </value>
         </entry>
@@ -320,14 +306,14 @@
         <entry key="package_resolver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
             </list>
           </value>
         </entry>
@@ -341,7 +327,7 @@
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
             </list>
           </value>
         </entry>
@@ -369,7 +355,7 @@
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+1/lib" />
             </list>
           </value>
         </entry>
@@ -383,14 +369,14 @@
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
             </list>
           </value>
         </entry>
@@ -425,7 +411,7 @@
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.7+1/lib" />
             </list>
           </value>
         </entry>
@@ -453,7 +439,7 @@
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.42/lib" />
             </list>
           </value>
         </entry>
@@ -478,101 +464,107 @@
             </list>
           </value>
         </entry>
+        <entry key="vm_service_client">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.4+3/lib" />
+            </list>
+          </value>
+        </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+8/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.14/lib" />
             </list>
           </value>
         </entry>
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/barback-0.15.2+16/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/cli_util-0.1.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.9/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0-beta+7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-2.3.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.9/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/isolate-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.9/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.7+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/symbol_table-1.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.42/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.4+3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.14/lib" />
     </CLASSES>
     <JAVADOC />
     <LIBRARY_FILE />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 99d3b52f..36f5c394 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Fix hooking bug">
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/analysis_options.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/analysis_options.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/metrics.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/typed_service_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,20 +60,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4064">
-              <caret line="254" column="9" selection-start-line="254" selection-start-column="9" selection-end-line="254" selection-end-column="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1760">
-              <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
+            <state relative-caret-position="136">
+              <caret line="127" column="57" selection-start-line="127" selection-start-column="57" selection-end-line="127" selection-end-column="57" />
             </state>
           </provider>
         </entry>
@@ -47,8 +72,8 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1024">
-              <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
+            <state relative-caret-position="32">
+              <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
             </state>
           </provider>
         </entry>
@@ -56,64 +81,78 @@
       <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2608">
-              <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
+            <state relative-caret-position="146">
+              <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+            <state relative-caret-position="120">
+              <caret line="120" column="39" selection-start-line="120" selection-start-column="39" selection-end-line="120" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="travis.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1248">
-              <caret line="83" column="14" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
+            <state relative-caret-position="109">
+              <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="serialize_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
-              <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+            <state relative-caret-position="146">
+              <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="543" column="26" lean-forward="true" selection-start-line="543" selection-start-column="26" selection-end-line="543" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="core.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
+      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state>
+              <caret column="20" selection-start-column="20" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="146">
+              <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="exception_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="34">
+              <caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
               <folding>
-                <element signature="e#0#25#0" expanded="true" />
+                <element signature="e#1#55#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="142">
+              <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -126,19 +165,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>var body = await rs.fold&lt;List&lt;int&gt;&gt;([], (out, list) =&gt; []..addAll(list));</find>
-      <find>async =</find>
-      <find>async {</find>
-      <find>await</find>
-      <find>e read(</find>
-      <find>for (var ha</find>
-      <find>geth</find>
-      <find>pip</find>
-      <find>close</find>
-      <find>sendFile</find>
-      <find>getHan</find>
-      <find>gethandle</find>
-      <find>BANG</find>
       <find>execute</find>
       <find>lazyBod</find>
       <find>lazyBody()</find>
@@ -156,13 +182,21 @@
       <find>handleAnge</find>
       <find>errorHandl</find>
       <find>handl</find>
+      <find>HttpHeaders.ACCEPT</find>
+      <find>HttpHeaders.CONTENT_TYPE</find>
+      <find>HttpHeaders.CONTE</find>
+      <find>HttpHeaders</find>
+      <find>HttpStatus.FORBIDDEN</find>
+      <find>HttpStatus.</find>
+      <find>JSON</find>
+      <find>ContentType.JSON.toString()</find>
+      <find>(req, res)</find>
+      <find>headers: headers,</find>
+      <find>_</find>
+      <find>ContentType.HTML.mimeType</find>
+      <find>ContentType.JSON.mimeType</find>
     </findStrings>
     <replaceStrings>
-      <replace>modify</replace>
-      <replace>update</replace>
-      <replace>remove</replace>
-      <replace>data</replace>
-      <replace>event</replace>
       <replace>after</replace>
       <replace>fatalErrorStream</replace>
       <replace>onController</replace>
@@ -174,7 +208,6 @@
       <replace>req.path</replace>
       <replace>req.path`</replace>
       <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
-      <replace>'content-type'</replace>
       <replace>appa</replace>
       <replace>isClosed</replace>
       <replace>useStream</replace>
@@ -186,6 +219,14 @@
       <replace />
       <replace>=</replace>
       <replace>{</replace>
+      <replace>'accept'</replace>
+      <replace>'content-type'</replace>
+      <replace>403</replace>
+      <replace>(RequestContext req, res)</replace>
+      <replace>headers: headers.cast&lt;String, String&gt;(),</replace>
+      <replace>this.</replace>
+      <replace>'text/html'</replace>
+      <replace>'application/json'</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -195,6 +236,7 @@
       <dir>$PROJECT_DIR$/test</dir>
       <dir>$PROJECT_DIR$/lib/src/core</dir>
       <dir>$PROJECT_DIR$/lib</dir>
+      <dir>$PROJECT_DIR$</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -208,57 +250,57 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/angel_framework.dart" />
-        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/lib/http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.2/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart" />
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
-        <option value="$PROJECT_DIR$/analysis_options.yaml" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
-        <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/.travis.yml" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/async.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
         <option value="$PROJECT_DIR$/example/views/index.jl" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/analysis_options.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/util.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/test/exception_test.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
+        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
       </list>
     </option>
   </component>
@@ -272,10 +314,10 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="50" />
-    <option name="y" value="23" />
-    <option name="width" value="1360" />
-    <option name="height" value="797" />
+    <option name="x" value="26" />
+    <option name="y" value="22" />
+    <option name="width" value="1326" />
+    <option name="height" value="772" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -285,9 +327,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -309,14 +348,15 @@
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
+              <item name="test" type="cbb8eebc:String" user="test" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -358,7 +398,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -635,14 +675,10 @@
       <workItem from="1528668755509" duration="1661000" />
       <workItem from="1528671477893" duration="1263000" />
       <workItem from="1529435353495" duration="592000" />
-      <workItem from="1529523346006" duration="479000" />
-    </task>
-    <task id="LOCAL-00039" summary="+6">
-      <created>1507654580167</created>
-      <option name="number" value="00039" />
-      <option name="presentableId" value="LOCAL-00039" />
-      <option name="project" value="LOCAL" />
-      <updated>1507654580167</updated>
+      <workItem from="1529523346006" duration="682000" />
+      <workItem from="1529713102021" duration="161000" />
+      <workItem from="1529722767717" duration="59000" />
+      <workItem from="1529722829709" duration="1693000" />
     </task>
     <task id="LOCAL-00040" summary="autoIdAndDateFields in MapService">
       <created>1511026951368</created>
@@ -980,13 +1016,17 @@
       <option name="project" value="LOCAL" />
       <updated>1528672631392</updated>
     </task>
-    <option name="localTasksCounter" value="88" />
+    <task id="LOCAL-00088" summary="Fix hooking bug">
+      <created>1529523884120</created>
+      <option name="number" value="00088" />
+      <option name="presentableId" value="LOCAL-00088" />
+      <option name="project" value="LOCAL" />
+      <updated>1529523884121</updated>
+    </task>
+    <option name="localTasksCounter" value="89" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 52m 29s.xml">
-      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 53m 25s.xml">
       <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1014,9 +1054,12 @@
     <history-entry file="All_Tests - 2018.06.10 at 19h 15m 55s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.06.20 at 15h 44m 03s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="149669000" />
+    <option name="totallyTimeSpent" value="151785000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1028,7 +1071,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="50" y="23" width="1360" height="797" extended-state="0" />
+    <frame x="26" y="22" width="1326" height="772" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1036,7 +1079,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31142858" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31111112" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1047,13 +1090,15 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33481482" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.4" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.40142858" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.48" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2518968" />
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.48" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27024922" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1064,8 +1109,6 @@
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.32285714" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Data View" order="4" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -1079,7 +1122,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Create HttpRequestContextImpl" />
     <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
     <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
     <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
@@ -1104,7 +1146,8 @@
     <MESSAGE value="1.1.4+1" />
     <MESSAGE value="1.1.4+2" />
     <MESSAGE value="Fix async bugs" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix async bugs" />
+    <MESSAGE value="Fix hooking bug" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix hooking bug" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1112,156 +1155,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-442">
-          <caret line="137" column="29" selection-start-line="137" selection-start-column="29" selection-end-line="137" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="1" column="28" selection-start-line="1" selection-start-column="28" selection-end-line="1" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="88" column="47" selection-start-line="88" selection-start-column="47" selection-end-line="88" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="28" selection-start-column="28" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="17" column="49" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="20" selection-start-column="20" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="58" column="26" selection-start-line="58" selection-start-column="26" selection-end-line="58" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="44" column="6" selection-start-line="44" selection-start-column="6" selection-end-line="44" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="34" column="15" selection-start-line="34" selection-start-column="15" selection-end-line="34" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/opt/dart/libexec/lib/_http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="2027" column="23" lean-forward="true" selection-start-line="2027" selection-start-column="23" selection-end-line="2027" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="43" column="52" selection-start-line="43" selection-start-column="52" selection-end-line="43" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib/src/parse_body.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="14" column="29" selection-start-line="13" selection-start-column="40" selection-end-line="20" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="71" column="38" selection-start-line="71" selection-start-column="38" selection-end-line="71" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/opt/dart/libexec/lib/async/async.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-742">
-          <caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.36/lib/src/frontend/expect.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="387">
-          <caret line="164" column="29" selection-start-line="164" selection-start-column="29" selection-end-line="164" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="183" column="2" selection-start-line="183" selection-start-column="2" selection-end-line="183" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="51" column="34" lean-forward="true" selection-start-line="51" selection-start-column="34" selection-end-line="51" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="67" column="45" selection-start-line="67" selection-start-column="45" selection-end-line="67" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="102" column="6" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3520">
-          <caret line="229" column="26" selection-start-line="229" selection-start-column="26" selection-end-line="229" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/async/future.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="631">
@@ -1269,20 +1162,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="28" column="33" lean-forward="true" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="16" column="24" lean-forward="true" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -1290,27 +1169,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="83">
-          <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="237" column="31" lean-forward="true" selection-start-line="237" selection-start-column="31" selection-end-line="237" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="496">
-          <caret line="31" selection-start-line="31" selection-end-line="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/view.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1367,73 +1225,19 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="307" column="5" lean-forward="true" selection-start-line="307" selection-start-column="5" selection-end-line="307" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/templating.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
           <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="118">
-          <caret line="207" lean-forward="true" selection-start-line="207" selection-end-line="207" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#25#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1248">
-          <caret line="83" column="14" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="14" />
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="48">
-            <caret line="3" column="51" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1760">
-          <caret line="110" column="21" selection-start-line="110" selection-start-column="21" selection-end-line="110" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1024">
-          <caret line="69" column="4" selection-start-line="69" selection-start-column="4" selection-end-line="69" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1441,31 +1245,271 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/validation.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2608">
-          <caret line="169" column="4" selection-start-line="169" selection-start-column="4" selection-end-line="169" selection-end-column="4" />
+        <state relative-caret-position="96">
+          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="155" column="15" lean-forward="true" selection-start-line="155" selection-start-column="15" selection-end-line="155" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="47" column="57" selection-start-line="47" selection-start-column="57" selection-end-line="47" selection-end-column="57" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4064">
-          <caret line="254" column="9" selection-start-line="254" selection-start-column="9" selection-end-line="254" selection-end-column="9" />
+        <state relative-caret-position="403">
+          <caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+        <state relative-caret-position="130">
+          <caret line="33" column="69" selection-start-line="33" selection-start-column="69" selection-end-line="33" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="32">
+            <caret line="2" column="33" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="22" column="66" selection-start-line="22" selection-start-column="66" selection-end-line="22" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="33" column="21" lean-forward="true" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1152">
+          <caret line="76" column="11" selection-start-line="76" selection-start-column="11" selection-end-line="76" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="81" column="32" selection-start-line="81" selection-start-column="32" selection-end-line="81" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="122">
+          <caret line="69" column="7" lean-forward="true" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="372">
+          <caret line="148" column="57" selection-start-line="148" selection-start-column="57" selection-end-line="148" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="5" column="28" lean-forward="true" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="79" column="40" selection-start-line="79" selection-start-column="40" selection-end-line="79" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="293">
+          <caret line="154" column="25" lean-forward="true" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="236">
+          <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="145" column="66" selection-start-line="145" selection-start-column="66" selection-end-line="145" selection-end-column="66" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="100" column="43" selection-start-line="100" selection-start-column="43" selection-end-line="100" selection-end-column="43" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="543" column="26" lean-forward="true" selection-start-line="543" selection-start-column="26" selection-end-line="543" selection-end-column="26" />
+        <state relative-caret-position="32">
+          <caret line="2" column="20" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="14" column="19" lean-forward="true" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="408">
+          <caret line="63" column="49" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="204" column="44" selection-start-line="204" selection-start-column="44" selection-end-line="204" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="102" column="52" selection-start-line="102" selection-start-column="52" selection-end-line="102" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="127" column="57" selection-start-line="127" selection-start-column="57" selection-end-line="127" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="20" selection-start-column="20" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="32">
+          <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="146">
+          <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="120" column="39" selection-start-line="120" selection-start-column="39" selection-end-line="120" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
+          <folding>
+            <element signature="e#1#55#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="142">
+          <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a40f76bf..557ac482 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.1.4+5
+* Intermediary release while patching up Dart 2 bugs.
+* Stricter Dart 2 use.
+* Remove `AngelMetrics` for good.
+
 # 1.1.4+4
 * Fix a bug that caused a race condition in hooked services.
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 1167d894..a0ee1ea1 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,5 +1,6 @@
 analyzer:
-  strong-mode: true
+  strong-mode:
+    implicit-casts: false
 linter:
   rules:
     - avoid_slow_async_io
\ No newline at end of file
diff --git a/lib/hooks.dart b/lib/hooks.dart
index bcce6141..0b50dccd 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -141,12 +141,12 @@ HookedServiceEventListener remove(key, [remover(key, obj)]) {
       else if (obj is List)
         return obj..remove(key);
       else if (obj is Iterable)
-        return obj.where((k) => !key);
+        return obj.where((k) => key != true);
       else if (obj is Map)
         return obj..remove(key);
       else {
         try {
-          reflect(obj).setField(new Symbol(key), null);
+          reflect(obj).setField(new Symbol(key.toString()), null);
           return obj;
         } catch (e) {
           throw new ArgumentError("Cannot remove key '$key' from $obj.");
diff --git a/lib/metrics.dart b/lib/metrics.dart
deleted file mode 100644
index b4ecfdf1..00000000
--- a/lib/metrics.dart
+++ /dev/null
@@ -1,2 +0,0 @@
-export 'src/stats/metric_server.dart';
-export 'src/stats/stats.dart';
diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index d263dca6..0faf3b12 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -5,15 +5,17 @@ import 'service.dart';
 ///
 /// Well-suited for testing.
 class AnonymousService extends Service {
-  Function _index, _read, _create, _modify, _update, _remove;
+  Future Function([Map]) _index;
+  Future Function(Object, [Map]) _read, _create, _remove;
+  Future Function(Object, Object, [Map]) _modify, _update;
 
   AnonymousService(
-      {FutureOr index([Map params]),
-      FutureOr read(id, [Map params]),
-      FutureOr create(data, [Map params]),
-      FutureOr modify(id, data, [Map params]),
-      FutureOr update(id, data, [Map params]),
-      FutureOr remove(id, [Map params])})
+      {Future index([Map params]),
+      Future read(id, [Map params]),
+      Future create(data, [Map params]),
+      Future modify(id, data, [Map params]),
+      Future update(id, data, [Map params]),
+      Future remove(id, [Map params])})
       : super() {
     _index = index;
     _read = read;
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 3fae479c..17dc5b31 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -1,8 +1,6 @@
 library angel_framework.http;
 
 import 'dart:async';
-import 'package:angel_http_exception/angel_http_exception.dart';
-import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -48,12 +46,12 @@ class HookedService extends Service {
 
   RequestContext _getRequest(Map params) {
     if (params == null) return null;
-    return params['__requestctx'];
+    return params['__requestctx'] as RequestContext;
   }
 
   ResponseContext _getResponse(Map params) {
     if (params == null) return null;
-    return params['__responsectx'];
+    return params['__responsectx'] as ResponseContext;
   }
 
   Map _stripReq(Map params) {
@@ -88,8 +86,7 @@ class HookedService extends Service {
   /// Adds hooks to this instance.
   void addHooks() {
     Hooks hooks = getAnnotation(inner, Hooks);
-    final before = [];
-    final after = [];
+    List<HookedServiceEventListener> before = [], after = [];
 
     if (hooks != null) {
       before.addAll(hooks.before);
@@ -99,7 +96,8 @@ class HookedService extends Service {
     void applyListeners(Function fn, HookedServiceEventDispatcher dispatcher,
         [bool isAfter]) {
       Hooks hooks = getAnnotation(fn, Hooks);
-      final listeners = []..addAll(isAfter == true ? after : before);
+      final listeners = <HookedServiceEventListener>[]
+        ..addAll(isAfter == true ? after : before);
 
       if (hooks != null)
         listeners.addAll(isAfter == true ? hooks.after : hooks.before);
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index b9594642..5952fded 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -5,7 +5,7 @@ const List<Type> _primitiveTypes = const [String, int, num, double, Null];
 /// Shortcut for calling [preInject], and then [handleContained].
 ///
 /// Use this to instantly create a request handler for a DI-enabled method.
-RequestHandler createDynamicHandler(handler,
+RequestHandler createDynamicHandler(Function handler,
     {Iterable<String> optional: const []}) {
   var injection = preInject(handler);
   injection.optional.addAll(optional ?? []);
@@ -77,7 +77,7 @@ bool suitableForInjection(
 }
 
 /// Handles a request with a DI-enabled handler.
-RequestHandler handleContained(handler, InjectionRequest injection) {
+RequestHandler handleContained(Function handler, InjectionRequest injection) {
   return (RequestContext req, ResponseContext res) {
     if (injection.parameters.isNotEmpty &&
         injection.parameters.values.any((p) => p.match != null) &&
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 3f2d9e90..a405834a 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -77,7 +77,7 @@ class MapService extends Service {
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
     var now = new DateTime.now().toIso8601String();
-    var result = data;
+    var result = data as Map;
 
     if (autoIdAndDateFields == true) {
       result
@@ -85,7 +85,7 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] = now
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
-    items.add(result);
+    items.add(result.cast<String, dynamic>());
     return new Future.value(result);
   }
 
@@ -98,7 +98,7 @@ class MapService extends Service {
     if (!items.any(_matchesId(id))) return create(data, params);
 
     return read(id).then((item) {
-      var result = item..addAll(data);
+      var result = item..addAll(data as Map);
 
       if (autoIdAndDateFields == true)
         result
@@ -121,7 +121,7 @@ class MapService extends Service {
         throw new AngelHttpException.notFound(
             message: 'No record found for ID $id');
 
-      var result = data;
+      var result = data as Map;
       if (autoIdAndDateFields == true) {
         result
           ..['id'] = id?.toString()
@@ -130,7 +130,7 @@ class MapService extends Service {
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
               new DateTime.now().toIso8601String();
       }
-      items.add(result);
+      items.add(result.cast<String, dynamic>());
       return new Future.value(result);
     });
   }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index c926c792..36ad5210 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -144,18 +144,18 @@ abstract class RequestContext {
   /// within a service hook.
   T grab<T>(key) {
     if (params.containsKey(key))
-      return params[key];
+      return params[key] as T;
     else if (_injections.containsKey(key))
-      return _injections[key];
+      return _injections[key] as T;
     else if (properties.containsKey(key))
-      return properties[key];
+      return properties[key] as T;
     else {
       var prop = app?.findProperty(key);
       if (prop != null)
-        return prop;
+        return prop as T;
       else if (key is Type) {
         try {
-          return app.container.make(key);
+          return app.container.make(key) as T;
         } catch (e) {
           return null;
         }
@@ -195,7 +195,7 @@ abstract class RequestContext {
       throw new ArgumentError(
           'RequestContext.accepts expects the `contentType` parameter to NOT be null.');
 
-    _acceptHeaderCache ??= headers.value(HttpHeaders.ACCEPT);
+    _acceptHeaderCache ??= headers.value('accept');
 
     if (_acceptHeaderCache == null)
       return false;
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 25f0445a..6330fad6 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -179,7 +179,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Serializes JSON to the response.
-  void json(value) => serialize(value, contentType: ContentType.JSON);
+  void json(value) => serialize(value, contentType: 'application/json');
 
   /// Returns a JSONP response.
   void jsonp(value, {String callbackName: "callback", contentType}) {
@@ -202,7 +202,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     if (!isOpen) throw closed();
     return app.viewGenerator(view, data).then((content) {
       write(content);
-      headers['content-type'] = ContentType.HTML.toString();
+      headers['content-type'] = 'text/html';
       end();
     });
   }
@@ -217,9 +217,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   void redirect(url, {bool absolute: true, int code: 302}) {
     if (!isOpen) throw closed();
     headers
-      ..['content-type'] = ContentType.HTML.toString()
+      ..['content-type'] = 'text/html'
       ..['location'] =
-          url is String ? url : app.navigate(url, absolute: absolute);
+          url is String ? url : app.navigate(url as Iterable, absolute: absolute);
     statusCode = code ?? 302;
     write('''
     <!DOCTYPE html>
@@ -259,7 +259,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     Route matched = _findRoute(app);
 
     if (matched != null) {
-      redirect(matched.makeUri(params), code: code);
+      redirect(matched.makeUri(params.cast<String, dynamic>()), code: code);
       return;
     }
 
@@ -290,7 +290,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
     final head =
         controller.findExpose().path.toString().replaceAll(_straySlashes, '');
-    final tail = matched.makeUri(params).replaceAll(_straySlashes, '');
+    final tail = matched.makeUri(params.cast<String, dynamic>()).replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
   }
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 8dafb635..f39ae109 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -8,6 +8,7 @@ import 'hooked_service.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
+import 'server.dart';
 import 'service.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
@@ -16,7 +17,7 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
 
 /// A function that receives an incoming [RequestContext] and responds to it.
-typedef Future RequestHandler(RequestContext req, ResponseContext res);
+typedef FutureOr RequestHandler(RequestContext req, ResponseContext res);
 
 /// Sequentially runs a list of [handlers] of middleware, and returns early if any does not
 /// return `true`. Works well with [Router].chain.
@@ -31,8 +32,9 @@ RequestMiddleware waterfall(List handlers) {
         runPipeline = () => req.app.executeHandler(handler, req, res);
       else {
         var current = runPipeline;
-        runPipeline = () => current().then((result) =>
-            !result ? result : req.app.executeHandler(handler, req, res));
+        runPipeline = () => current().then((result) => !result
+            ? new Future.value(result)
+            : req.app.executeHandler(handler, req, res));
       }
     }
 
@@ -97,7 +99,8 @@ class Routable extends Router {
     handlerSequence.addAll(middleware ?? []);
     handlerSequence.addAll(handlers);
 
-    return super.addRoute(method, path, handler, middleware: handlerSequence);
+    return super.addRoute(method, path.toString(), handler,
+        middleware: handlerSequence);
   }
 
   /// Mounts the given [router] on this instance.
@@ -128,8 +131,8 @@ class Routable extends Router {
 
     if (_router is AngelBase) {
       handlers.add((RequestContext req, ResponseContext res) {
-        req.app = _router;
-        res.app = _router;
+        req.app = _router as Angel;
+        res.app = _router as Angel;
         return true;
       });
     }
@@ -140,7 +143,7 @@ class Routable extends Router {
     Map copiedMiddleware = new Map.from(router.requestMiddleware);
     for (String middlewareName in copiedMiddleware.keys) {
       requestMiddleware.putIfAbsent("$middlewarePrefix$middlewareName",
-          () => copiedMiddleware[middlewareName]);
+          () => copiedMiddleware[middlewareName] as RequestHandler);
     }
 
     // Also copy properties...
@@ -154,7 +157,7 @@ class Routable extends Router {
 
     // _router.dumpTree(header: 'Mounting on "$path":');
     // root.child(path, debug: debug, handlers: handlers).addChild(router.root);
-    var mounted = mount(path, _router);
+    var mounted = mount(path.toString(), _router);
 
     if (_router is Routable) {
       // Copy services, too. :)
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index f9d07318..7029bb4f 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -31,7 +31,7 @@ typedef FutureOr AngelConfigurer(Angel app);
 /// A powerful real-time/REST/MVC server class.
 class Angel extends AngelBase {
   final List<Angel> _children = [];
-  final Map<String, Tuple3<List, Map, ParseResult<Map<String, String>>>>
+  final Map<String, Tuple3<List, Map, ParseResult<Map<String, dynamic>>>>
       handlerCache = new HashMap();
 
   Router _flattened;
@@ -186,7 +186,7 @@ class Angel extends AngelBase {
           'This route will be ignored, and no requests will ever reach it.');
     }
     return super
-        .mount(path, router, hooked: hooked != false, namespace: namespace);
+        .mount(path.toString(), router, hooked: hooked != false, namespace: namespace);
   }
 
   /// Loads some base dependencies into the service container.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 3cd6e6fd..ca59dbb0 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -117,7 +117,7 @@ class Service extends Routable {
     if (before != null) handlers.addAll(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(service.index, Middleware);
-    get('/', (req, res) {
+    get('/', (RequestContext req, res) {
       return this.index(mergeMap([
         {'query': req.query},
         restProvider,
@@ -154,7 +154,7 @@ class Service extends Routable {
 
     get(
         '/:id',
-        (req, res) => this.read(
+        (RequestContext req, res) => this.read(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
@@ -214,7 +214,7 @@ class Service extends Routable {
     Middleware removeMiddleware = getAnnotation(service.remove, Middleware);
     delete(
         '/',
-        (req, res) => this.remove(
+        (RequestContext req, res) => this.remove(
             null,
             mergeMap([
               {'query': req.query},
@@ -227,7 +227,7 @@ class Service extends Routable {
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete(
         '/:id',
-        (req, res) => this.remove(
+        (RequestContext req, res) => this.remove(
             toId(req.params['id']),
             mergeMap([
               {'query': req.query},
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index 9ee37834..aa9821c9 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -37,15 +37,15 @@ class TypedService<T> extends Service {
       Model result = god.deserializeDatum(data, outputType: T);
 
       if (data['createdAt'] is DateTime) {
-        result.createdAt = data['createdAt'];
+        result.createdAt = data['createdAt'] as DateTime;
       } else if (data['created_at'] is DateTime) {
-        result.createdAt = data['created_at'];
+        result.createdAt = data['created_at'] as DateTime;
       }
 
       if (data['updatedAt'] is DateTime) {
-        result.updatedAt = data['updatedAt'];
+        result.updatedAt = data['updatedAt'] as DateTime;
       } else if (data['updated_at'] is DateTime) {
-        result.updatedAt = data['updated_at'];
+        result.updatedAt = data['updated_at'] as DateTime;
       }
 
       // print('x: $x\nresult: $result');
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 0c5ec736..7f9919be 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -112,7 +112,7 @@ class AngelHttp {
           var path = req.path;
           if (path == '/') path = '';
 
-          Tuple3<List, Map, ParseResult<Map<String, String>>> resolveTuple() {
+          Tuple3<List, Map, ParseResult<Map<String, dynamic>>> resolveTuple() {
             Router r = app.optimizedRouter;
             var resolved =
                 r.resolveAbsolute(path, method: req.method, strip: false);
@@ -147,7 +147,7 @@ class AngelHttp {
             else {
               var current = runPipeline;
               runPipeline = () => current().then((result) =>
-                  !result ? result : app.executeHandler(handler, req, res));
+                  !result ? new Future.value(result) : app.executeHandler(handler, req, res));
             }
           }
 
@@ -157,7 +157,7 @@ class AngelHttp {
         }
 
         if (useZone == false) {
-          return handle().catchError((e, st) {
+          return handle().catchError((e, StackTrace st) {
             if (e is FormatException)
               throw new AngelHttpException.badRequest(message: e.message)
                 ..stackTrace = st;
@@ -196,7 +196,7 @@ class AngelHttp {
                 }
 
                 return handleAngelHttpException(e, trace, req, res, request);
-              }).catchError((e, st) {
+              }).catchError((e, StackTrace st) {
                 var trace = new Trace.from(st ?? StackTrace.current).terse;
                 request.response.close();
                 // Ideally, we won't be in a position where an absolutely fatal error occurs,
@@ -353,7 +353,7 @@ class AngelHttp {
   Future<ResponseContext> createResponseContext(HttpResponse response,
           [RequestContext correspondingRequest]) =>
       new Future<ResponseContext>.value(
-          new HttpResponseContextImpl(response, app, correspondingRequest)
+          new HttpResponseContextImpl(response, app, correspondingRequest as HttpRequestContextImpl)
             ..serializer = (app.serializer ?? god.serialize)
             ..encoders.addAll(app.encoders ?? {}));
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 40493bb2..f4e8005b 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -27,7 +27,7 @@ class Controller {
   Controller({this.debug: false, this.injectSingleton: true});
 
   @mustCallSuper
-  Future configureServer(Angel app)  {
+  Future configureServer(Angel app) {
     _app = app;
 
     if (injectSingleton != false) _app.container.singleton(this);
@@ -59,7 +59,7 @@ class Controller {
     return new Future.value();
   }
 
-  Function _routeBuilder(
+  void Function(Symbol, MethodMirror) _routeBuilder(
       InstanceMirror instanceMirror, Routable routable, List handlers) {
     return (Symbol methodName, MethodMirror method) {
       if (method.isRegularMethod &&
@@ -74,7 +74,8 @@ class Controller {
 
         if (exposeDecl == null) return;
 
-        var reflectedMethod = instanceMirror.getField(methodName).reflectee;
+        var reflectedMethod =
+            instanceMirror.getField(methodName).reflectee as Function;
         var middleware = []..addAll(handlers)..addAll(exposeDecl.middleware);
         String name = exposeDecl.as?.isNotEmpty == true
             ? exposeDecl.as
@@ -86,9 +87,10 @@ class Controller {
             method.parameters[1].type.reflectedType == ResponseContext) {
           // Create a regular route
           routeMappings[name] = routable
-              .addRoute(exposeDecl.method, exposeDecl.path, (req, res)  {
-            var result =   reflectedMethod(req, res);
-            return result is RequestHandler ?   result(req, res) : result;
+              .addRoute(exposeDecl.method, exposeDecl.path,
+                  (RequestContext req, ResponseContext res) {
+            var result = reflectedMethod(req, res);
+            return result is RequestHandler ? result(req, res) : result;
           }, middleware: middleware);
           return;
         }
@@ -112,5 +114,5 @@ class Controller {
   Expose findExpose() => reflectClass(runtimeType)
       .metadata
       .map((m) => m.reflectee)
-      .firstWhere((r) => r is Expose, orElse: () => null);
+      .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
 }
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index c483de8a..5de674e2 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -27,7 +27,7 @@ class HttpRequestContextImpl extends RequestContext {
 
   @override
   String get hostname {
-    return io.headers.value(HttpHeaders.HOST);
+    return io.headers.value('host');
   }
 
   /// The underlying [HttpRequest] instance underneath this context.
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 56f3b324..a6f200ba 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -68,7 +68,7 @@ class HttpResponseContextImpl extends ResponseContext {
 
     if (encoders.isNotEmpty && correspondingRequest != null) {
       var allowedEncodings = correspondingRequest.headers
-          .value(HttpHeaders.ACCEPT_ENCODING)
+          .value('accept-encoding')
           ?.split(',')
           ?.map((s) => s.trim())
           ?.where((s) => s.isNotEmpty)
@@ -92,7 +92,7 @@ class HttpResponseContextImpl extends ResponseContext {
 
           if (encoder != null) {
             if (firstStream) {
-              io.headers.set(HttpHeaders.CONTENT_ENCODING, key);
+              io.headers.set('content-encoding', key);
             }
 
             output = encoders[key].bind(output);
diff --git a/lib/src/stats/metric_server.dart b/lib/src/stats/metric_server.dart
deleted file mode 100644
index 5aa7463a..00000000
--- a/lib/src/stats/metric_server.dart
+++ /dev/null
@@ -1,118 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-import '../core/core.dart';
-import '../http/http.dart';
-import 'stats.dart';
-
-@deprecated
-class AngelMetrics extends Angel {
-  Angel _inner;
-  StreamSubscription<HttpRequest> _sub;
-
-  AngelMetrics() : super() {
-    get('/metrics', (req, res) {
-      res.contentType = ContentType.HTML;
-
-      var rows = stats.all.map((stat) {
-        return '''
-          <tr>
-              <td>${stat.name}</td>
-              <td>${stat.iterations}</td>
-              <td>${stat.sum}ms</td>
-              <td>${stat.average.toStringAsFixed(2)}ms</td>
-            </tr>''';
-      }).join();
-
-      res.write('''
-        <!DOCTYPE html>
-        <html>
-          <head>
-            <meta name="viewport" content="width=device-width, initial-scale=1">
-            <title>Metrics</title>
-          </head>
-          <body>
-            <h1>Metrics</h1>
-            <i>Updated every 5 seconds</i>
-            <table>
-              <thead>
-                <tr>
-                  <th>Stat</th>
-                  <th># Iterations</th>
-                  <th>Total (ms)</th>
-                  <th>Average (ms)</th>
-                </tr>
-              </thead>
-              <tbody>$rows</tbody>
-            </table>
-            <script>
-              window.setTimeout(function() {
-                window.location.reload();
-              }, 5000);
-            </script>
-          </body>
-        </html>
-        ''');
-    });
-  }
-
-  final AngelMetricsStats stats = new AngelMetricsStats._();
-
-  @override
-  Future<HttpServer> close()  {
-    _sub?.cancel();
-      _inner.close();
-    return   super.close();
-  }
-
-  @override
-  Iterable<RoutingResult> resolveAll(String absolute, String relative,
-      {String method: 'GET', bool strip: true}) {
-    return stats.resolveAll.run(() =>
-        _inner.resolveAll(absolute, relative, method: method, strip: strip));
-  }
-
-  @override
-  Future<bool> executeHandler(
-      handler, RequestContext req, ResponseContext res) {
-    return stats.executeHandler
-        .run<bool>(() => super.executeHandler(handler, req, res));
-  }
-
-  @override
-  Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
-    return stats.getHandlerResult
-        .run(() => super.getHandlerResult(handler, req, res));
-  }
-
-  @override
-  Future runContained(
-      Function handler, RequestContext req, ResponseContext res) {
-    return stats.runContained.run(() => super.runContained(handler, req, res));
-  }
-}
-
-class AngelMetricsStats {
-  AngelMetricsStats._() {
-    all = [
-      resolveAll,
-      executeHandler,
-      getHandlerResult,
-      runContained,
-    ];
-  }
-
-  final Stats resolveAll = new Stats('resolveAll');
-  final Stats executeHandler = new Stats('executeHandler');
-  final Stats getHandlerResult = new Stats('getHandlerResult');
-  final Stats runContained = new Stats('runContained');
-
-  List<Stats> all;
-
-  void add(Stats stats) {
-    all.add(stats);
-  }
-
-  void log() {
-    all.forEach((s) => s.log());
-  }
-}
diff --git a/lib/src/stats/stats.dart b/lib/src/stats/stats.dart
deleted file mode 100644
index 2c42a5dc..00000000
--- a/lib/src/stats/stats.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-/// Computes averages progressively.
-
-import 'dart:async';
-
-class Stats {
-  final String name;
-
-  int _total = 0, _count = 0;
-  double _average = 0.0;
-
-  Stats(this.name);
-
-  double get average => _average ?? (_total / _count);
-
-  int get iterations => _count;
-
-  int get sum => _total;
-
-  void log() {
-    print('$name: $average avg.');
-  }
-
-  void add(int value) {
-    _average = null;
-    _total += value;
-    _count++;
-  }
-
-  FutureOr<T> run<T>(FutureOr<T> f()) {
-    var sw = new Stopwatch();
-    //print('--- $name START');
-    sw.start();
-
-    void whenDone() {
-      sw.stop();
-      var ms = sw.elapsedMilliseconds;
-      add(ms);
-      //print('--- $name DONE after ${ms}ms');
-    }
-
-    var r = f();
-
-    if (r is Future) {
-      return (r as Future).then((x) {
-        whenDone();
-        return x;
-      });
-    }
-
-    whenDone();
-    return r;
-  }
-}
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 9586611c..435ad4e9 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -20,7 +20,7 @@ getAnnotation(obj, Type T) {
     MethodMirror methodMirror = (reflect(obj) as ClosureMirror).function;
     return matchingAnnotation(methodMirror.metadata, T);
   } else {
-    ClassMirror classMirror = reflectClass(obj.runtimeType);
+    ClassMirror classMirror = reflectClass(obj.runtimeType as Type);
     return matchingAnnotation(classMirror.metadata, T);
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 37e15872..4ee94a3e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+4
+version: 1.1.4+5
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index 0c93b6a9..2fe4e6bc 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -10,34 +9,36 @@ main() {
   test('no content type', () async {
     var req = await acceptContentTypes();
     expect(req.acceptsAll, isFalse);
-    expect(req.accepts(ContentType.JSON), isFalse);
+    //expect(req.accepts(ContentType.JSON), isFalse);
     expect(req.accepts('application/json'), isFalse);
-    expect(req.accepts(ContentType.HTML), isFalse);
+    //expect(req.accepts(ContentType.HTML), isFalse);
     expect(req.accepts('text/html'), isFalse);
   });
 
   test('wildcard', () async {
     var req = await acceptContentTypes(['*/*']);
     expect(req.acceptsAll, isTrue);
-    expect(req.accepts(ContentType.JSON), isTrue);
+    //expect(req.accepts(ContentType.JSON), isTrue);
     expect(req.accepts('application/json'), isTrue);
-    expect(req.accepts(ContentType.HTML), isTrue);
+    //expect(req.accepts(ContentType.HTML), isTrue);
     expect(req.accepts('text/html'), isTrue);
   });
 
   test('specific type', () async {
     var req = await acceptContentTypes(['text/html']);
     expect(req.acceptsAll, isFalse);
-    expect(req.accepts(ContentType.JSON), isFalse);
+    //expect(req.accepts(ContentType.JSON), isFalse);
     expect(req.accepts('application/json'), isFalse);
-    expect(req.accepts(ContentType.HTML), isTrue);
+    //expect(req.accepts(ContentType.HTML), isTrue);
     expect(req.accepts('text/html'), isTrue);
   });
 
   test('strict', () async {
     var req = await acceptContentTypes(['text/html', "*/*"]);
-    expect(req.accepts(ContentType.HTML), isTrue);
-    expect(req.accepts(ContentType.JSON, strict: true), isFalse);
+    expect(req.accepts('text/html'), isTrue);
+    //expect(req.accepts(ContentType.HTML), isTrue);
+    //expect(req.accepts(ContentType.JSON, strict: true), isFalse);
+    expect(req.accepts('application/json', strict: true), isFalse);
   });
 
   group('disallow null', () {
@@ -57,7 +58,7 @@ Future<RequestContext> acceptContentTypes(
     [Iterable<String> contentTypes = const []]) {
   var headerString = contentTypes.isEmpty ? null : contentTypes.join(',');
   var rq = new MockHttpRequest('GET', ENDPOINT);
-  rq.headers.set(HttpHeaders.ACCEPT, headerString);
+  rq.headers.set('accept', headerString);
   rq.close();
   var app = new Angel();
   var http = new AngelHttp(app);
diff --git a/test/controller_test.dart b/test/controller_test.dart
index a4307b2e..47289020 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -100,7 +100,7 @@ main() {
   test('optional name', () async {
     var app = new Angel();
     await app.configure(new NamedController().configureServer);
-    expect(app.controllers['foo'], new isInstanceOf<NamedController>());
+    expect(app.controllers['foo'], const TypeMatcher<NamedController>());
   });
 
   test("middleware", () async {
diff --git a/test/di_test.dart b/test/di_test.dart
index 56b2a966..db9db0c9 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -61,7 +61,7 @@ main() {
 }
 
 void validateTodoSingleton(response) {
-  Map todo = json.decode(response.body);
+  Map todo = json.decode(response.body.toString());
   expect(todo["id"], equals(null));
   expect(todo["text"], equals(TEXT));
   expect(todo["over"], equals(OVER));
diff --git a/test/exception_test.dart b/test/exception_test.dart
index 0a852a9a..28937a1e 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:matcher/matcher.dart';
@@ -7,29 +6,29 @@ import 'package:test/test.dart';
 main() {
   test('named constructors', () {
     expect(new AngelHttpException.badRequest(),
-        isException(HttpStatus.BAD_REQUEST, '400 Bad Request'));
+        isException(400, '400 Bad Request'));
     expect(new AngelHttpException.notAuthenticated(),
-        isException(HttpStatus.UNAUTHORIZED, '401 Not Authenticated'));
+        isException(401, '401 Not Authenticated'));
     expect(new AngelHttpException.paymentRequired(),
-        isException(HttpStatus.PAYMENT_REQUIRED, '402 Payment Required'));
+        isException(402, '402 Payment Required'));
     expect(new AngelHttpException.forbidden(),
-        isException(HttpStatus.FORBIDDEN, '403 Forbidden'));
+        isException(403, '403 Forbidden'));
     expect(new AngelHttpException.notFound(),
-        isException(HttpStatus.NOT_FOUND, '404 Not Found'));
+        isException(404, '404 Not Found'));
     expect(new AngelHttpException.methodNotAllowed(),
-        isException(HttpStatus.METHOD_NOT_ALLOWED, '405 Method Not Allowed'));
+        isException(405, '405 Method Not Allowed'));
     expect(new AngelHttpException.notAcceptable(),
-        isException(HttpStatus.NOT_ACCEPTABLE, '406 Not Acceptable'));
+        isException(406, '406 Not Acceptable'));
     expect(new AngelHttpException.methodTimeout(),
-        isException(HttpStatus.REQUEST_TIMEOUT, '408 Timeout'));
+        isException(408, '408 Timeout'));
     expect(new AngelHttpException.conflict(),
-        isException(HttpStatus.CONFLICT, '409 Conflict'));
+        isException(409, '409 Conflict'));
     expect(new AngelHttpException.notProcessable(),
         isException(422, '422 Not Processable'));
     expect(new AngelHttpException.notImplemented(),
-        isException(HttpStatus.NOT_IMPLEMENTED, '501 Not Implemented'));
+        isException(501, '501 Not Implemented'));
     expect(new AngelHttpException.unavailable(),
-        isException(HttpStatus.SERVICE_UNAVAILABLE, '503 Unavailable'));
+        isException(503, '503 Unavailable'));
   });
 
   test('fromMap', () {
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index afe51caa..0b6b0dc8 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -22,7 +22,7 @@ main() {
     client = new http.Client();
     app.use('/todos', new TypedService<Todo>(new MapService()));
     app.use('/books', new BookService());
-    Todos = app.service("todos");
+    Todos = app.service("todos") as HookedService;
 
     Todos.beforeAllStream().listen((e) {
       print('Fired ${e.eventName}! Data: ${e.data}; Params: ${e.params}');
@@ -71,7 +71,7 @@ main() {
       });
 
     var response = await client.post("$url/todos",
-        body: god.serialize({"arbitrary": "data"}), headers: headers);
+        body: god.serialize({"arbitrary": "data"}), headers: headers.cast<String, String>());
     print(response.body);
     Map result = god.deserialize(response.body);
     expect(result["hello"], equals("hooked world"));
@@ -97,7 +97,7 @@ main() {
 
   test('metadata', () async {
     final service = new HookedService(new IncrementService())..addHooks();
-    expect(service.inner, isNot(new isInstanceOf<MapService>()));
+    expect(service.inner, isNot(const TypeMatcher<MapService>()));
     IncrementService.TIMES = 0;
     await service.index();
     expect(IncrementService.TIMES, equals(2));
@@ -128,7 +128,7 @@ main() {
       print('Params to $type ${e.eventName}: ${e.params}');
       expect(e.params, isMap);
       expect(e.params.keys, contains('provider'));
-      expect(e.params['provider'], const isInstanceOf<Providers>());
+      expect(e.params['provider'], const TypeMatcher<Providers>());
     }
 
     svc
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 20af59cb..99060a62 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index ec0fada9..289eb533 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -18,7 +18,7 @@ main() {
         '/num/parsed/:num',
         waterfall([
           (RequestContext req) {
-            req.params['n'] = num.parse(req.params['num']);
+            req.params['n'] = num.parse(req.params['num'].toString());
             return true;
           },
           (num n) => n,
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 4e95e7d0..3dcc0c8a 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -118,7 +118,7 @@ main() {
     var response = await client.get('$url/name/HELLO/last/WORLD');
     print('Response: ${response.body}');
     var json_ = json.decode(response.body);
-    expect(json_, new isInstanceOf<Map<String, String>>());
+    expect(json_, const TypeMatcher<Map>());
     expect(json_['first'], equals('HELLO'));
     expect(json_['last'], equals('WORLD'));
   });
@@ -157,7 +157,7 @@ main() {
     Map headers = {'Content-Type': 'application/json'};
     String postData = json.encode({'it': 'works'});
     var response =
-        await client.post("$url/lambda", headers: headers, body: postData);
+        await client.post("$url/lambda", headers: headers.cast<String, String>(), body: postData);
     print('Response: ${response.body}');
     expect(json.decode(response.body)['it'], equals('works'));
   });
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index ad31a54b..24929afb 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -15,7 +15,7 @@ main() {
       ..get(
           '/bar',
           (req, ResponseContext res) =>
-              res.serialize({'hello': 'world'}, contentType: ContentType.HTML));
+              res.serialize({'hello': 'world'}, contentType: 'text/html'));
     client = new http.Client();
 
     server = await new AngelHttp(app).startServer();
@@ -33,12 +33,10 @@ main() {
   test("correct content-type", () async {
     var response = await client.get('$url/foo');
     print('Response: ${response.body}');
-    expect(response.headers[HttpHeaders.CONTENT_TYPE],
-        contains(ContentType.JSON.mimeType));
+    expect(response.headers['content-type'], contains('application/json'));
 
     response = await client.get('$url/bar');
     print('Response: ${response.body}');
-    expect(response.headers[HttpHeaders.CONTENT_TYPE],
-        contains(ContentType.HTML.mimeType));
+    expect(response.headers['content-type'], contains('text/html'));
   });
 }
diff --git a/test/server_test.dart b/test/server_test.dart
index 558ffbaa..15b42bdf 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -47,8 +47,8 @@ main() {
     await app.errorHandler(e, req, res);
     await http.sendResponse(rq, req, res);
     expect(
-      ContentType.parse(rs.headers.value(HttpHeaders.CONTENT_TYPE)).mimeType,
-      ContentType.HTML.mimeType,
+      ContentType.parse(rs.headers.value('content-type')).mimeType,
+      'text/html',
     );
     expect(rs.statusCode, e.statusCode);
     var body = await rs.transform(utf8.decoder).join();
@@ -169,35 +169,35 @@ main() {
 
     test('can send json', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
-        ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
+        ..headers.set('accept', 'application/json');
       rq.close();
       http.handleRequest(rq);
       await rq.response.toList();
-      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(rq.response.statusCode, 403);
       expect(
-          rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
+          rq.response.headers.contentType.mimeType, 'application/json');
     });
 
     test('can throw in finalizer', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
-        ..headers.set(HttpHeaders.ACCEPT, ContentType.JSON.toString());
+        ..headers.set('accept', 'application/json');
       rq.close();
       http.handleRequest(rq);
       await rq.response.toList();
-      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(rq.response.statusCode, 403);
       expect(
-          rq.response.headers.contentType.mimeType, ContentType.JSON.mimeType);
+          rq.response.headers.contentType.mimeType, 'application/json');
     });
 
     test('can send html', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
-      rq.headers.set(HttpHeaders.ACCEPT, ContentType.HTML.toString());
+      rq.headers.set('accept', 'text/html');
       rq.close();
       http.handleRequest(rq);
       await rq.response.toList();
-      expect(rq.response.statusCode, HttpStatus.FORBIDDEN);
+      expect(rq.response.statusCode, 403);
       expect(
-          rq.response.headers.contentType?.mimeType, ContentType.HTML.mimeType);
+          rq.response.headers.contentType?.mimeType, 'text/html');
     });
   });
 }
diff --git a/test/services_test.dart b/test/services_test.dart
index 7ea687fe..06ae7e5e 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -52,7 +52,7 @@ main() {
     test('can create data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       var response =
-          await client.post("$url/todos", headers: headers, body: postData);
+          await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 201);
       var json = god.deserialize(response.body);
       print(json);
@@ -61,7 +61,7 @@ main() {
 
     test('can fetch data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       var response = await client.get("$url/todos/0");
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
@@ -71,10 +71,10 @@ main() {
 
     test('can modify data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       postData = god.serialize({'text': 'modified'});
       var response =
-          await client.patch("$url/todos/0", headers: headers, body: postData);
+          await client.patch("$url/todos/0", headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -83,10 +83,10 @@ main() {
 
     test('can overwrite data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers, body: postData);
+      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
       postData = god.serialize({'over': 'write'});
       var response =
-          await client.post("$url/todos/0", headers: headers, body: postData);
+          await client.post("$url/todos/0", headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -97,7 +97,7 @@ main() {
     test('can delete data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       var created = await client
-          .post("$url/todos", headers: headers, body: postData)
+          .post("$url/todos", headers: headers.cast<String, String>(), body: postData)
           .then((r) => json.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 798442ab..f6b86091 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -29,7 +29,7 @@ main() {
       },
     );
 
-    app.get('/hello', (res) {
+    app.get('/hello', (ResponseContext res) {
       new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]).pipe(res);
     });
 
@@ -48,7 +48,7 @@ main() {
       await res.close();
     });
 
-    app.get('/overwrite', (res) async {
+    app.get('/overwrite', (ResponseContext res) async {
       res.statusCode = 32;
       await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
diff --git a/test/typed_service_test.dart b/test/typed_service_test.dart
index f084de04..4b4b1b28 100644
--- a/test/typed_service_test.dart
+++ b/test/typed_service_test.dart
@@ -24,7 +24,7 @@ main() {
         new Todo(text: 'a', completed: false, createdAt: now, updatedAt: now);
     var m = svc.serialize(t);
     print(m);
-    expect(m, {
+    expect(m..remove('_identityHashCode'), {
       'id': null,
       'createdAt': now.toIso8601String(),
       'updatedAt': now.toIso8601String(),
@@ -39,7 +39,7 @@ main() {
       'createdAt': now.toIso8601String(),
       'updatedAt': now.toIso8601String()
     });
-    expect(m, new isInstanceOf<Todo>());
+    expect(m, const TypeMatcher<Todo>());
     var t = m as Todo;
     expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
   });
@@ -50,7 +50,7 @@ main() {
       'created_at': now.toIso8601String(),
       'updated_at': now.toIso8601String()
     });
-    expect(m, new isInstanceOf<Todo>());
+    expect(m, const TypeMatcher<Todo>());
     var t = m as Todo;
     expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
   });

From 4e6d280b8f7a0c9c9fb7b8104aa8d9c0bb5baf52 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Jun 2018 23:59:41 -0400
Subject: [PATCH 211/414] +6

---
 .idea/libraries/Dart_Packages.xml  |   4 +-
 .idea/workspace.xml                | 327 ++++++++++-------------------
 CHANGELOG.md                       |   4 +
 lib/http.dart                      |   2 +-
 lib/src/core/core.dart             |   2 +-
 lib/src/core/injection.dart        |   1 +
 lib/src/core/response_context.dart |   9 +-
 lib/src/core/server.dart           |   4 +-
 lib/src/core/service.dart          |   3 +-
 lib/src/http/angel_http.dart       |  13 +-
 lib/src/http/http.dart             |   7 +-
 performance/hello/raw.dart         |   4 +-
 pubspec.yaml                       |   2 +-
 test/encoders_buffer_test.dart     |   2 +-
 test/exception_test.dart           |  11 +-
 test/hooked_test.dart              |   3 +-
 test/parameter_meta_test.dart      |   6 +-
 test/routing_test.dart             |   7 +-
 test/server_test.dart              |   9 +-
 test/services_test.dart            |  24 ++-
 20 files changed, 169 insertions(+), 275 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 1f841d46..96178457 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
         <entry key="angel_http_exception">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+1/lib" />
             </list>
           </value>
         </entry>
@@ -496,7 +496,7 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 36f5c394..666b15d3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,43 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Fix hooking bug">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/analysis_options.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/analysis_options.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/metrics.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/stats/metric_server.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/stats/stats.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/typed_service_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -60,95 +27,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="127" column="57" selection-start-line="127" selection-start-column="57" selection-end-line="127" selection-end-column="57" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="32">
+            <state relative-caret-position="-504">
               <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="120" column="39" selection-start-line="120" selection-start-column="39" selection-end-line="120" selection-end-column="39" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="109">
-              <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="serialize_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="20" selection-start-column="20" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="146">
-              <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="exception_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
-              <folding>
-                <element signature="e#1#55#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http_exception.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="142">
-              <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
+            <state relative-caret-position="283">
+              <caret line="146" column="58" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
             </state>
           </provider>
         </entry>
@@ -165,17 +57,15 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>execute</find>
-      <find>lazyBod</find>
       <find>lazyBody()</find>
       <find>addRout</find>
       <find>lazyBody</find>
-      <find>_body = nu</find>
+      <find />
       <find>_body</find>
       <find>MID</find>
       <find>beforeIndex</find>
       <find>read(</find>
-      <find>new Trac</find>
+      <find />
       <find>frame</find>
       <find>logger.</find>
       <find>Stopwa</find>
@@ -190,24 +80,26 @@
       <find>HttpStatus.</find>
       <find>JSON</find>
       <find>ContentType.JSON.toString()</find>
-      <find>(req, res)</find>
-      <find>headers: headers,</find>
+      <find />
+      <find />
       <find>_</find>
       <find>ContentType.HTML.mimeType</find>
       <find>ContentType.JSON.mimeType</find>
+      <find>parameters</find>
+      <find />
     </findStrings>
     <replaceStrings>
       <replace>after</replace>
       <replace>fatalErrorStream</replace>
       <replace>onController</replace>
-      <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
+      <replace />
       <replace>logger?.warning</replace>
       <replace>JSON.decode</replace>
       <replace>query</replace>
       <replace>cookie</replace>
       <replace>req.path</replace>
       <replace>req.path`</replace>
-      <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
+      <replace />
       <replace>appa</replace>
       <replace>isClosed</replace>
       <replace>useStream</replace>
@@ -215,15 +107,15 @@
       <replace>!isOpen</replace>
       <replace>'server'</replace>
       <replace>FutureOr</replace>
-      <replace>var body = await getBody(rs);</replace>
+      <replace />
       <replace />
       <replace>=</replace>
       <replace>{</replace>
       <replace>'accept'</replace>
       <replace>'content-type'</replace>
       <replace>403</replace>
-      <replace>(RequestContext req, res)</replace>
-      <replace>headers: headers.cast&lt;String, String&gt;(),</replace>
+      <replace />
+      <replace />
       <replace>this.</replace>
       <replace>'text/html'</replace>
       <replace>'application/json'</replace>
@@ -266,7 +158,6 @@
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
         <option value="$PROJECT_DIR$/example/views/index.jl" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
@@ -276,14 +167,12 @@
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
@@ -301,6 +190,9 @@
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
       </list>
     </option>
   </component>
@@ -314,10 +206,10 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="26" />
-    <option name="y" value="22" />
-    <option name="width" value="1326" />
-    <option name="height" value="772" />
+    <option name="x" value="90" />
+    <option name="y" value="23" />
+    <option name="width" value="1282" />
+    <option name="height" value="784" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -345,6 +237,13 @@
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="core" type="cbb8eebc:String" user="core" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -398,7 +297,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Test.tests in extension_test.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -678,14 +577,8 @@
       <workItem from="1529523346006" duration="682000" />
       <workItem from="1529713102021" duration="161000" />
       <workItem from="1529722767717" duration="59000" />
-      <workItem from="1529722829709" duration="1693000" />
-    </task>
-    <task id="LOCAL-00040" summary="autoIdAndDateFields in MapService">
-      <created>1511026951368</created>
-      <option name="number" value="00040" />
-      <option name="presentableId" value="LOCAL-00040" />
-      <option name="project" value="LOCAL" />
-      <updated>1511026951368</updated>
+      <workItem from="1529722829709" duration="1759000" />
+      <workItem from="1529724977574" duration="1313000" />
     </task>
     <task id="LOCAL-00041" summary="+8">
       <created>1511026990202</created>
@@ -1023,16 +916,17 @@
       <option name="project" value="LOCAL" />
       <updated>1529523884121</updated>
     </task>
-    <option name="localTasksCounter" value="89" />
+    <task id="LOCAL-00089" summary="+5">
+      <created>1529724578292</created>
+      <option name="number" value="00089" />
+      <option name="presentableId" value="LOCAL-00089" />
+      <option name="project" value="LOCAL" />
+      <updated>1529724578293</updated>
+    </task>
+    <option name="localTasksCounter" value="90" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 53m 25s.xml">
-      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="can_fetch_data_in_services_test_dart - 2018.06.08 at 02h 54m 45s.xml">
-      <configuration name="can fetch data in services_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.06.08 at 02h 54m 57s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1057,9 +951,15 @@
     <history-entry file="All_Tests - 2018.06.20 at 15h 44m 03s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 46m 08s.xml">
+      <configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 57m 51s.xml">
+      <configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="151785000" />
+    <option name="totallyTimeSpent" value="153164000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1071,7 +971,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="26" y="22" width="1326" height="772" extended-state="0" />
+    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1090,28 +990,28 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33481482" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.4" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.48" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27024922" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3987879" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3927273" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24248926" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Data View" order="4" />
       <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" id="Data View" order="4" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1122,7 +1022,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Change return type of `AngelHttp.createRequestContext`" />
     <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
     <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
     <MESSAGE value="Deprecated AngelMetrics" />
@@ -1147,7 +1046,8 @@
     <MESSAGE value="1.1.4+2" />
     <MESSAGE value="Fix async bugs" />
     <MESSAGE value="Fix hooking bug" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix hooking bug" />
+    <MESSAGE value="+5" />
+    <option name="LAST_COMMIT_MESSAGE" value="+5" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1294,16 +1194,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="32">
-            <caret line="2" column="33" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -1311,20 +1201,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="33" column="21" lean-forward="true" selection-start-line="33" selection-start-column="21" selection-end-line="33" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1152">
-          <caret line="76" column="11" selection-start-line="76" selection-start-column="11" selection-end-line="76" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="256">
@@ -1367,13 +1245,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="79" column="40" selection-start-line="79" selection-start-column="40" selection-end-line="79" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="293">
@@ -1412,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="14" column="19" lean-forward="true" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="408">
@@ -1456,29 +1320,53 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
+        <state relative-caret-position="1488">
           <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
+        <state relative-caret-position="224">
           <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
+        <state relative-caret-position="224">
+          <caret line="17" column="27" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="816">
+          <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="16">
+            <caret line="1" column="53" selection-start-line="1" selection-start-column="53" selection-end-line="1" selection-end-column="53" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
         </state>
       </provider>
     </entry>
@@ -1489,27 +1377,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="17" column="27" lean-forward="true" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
-          <folding>
-            <element signature="e#1#55#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="146">
+          <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
-          <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
+        <state relative-caret-position="-504">
+          <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="109">
-          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
+        <state relative-caret-position="283">
+          <caret line="146" column="58" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 557ac482..f3ad24b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.4+6
+* Almost 100% working with `2.0.0-dev.64.1`. In said version
+of Dart, `dart:mirrors` is broken, and therefore breaks detection of metadata.
+
 # 1.1.4+5
 * Intermediary release while patching up Dart 2 bugs.
 * Stricter Dart 2 use.
diff --git a/lib/http.dart b/lib/http.dart
index ae5160e7..5f00efff 100644
--- a/lib/http.dart
+++ b/lib/http.dart
@@ -1 +1 @@
-export 'src/http/http.dart';
\ No newline at end of file
+export 'src/http/http.dart';
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index 838311c5..999b2a6c 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -8,4 +8,4 @@ export 'response_context.dart';
 export 'routable.dart';
 export 'server.dart';
 export 'service.dart';
-export 'typed_service.dart';
\ No newline at end of file
+export 'typed_service.dart';
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 5952fded..cd03b412 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -151,6 +151,7 @@ InjectionRequest preInject(Function handler) {
         .firstWhere((m) => m.type.isAssignableTo(_Parameter),
             orElse: () => null)
         ?.reflectee as Parameter;
+    print(p);
     if (p != null) {
       injection.parameters[name] = new Parameter(
         cookie: p.cookie,
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 6330fad6..ceef8f57 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -218,8 +218,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     if (!isOpen) throw closed();
     headers
       ..['content-type'] = 'text/html'
-      ..['location'] =
-          url is String ? url : app.navigate(url as Iterable, absolute: absolute);
+      ..['location'] = url is String
+          ? url
+          : app.navigate(url as Iterable, absolute: absolute);
     statusCode = code ?? 302;
     write('''
     <!DOCTYPE html>
@@ -290,7 +291,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
 
     final head =
         controller.findExpose().path.toString().replaceAll(_straySlashes, '');
-    final tail = matched.makeUri(params.cast<String, dynamic>()).replaceAll(_straySlashes, '');
+    final tail = matched
+        .makeUri(params.cast<String, dynamic>())
+        .replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
   }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 7029bb4f..063d4f8c 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -185,8 +185,8 @@ class Angel extends AngelBase {
       logger?.warning(
           'This route will be ignored, and no requests will ever reach it.');
     }
-    return super
-        .mount(path.toString(), router, hooked: hooked != false, namespace: namespace);
+    return super.mount(path.toString(), router,
+        hooked: hooked != false, namespace: namespace);
   }
 
   /// Loads some base dependencies into the service container.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index ca59dbb0..ca464e7d 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -107,8 +107,7 @@ class Service extends Routable {
     _addRoutesInner(service ?? this, bootstrappers);
   }
 
-  void _addRoutesInner(Service service,
-      List handlers) {
+  void _addRoutesInner(Service service, List handlers) {
     Map restProvider = {'provider': Providers.rest};
 
     // Add global middleware if declared on the instance itself
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 7f9919be..b953ccae 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -146,8 +146,9 @@ class AngelHttp {
               runPipeline = () => app.executeHandler(handler, req, res);
             else {
               var current = runPipeline;
-              runPipeline = () => current().then((result) =>
-                  !result ? new Future.value(result) : app.executeHandler(handler, req, res));
+              runPipeline = () => current().then((result) => !result
+                  ? new Future.value(result)
+                  : app.executeHandler(handler, req, res));
             }
           }
 
@@ -352,10 +353,10 @@ class AngelHttp {
 
   Future<ResponseContext> createResponseContext(HttpResponse response,
           [RequestContext correspondingRequest]) =>
-      new Future<ResponseContext>.value(
-          new HttpResponseContextImpl(response, app, correspondingRequest as HttpRequestContextImpl)
-            ..serializer = (app.serializer ?? god.serialize)
-            ..encoders.addAll(app.encoders ?? {}));
+      new Future<ResponseContext>.value(new HttpResponseContextImpl(
+          response, app, correspondingRequest as HttpRequestContextImpl)
+        ..serializer = (app.serializer ?? god.serialize)
+        ..encoders.addAll(app.encoders ?? {}));
 
   /// Limits the maximum number of requests to be handled concurrently by this instance.
   ///
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 71ec5e6a..3ccd949d 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -13,10 +13,11 @@ export 'http_request_context.dart';
 export 'http_response_context.dart';
 
 /// Boots a shared server instance. Use this if launching multiple isolates
-Future<HttpServer> startShared(address, int port) => HttpServer
-    .bind(address ?? '127.0.0.1', port ?? 0, shared: true);
+Future<HttpServer> startShared(address, int port) =>
+    HttpServer.bind(address ?? '127.0.0.1', port ?? 0, shared: true);
 
-Future<HttpServer> Function(dynamic, int) startSharedSecure(SecurityContext securityContext) {
+Future<HttpServer> Function(dynamic, int) startSharedSecure(
+    SecurityContext securityContext) {
   return (address, int port) => HttpServer.bindSecure(
       address ?? '127.0.0.1', port ?? 0, securityContext,
       shared: true);
diff --git a/performance/hello/raw.dart b/performance/hello/raw.dart
index 72d96ef3..956056b2 100644
--- a/performance/hello/raw.dart
+++ b/performance/hello/raw.dart
@@ -11,9 +11,7 @@ main() {
 }
 
 void start(int id) {
-  HttpServer
-      .bind('127.0.0.1', 3000, shared: true)
-      .then((server) {
+  HttpServer.bind('127.0.0.1', 3000, shared: true).then((server) {
     print(
         'Instance #$id listening at http://${server.address.address}:${server.port}');
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 4ee94a3e..c2288c80 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+5
+version: 1.1.4+6
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index d8193967..3a76eef7 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -96,7 +96,7 @@ void encodingTests(Angel getApp()) {
       await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
-      
+
       var body = await getBody(rs);
       expect(rs.headers.value('content-encoding'), 'gzip');
       expect(body, gzip.encode(utf8.encode('Hello, world!')));
diff --git a/test/exception_test.dart b/test/exception_test.dart
index 28937a1e..0e23f5b4 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -11,18 +11,17 @@ main() {
         isException(401, '401 Not Authenticated'));
     expect(new AngelHttpException.paymentRequired(),
         isException(402, '402 Payment Required'));
-    expect(new AngelHttpException.forbidden(),
-        isException(403, '403 Forbidden'));
-    expect(new AngelHttpException.notFound(),
-        isException(404, '404 Not Found'));
+    expect(
+        new AngelHttpException.forbidden(), isException(403, '403 Forbidden'));
+    expect(
+        new AngelHttpException.notFound(), isException(404, '404 Not Found'));
     expect(new AngelHttpException.methodNotAllowed(),
         isException(405, '405 Method Not Allowed'));
     expect(new AngelHttpException.notAcceptable(),
         isException(406, '406 Not Acceptable'));
     expect(new AngelHttpException.methodTimeout(),
         isException(408, '408 Timeout'));
-    expect(new AngelHttpException.conflict(),
-        isException(409, '409 Conflict'));
+    expect(new AngelHttpException.conflict(), isException(409, '409 Conflict'));
     expect(new AngelHttpException.notProcessable(),
         isException(422, '422 Not Processable'));
     expect(new AngelHttpException.notImplemented(),
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 0b6b0dc8..b2faf6fc 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -71,7 +71,8 @@ main() {
       });
 
     var response = await client.post("$url/todos",
-        body: god.serialize({"arbitrary": "data"}), headers: headers.cast<String, String>());
+        body: god.serialize({"arbitrary": "data"}),
+        headers: headers.cast<String, String>());
     print(response.body);
     Map result = god.deserialize(response.body);
     expect(result["hello"], equals("hooked world"));
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 99060a62..1e568316 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -85,12 +85,14 @@ main() {
     // Invalid request
     var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
     var rs = rq.response;
-    http.handleRequest(rq).timeout(const Duration(seconds: 5)).catchError((_) => null);
+    http
+        .handleRequest(rq)
+        .timeout(const Duration(seconds: 5))
+        .catchError((_) => null);
 
     await printResponse(rs);
     expect(rs.statusCode, 500);
 
-
     rq = new MockHttpRequest('GET', Uri.parse('/session'));
     rq.session['foo'] = 'bar';
     rq.close();
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 3dcc0c8a..ab390e3b 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -94,8 +94,7 @@ main() {
     app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
     client = new http.Client();
-    var server =
-        await new AngelHttp(app).startServer('127.0.0.1', 0);
+    var server = await new AngelHttp(app).startServer('127.0.0.1', 0);
     url = "http://${server.address.host}:${server.port}";
   });
 
@@ -156,8 +155,8 @@ main() {
   test('Can serialize function result as JSON', () async {
     Map headers = {'Content-Type': 'application/json'};
     String postData = json.encode({'it': 'works'});
-    var response =
-        await client.post("$url/lambda", headers: headers.cast<String, String>(), body: postData);
+    var response = await client.post("$url/lambda",
+        headers: headers.cast<String, String>(), body: postData);
     print('Response: ${response.body}');
     expect(json.decode(response.body)['it'], equals('works'));
   });
diff --git a/test/server_test.dart b/test/server_test.dart
index 15b42bdf..7c450f81 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -174,8 +174,7 @@ main() {
       http.handleRequest(rq);
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
-      expect(
-          rq.response.headers.contentType.mimeType, 'application/json');
+      expect(rq.response.headers.contentType.mimeType, 'application/json');
     });
 
     test('can throw in finalizer', () async {
@@ -185,8 +184,7 @@ main() {
       http.handleRequest(rq);
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
-      expect(
-          rq.response.headers.contentType.mimeType, 'application/json');
+      expect(rq.response.headers.contentType.mimeType, 'application/json');
     });
 
     test('can send html', () async {
@@ -196,8 +194,7 @@ main() {
       http.handleRequest(rq);
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
-      expect(
-          rq.response.headers.contentType?.mimeType, 'text/html');
+      expect(rq.response.headers.contentType?.mimeType, 'text/html');
     });
   });
 }
diff --git a/test/services_test.dart b/test/services_test.dart
index 06ae7e5e..95299bc0 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -51,8 +51,8 @@ main() {
 
     test('can create data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      var response =
-          await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
+      var response = await client.post("$url/todos",
+          headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 201);
       var json = god.deserialize(response.body);
       print(json);
@@ -61,7 +61,8 @@ main() {
 
     test('can fetch data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
+      await client.post("$url/todos",
+          headers: headers.cast<String, String>(), body: postData);
       var response = await client.get("$url/todos/0");
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
@@ -71,10 +72,11 @@ main() {
 
     test('can modify data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
+      await client.post("$url/todos",
+          headers: headers.cast<String, String>(), body: postData);
       postData = god.serialize({'text': 'modified'});
-      var response =
-          await client.patch("$url/todos/0", headers: headers.cast<String, String>(), body: postData);
+      var response = await client.patch("$url/todos/0",
+          headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -83,10 +85,11 @@ main() {
 
     test('can overwrite data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
-      await client.post("$url/todos", headers: headers.cast<String, String>(), body: postData);
+      await client.post("$url/todos",
+          headers: headers.cast<String, String>(), body: postData);
       postData = god.serialize({'over': 'write'});
-      var response =
-          await client.post("$url/todos/0", headers: headers.cast<String, String>(), body: postData);
+      var response = await client.post("$url/todos/0",
+          headers: headers.cast<String, String>(), body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -97,7 +100,8 @@ main() {
     test('can delete data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       var created = await client
-          .post("$url/todos", headers: headers.cast<String, String>(), body: postData)
+          .post("$url/todos",
+              headers: headers.cast<String, String>(), body: postData)
           .then((r) => json.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);

From 5cb941676f29951dff888fb17db857fbe901d7f0 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 27 Jun 2018 14:40:43 -0400
Subject: [PATCH 212/414] +7

---
 .idea/libraries/Dart_Packages.xml  |   4 +-
 .idea/workspace.xml                | 303 +++++++++++++++++------------
 CHANGELOG.md                       |   5 +
 lib/src/core/map_service.dart      |   4 +-
 lib/src/core/request_context.dart  |   6 +-
 lib/src/core/response_context.dart |  11 +-
 pubspec.yaml                       |   2 +-
 test/hooked_test.dart              |   2 +-
 test/routing_test.dart             |   2 +-
 test/services_test.dart            |  14 +-
 10 files changed, 211 insertions(+), 142 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 96178457..a3778520 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -313,7 +313,7 @@
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib" />
             </list>
           </value>
         </entry>
@@ -539,7 +539,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 666b15d3..d0e80bfa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,17 +34,65 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-504">
+            <state relative-caret-position="32">
               <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="283">
-              <caret line="146" column="58" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
+            <state relative-caret-position="437">
+              <caret line="50" column="75" selection-start-line="50" selection-start-column="75" selection-end-line="50" selection-end-column="75" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2320">
+              <caret line="154" column="25" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="206">
+              <caret line="319" column="20" lean-forward="true" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="165">
+              <caret line="133" column="36" selection-start-line="133" selection-start-column="36" selection-end-line="133" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="176">
+              <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
             </state>
           </provider>
         </entry>
@@ -57,15 +109,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>lazyBody()</find>
-      <find>addRout</find>
-      <find>lazyBody</find>
-      <find />
-      <find>_body</find>
-      <find>MID</find>
       <find>beforeIndex</find>
       <find>read(</find>
-      <find />
+      <find>new Trac</find>
       <find>frame</find>
       <find>logger.</find>
       <find>Stopwa</find>
@@ -80,26 +126,29 @@
       <find>HttpStatus.</find>
       <find>JSON</find>
       <find>ContentType.JSON.toString()</find>
-      <find />
-      <find />
+      <find>(req, res)</find>
+      <find>headers: headers,</find>
       <find>_</find>
       <find>ContentType.HTML.mimeType</find>
       <find>ContentType.JSON.mimeType</find>
       <find>parameters</find>
-      <find />
+      <find>cannot re</find>
+      <find>cookie</find>
+      <find>cast</find>
+      <find>cast(&lt;[^&gt;]+&gt;)\(\)</find>
+      <find>\.cast(&lt;[^&gt;]+&gt;)\(\)</find>
+      <find>.cast</find>
+      <find>serviceP</find>
     </findStrings>
     <replaceStrings>
-      <replace>after</replace>
-      <replace>fatalErrorStream</replace>
-      <replace>onController</replace>
-      <replace />
+      <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
       <replace>logger?.warning</replace>
       <replace>JSON.decode</replace>
       <replace>query</replace>
       <replace>cookie</replace>
       <replace>req.path</replace>
       <replace>req.path`</replace>
-      <replace />
+      <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
       <replace>appa</replace>
       <replace>isClosed</replace>
       <replace>useStream</replace>
@@ -107,18 +156,21 @@
       <replace>!isOpen</replace>
       <replace>'server'</replace>
       <replace>FutureOr</replace>
-      <replace />
+      <replace>var body = await getBody(rs);</replace>
       <replace />
       <replace>=</replace>
       <replace>{</replace>
       <replace>'accept'</replace>
       <replace>'content-type'</replace>
       <replace>403</replace>
-      <replace />
-      <replace />
+      <replace>(RequestContext req, res)</replace>
+      <replace>headers: headers.cast&lt;String, String&gt;(),</replace>
       <replace>this.</replace>
       <replace>'text/html'</replace>
       <replace>'application/json'</replace>
+      <replace>as $1</replace>
+      <replace>as $1</replace>
+      <replace>as Map$1</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -175,10 +227,8 @@
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
@@ -190,9 +240,11 @@
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
       </list>
     </option>
   </component>
@@ -206,8 +258,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="90" />
-    <option name="y" value="23" />
+    <option name="x" value="34" />
+    <option name="y" value="31" />
     <option name="width" value="1282" />
     <option name="height" value="784" />
   </component>
@@ -219,6 +271,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -244,6 +299,13 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="core" type="cbb8eebc:String" user="core" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -253,9 +315,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -578,14 +637,9 @@
       <workItem from="1529713102021" duration="161000" />
       <workItem from="1529722767717" duration="59000" />
       <workItem from="1529722829709" duration="1759000" />
-      <workItem from="1529724977574" duration="1313000" />
-    </task>
-    <task id="LOCAL-00041" summary="+8">
-      <created>1511026990202</created>
-      <option name="number" value="00041" />
-      <option name="presentableId" value="LOCAL-00041" />
-      <option name="project" value="LOCAL" />
-      <updated>1511026990202</updated>
+      <workItem from="1529724977574" duration="1752000" />
+      <workItem from="1530115464302" duration="135000" />
+      <workItem from="1530124258733" duration="424000" />
     </task>
     <task id="LOCAL-00042" summary="+9">
       <created>1511892890049</created>
@@ -923,7 +977,14 @@
       <option name="project" value="LOCAL" />
       <updated>1529724578293</updated>
     </task>
-    <option name="localTasksCounter" value="90" />
+    <task id="LOCAL-00090" summary="+6">
+      <created>1529726381237</created>
+      <option name="number" value="00090" />
+      <option name="presentableId" value="LOCAL-00090" />
+      <option name="project" value="LOCAL" />
+      <updated>1529726381237</updated>
+    </task>
+    <option name="localTasksCounter" value="91" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -959,7 +1020,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="153164000" />
+    <option name="totallyTimeSpent" value="154162000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -971,7 +1032,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+    <frame x="34" y="31" width="1282" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -979,7 +1040,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31111112" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -990,28 +1051,28 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3987879" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.3927273" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24248926" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.45560408" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2814516" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1022,7 +1083,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Deprecated `ResponseContext.io`, added HTTP equivalent" />
     <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
     <MESSAGE value="Deprecated AngelMetrics" />
     <MESSAGE value="Export HTTP Req+Res context" />
@@ -1047,7 +1107,8 @@
     <MESSAGE value="Fix async bugs" />
     <MESSAGE value="Fix hooking bug" />
     <MESSAGE value="+5" />
-    <option name="LAST_COMMIT_MESSAGE" value="+5" />
+    <MESSAGE value="+6" />
+    <option name="LAST_COMMIT_MESSAGE" value="+6" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1138,13 +1199,6 @@
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/validation.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
@@ -1159,13 +1213,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="29" column="33" selection-start-line="29" selection-start-column="33" selection-end-line="29" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -1180,13 +1227,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="130">
@@ -1245,13 +1285,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="154" column="25" lean-forward="true" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="236">
@@ -1263,16 +1296,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
           <caret line="145" column="66" selection-start-line="145" selection-start-column="66" selection-end-line="145" selection-end-column="66" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="100" column="43" selection-start-line="100" selection-start-column="43" selection-end-line="100" selection-end-column="43" />
         </state>
       </provider>
     </entry>
@@ -1290,13 +1313,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="204" column="44" selection-start-line="204" selection-start-column="44" selection-end-line="204" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
@@ -1346,23 +1362,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="16">
-            <caret line="1" column="53" selection-start-line="1" selection-start-column="53" selection-end-line="1" selection-end-column="53" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="109">
@@ -1384,17 +1383,79 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="235">
+          <caret line="143" lean-forward="true" selection-start-line="143" selection-end-line="143" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2320">
+          <caret line="154" column="25" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="206">
+          <caret line="319" column="20" lean-forward="true" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="133" column="36" selection-start-line="133" selection-start-column="36" selection-end-line="133" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="58">
+          <caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="48">
+            <caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-504">
+        <state relative-caret-position="32">
           <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="283">
-          <caret line="146" column="58" selection-start-line="146" selection-start-column="58" selection-end-line="146" selection-end-column="58" />
+        <state relative-caret-position="437">
+          <caret line="50" column="75" selection-start-line="50" selection-start-column="75" selection-end-line="50" selection-end-column="75" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ad24b8..2ccbac37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.1.4+7
+* Remove `cast` for Dart 1.x.
+* `RequestContext.injections` is no longer cached or read-only.
+* `ResponseContext` now has `renderParams`.
+
 # 1.1.4+6
 * Almost 100% working with `2.0.0-dev.64.1`. In said version
 of Dart, `dart:mirrors` is broken, and therefore breaks detection of metadata.
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index a405834a..d89576f4 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -85,7 +85,7 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] = now
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
-    items.add(result.cast<String, dynamic>());
+    items.add(result as Map<String, dynamic>);
     return new Future.value(result);
   }
 
@@ -130,7 +130,7 @@ class MapService extends Service {
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
               new DateTime.now().toIso8601String();
       }
-      items.add(result.cast<String, dynamic>());
+      items.add(result as Map<String, dynamic>);
       return new Future.value(result);
     });
   }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 36ad5210..cc4edf54 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -38,10 +38,9 @@ abstract class RequestContext {
   String get hostname;
 
   final Map _injections = {};
-  Map _injectionsCache;
 
-  /// A [Map] of singletons injected via [inject]. *Read-only*.
-  Map get injections => _injectionsCache ??= new Map.unmodifiable(_injections);
+  /// A [Map] of singletons injected via [inject].
+  Map get injections => _injections;
 
   /// This feature does not map to other adapters (i.e. HTTP/2), so it will be removed in a future version.
   @deprecated
@@ -173,7 +172,6 @@ abstract class RequestContext {
     }
 
     _injections[type] = value;
-    _injectionsCache = null;
   }
 
   /// Returns `true` if the client's `Accept` header indicates that the given [contentType] is considered a valid response.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index ceef8f57..0f0f8049 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -46,6 +46,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// At most one encoder will ever be used to convert data.
   final Map<String, Converter<List<int>, List<int>>> encoders = {};
 
+  /// A [Map] of data to inject when `res.render` is called.
+  ///
+  /// This can be used to reduce boilerplate when using templating engines.
+  final Map renderParams = {};
+
   /// Points to the [RequestContext] corresponding to this response.
   RequestContext get correspondingRequest;
 
@@ -200,7 +205,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) {
     if (!isOpen) throw closed();
-    return app.viewGenerator(view, data).then((content) {
+    return app.viewGenerator(view, new Map.from(renderParams)..addAll(data ?? {})).then((content) {
       write(content);
       headers['content-type'] = 'text/html';
       end();
@@ -260,7 +265,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     Route matched = _findRoute(app);
 
     if (matched != null) {
-      redirect(matched.makeUri(params.cast<String, dynamic>()), code: code);
+      redirect(matched.makeUri(params as Map<String, dynamic>), code: code);
       return;
     }
 
@@ -292,7 +297,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     final head =
         controller.findExpose().path.toString().replaceAll(_straySlashes, '');
     final tail = matched
-        .makeUri(params.cast<String, dynamic>())
+        .makeUri(params as Map<String, dynamic>)
         .replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
diff --git a/pubspec.yaml b/pubspec.yaml
index c2288c80..1d923fa1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+6
+version: 1.1.4+7
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index b2faf6fc..29f9f479 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -72,7 +72,7 @@ main() {
 
     var response = await client.post("$url/todos",
         body: god.serialize({"arbitrary": "data"}),
-        headers: headers.cast<String, String>());
+        headers: headers as Map<String, String>);
     print(response.body);
     Map result = god.deserialize(response.body);
     expect(result["hello"], equals("hooked world"));
diff --git a/test/routing_test.dart b/test/routing_test.dart
index ab390e3b..869c5619 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -156,7 +156,7 @@ main() {
     Map headers = {'Content-Type': 'application/json'};
     String postData = json.encode({'it': 'works'});
     var response = await client.post("$url/lambda",
-        headers: headers.cast<String, String>(), body: postData);
+        headers: headers as Map<String, String>, body: postData);
     print('Response: ${response.body}');
     expect(json.decode(response.body)['it'], equals('works'));
   });
diff --git a/test/services_test.dart b/test/services_test.dart
index 95299bc0..1be1999e 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -52,7 +52,7 @@ main() {
     test('can create data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       var response = await client.post("$url/todos",
-          headers: headers.cast<String, String>(), body: postData);
+          headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 201);
       var json = god.deserialize(response.body);
       print(json);
@@ -62,7 +62,7 @@ main() {
     test('can fetch data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       await client.post("$url/todos",
-          headers: headers.cast<String, String>(), body: postData);
+          headers: headers as Map<String, String>, body: postData);
       var response = await client.get("$url/todos/0");
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
@@ -73,10 +73,10 @@ main() {
     test('can modify data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       await client.post("$url/todos",
-          headers: headers.cast<String, String>(), body: postData);
+          headers: headers as Map<String, String>, body: postData);
       postData = god.serialize({'text': 'modified'});
       var response = await client.patch("$url/todos/0",
-          headers: headers.cast<String, String>(), body: postData);
+          headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -86,10 +86,10 @@ main() {
     test('can overwrite data', () async {
       String postData = god.serialize({'text': 'Hello, world!'});
       await client.post("$url/todos",
-          headers: headers.cast<String, String>(), body: postData);
+          headers: headers as Map<String, String>, body: postData);
       postData = god.serialize({'over': 'write'});
       var response = await client.post("$url/todos/0",
-          headers: headers.cast<String, String>(), body: postData);
+          headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);
       var json = god.deserialize(response.body);
       print(json);
@@ -101,7 +101,7 @@ main() {
       String postData = god.serialize({'text': 'Hello, world!'});
       var created = await client
           .post("$url/todos",
-              headers: headers.cast<String, String>(), body: postData)
+              headers: headers as Map<String, String>, body: postData)
           .then((r) => json.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);

From 3ee209678d0788abce3c80e9100e5ae52d596c7c Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 10:28:32 -0400
Subject: [PATCH 213/414] Provide custom IsInstanceOf for testing

---
 .idea/libraries/Dart_Packages.xml |  36 ++--
 .idea/workspace.xml               | 323 ++++++++++++++++--------------
 test/common.dart                  |  19 ++
 test/controller_test.dart         |   2 +-
 test/hooked_test.dart             |   4 +-
 test/routing_test.dart            |   3 +-
 test/typed_service_test.dart      |   5 +-
 7 files changed, 222 insertions(+), 170 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index a3778520..558b9ca0 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,21 +5,21 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_http_exception">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="angel_jael">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.2/lib" />
             </list>
           </value>
         </entry>
@@ -75,7 +75,7 @@
         <entry key="code_buffer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.1/lib" />
             </list>
           </value>
         </entry>
@@ -138,7 +138,7 @@
         <entry key="front_end">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.3/lib" />
             </list>
           </value>
         </entry>
@@ -201,7 +201,7 @@
         <entry key="jael">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.6+1/lib" />
             </list>
           </value>
         </entry>
@@ -236,7 +236,7 @@
         <entry key="kernel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.3/lib" />
             </list>
           </value>
         </entry>
@@ -292,7 +292,7 @@
         <entry key="node_preamble">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.3/lib" />
             </list>
           </value>
         </entry>
@@ -390,7 +390,7 @@
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.6/lib" />
             </list>
           </value>
         </entry>
@@ -495,9 +495,9 @@
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
@@ -505,7 +505,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
@@ -514,7 +514,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-2.3.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
@@ -523,12 +523,12 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.6+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
@@ -536,7 +536,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib" />
@@ -550,7 +550,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.7+1/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d0e80bfa..09a9f58c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/common.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/common.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/typed_service_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -34,20 +34,23 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="32">
-              <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
+            <state relative-caret-position="48">
+              <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="437">
-              <caret line="50" column="75" selection-start-line="50" selection-start-column="75" selection-end-line="50" selection-end-column="75" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-              </folding>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="112">
+                <caret line="7" column="9" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -61,38 +64,53 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2320">
-              <caret line="154" column="25" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="206">
-              <caret line="319" column="20" lean-forward="true" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
+            <state relative-caret-position="400">
+              <caret line="319" column="20" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/common.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="133" column="36" selection-start-line="133" selection-start-column="36" selection-end-line="133" selection-end-column="36" />
+            <state relative-caret-position="205">
+              <caret line="39" column="11" lean-forward="true" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
+              <folding>
+                <element signature="e#38#92#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
+            <state relative-caret-position="64">
+              <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="160">
+              <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
+              <folding>
+                <element signature="e#0#54#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="120">
+              <caret line="99" column="74" lean-forward="true" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
             </state>
           </provider>
         </entry>
@@ -109,10 +127,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>beforeIndex</find>
-      <find>read(</find>
-      <find>new Trac</find>
-      <find>frame</find>
       <find>logger.</find>
       <find>Stopwa</find>
       <find>handleAnge</find>
@@ -139,6 +153,10 @@
       <find>\.cast(&lt;[^&gt;]+&gt;)\(\)</find>
       <find>.cast</find>
       <find>serviceP</find>
+      <find>_inject</find>
+      <find>Typ</find>
+      <find>TypeMatcher</find>
+      <find>cast(</find>
     </findStrings>
     <replaceStrings>
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
@@ -169,8 +187,8 @@
       <replace>'text/html'</replace>
       <replace>'application/json'</replace>
       <replace>as $1</replace>
-      <replace>as $1</replace>
       <replace>as Map$1</replace>
+      <replace>IsInstanceOf</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -194,7 +212,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
@@ -225,26 +242,27 @@
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
-        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/common.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
       </list>
     </option>
   </component>
@@ -258,9 +276,9 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="34" />
+    <option name="x" value="24" />
     <option name="y" value="31" />
-    <option name="width" value="1282" />
+    <option name="width" value="1403" />
     <option name="height" value="784" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -271,9 +289,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -311,10 +326,18 @@
               <item name="framework" type="cbb8eebc:String" user="framework" />
               <item name="test" type="cbb8eebc:String" user="test" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="tool" type="cbb8eebc:String" user="tool" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -356,7 +379,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.tests in extension_test.dart">
+  <component name="RunManager" selected="Dart Test.All Tests">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -639,14 +662,9 @@
       <workItem from="1529722829709" duration="1759000" />
       <workItem from="1529724977574" duration="1752000" />
       <workItem from="1530115464302" duration="135000" />
-      <workItem from="1530124258733" duration="424000" />
-    </task>
-    <task id="LOCAL-00042" summary="+9">
-      <created>1511892890049</created>
-      <option name="number" value="00042" />
-      <option name="presentableId" value="LOCAL-00042" />
-      <option name="project" value="LOCAL" />
-      <updated>1511892890049</updated>
+      <workItem from="1530124258733" duration="601000" />
+      <workItem from="1530230623749" duration="89000" />
+      <workItem from="1531145856019" duration="547000" />
     </task>
     <task id="LOCAL-00043" summary="1.0.11">
       <created>1511893540118</created>
@@ -984,13 +1002,17 @@
       <option name="project" value="LOCAL" />
       <updated>1529726381237</updated>
     </task>
-    <option name="localTasksCounter" value="91" />
+    <task id="LOCAL-00091" summary="+7">
+      <created>1530124843110</created>
+      <option name="number" value="00091" />
+      <option name="presentableId" value="LOCAL-00091" />
+      <option name="project" value="LOCAL" />
+      <updated>1530124843111</updated>
+    </task>
+    <option name="localTasksCounter" value="92" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.06.08 at 02h 54m 57s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="can_delete_data_in_services_test_dart - 2018.06.08 at 02h 55m 21s.xml">
       <configuration name="can delete data in services_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1018,9 +1040,12 @@
     <history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 57m 51s.xml">
       <configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.06.28 at 20h 05m 10s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="154162000" />
+    <option name="totallyTimeSpent" value="154975000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1032,7 +1057,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="34" y="31" width="1282" height="784" extended-state="0" />
+    <frame x="24" y="31" width="1403" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1051,13 +1076,14 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3987879" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.45560408" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2814516" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2534901" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1065,14 +1091,13 @@
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Data View" order="4" />
       <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" id="Data View" order="4" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1083,7 +1108,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Removed `HttpHeaders` in `ResponseContext`" />
     <MESSAGE value="Deprecated AngelMetrics" />
     <MESSAGE value="Export HTTP Req+Res context" />
     <MESSAGE value="HTTP ResponseContext works" />
@@ -1108,7 +1132,8 @@
     <MESSAGE value="Fix hooking bug" />
     <MESSAGE value="+5" />
     <MESSAGE value="+6" />
-    <option name="LAST_COMMIT_MESSAGE" value="+6" />
+    <MESSAGE value="+7" />
+    <option name="LAST_COMMIT_MESSAGE" value="+7" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1116,20 +1141,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/async/future.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="631">
-          <caret line="666" column="12" selection-start-line="666" selection-start-column="12" selection-end-line="666" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="10" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/view.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1320,13 +1331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="127" column="57" selection-start-line="127" selection-start-column="57" selection-end-line="127" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1362,20 +1366,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="109">
-          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="120" column="39" selection-start-line="120" selection-start-column="39" selection-end-line="120" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="146">
@@ -1390,10 +1380,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
+        <state relative-caret-position="58">
+          <caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="229">
+          <caret line="37" column="37" lean-forward="true" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="366">
+          <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
         </state>
       </provider>
     </entry>
@@ -1404,57 +1418,74 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2320">
-          <caret line="154" column="25" selection-start-line="154" selection-start-column="25" selection-end-line="154" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="319" column="20" lean-forward="true" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="133" column="36" selection-start-line="133" selection-start-column="36" selection-end-line="133" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="58">
-          <caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="48">
-            <caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
+          <first_editor relative-caret-position="112">
+            <caret line="7" column="9" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="54" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="54" />
+        <state relative-caret-position="120">
+          <caret line="99" column="74" lean-forward="true" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="50" column="75" selection-start-line="50" selection-start-column="75" selection-end-line="50" selection-end-column="75" />
+        <state relative-caret-position="271">
+          <caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="120" column="46" lean-forward="true" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="319" column="20" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib/src/core_matchers.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="116" column="8" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="205">
+          <caret line="39" column="11" lean-forward="true" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
           <folding>
-            <element signature="e#48#68#0" expanded="true" />
+            <element signature="e#38#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/test/common.dart b/test/common.dart
index c21962ad..268bc9be 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -1,6 +1,7 @@
 library angel_framework.test.common;
 
 import 'package:angel_framework/angel_framework.dart';
+import 'package:matcher/matcher.dart';
 
 class Todo extends Model {
   String text;
@@ -32,3 +33,21 @@ class IncrementService extends Service {
   @Hooks(after: const [incrementTodoTimes])
   index([params]) async => [];
 }
+
+class IsInstanceOf<T> implements Matcher {
+  const IsInstanceOf();
+
+  @override
+  Description describeMismatch(item, Description mismatchDescription,
+      Map matchState, bool verbose) {
+    return mismatchDescription.add('$item is not an instance of $T');
+  }
+
+  @override
+  Description describe(Description description) {
+    return description.add('is an instance of $T');
+  }
+
+  @override
+  bool matches(item, Map matchState) => item is T;
+}
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 47289020..12ff29d6 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -100,7 +100,7 @@ main() {
   test('optional name', () async {
     var app = new Angel();
     await app.configure(new NamedController().configureServer);
-    expect(app.controllers['foo'], const TypeMatcher<NamedController>());
+    expect(app.controllers['foo'], const IsInstanceOf<NamedController>());
   });
 
   test("middleware", () async {
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 29f9f479..b4856dc9 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -98,7 +98,7 @@ main() {
 
   test('metadata', () async {
     final service = new HookedService(new IncrementService())..addHooks();
-    expect(service.inner, isNot(const TypeMatcher<MapService>()));
+    expect(service.inner, isNot(const IsInstanceOf<MapService>()));
     IncrementService.TIMES = 0;
     await service.index();
     expect(IncrementService.TIMES, equals(2));
@@ -129,7 +129,7 @@ main() {
       print('Params to $type ${e.eventName}: ${e.params}');
       expect(e.params, isMap);
       expect(e.params.keys, contains('provider'));
-      expect(e.params['provider'], const TypeMatcher<Providers>());
+      expect(e.params['provider'], const IsInstanceOf<Providers>());
     }
 
     svc
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 869c5619..5e53c496 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -2,6 +2,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
+import 'common.dart';
 
 @Middleware(const ['interceptor'])
 testMiddlewareMetadata(RequestContext req, ResponseContext res) async {
@@ -117,7 +118,7 @@ main() {
     var response = await client.get('$url/name/HELLO/last/WORLD');
     print('Response: ${response.body}');
     var json_ = json.decode(response.body);
-    expect(json_, const TypeMatcher<Map>());
+    expect(json_, const IsInstanceOf<Map>());
     expect(json_['first'], equals('HELLO'));
     expect(json_['last'], equals('WORLD'));
   });
diff --git a/test/typed_service_test.dart b/test/typed_service_test.dart
index 4b4b1b28..b5b3a3c9 100644
--- a/test/typed_service_test.dart
+++ b/test/typed_service_test.dart
@@ -1,6 +1,7 @@
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/common.dart';
 import 'package:test/test.dart';
+import 'common.dart';
 
 main() {
   var svc = new TypedService<Todo>(new MapService());
@@ -39,7 +40,7 @@ main() {
       'createdAt': now.toIso8601String(),
       'updatedAt': now.toIso8601String()
     });
-    expect(m, const TypeMatcher<Todo>());
+    expect(m, const IsInstanceOf<Todo>());
     var t = m as Todo;
     expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
   });
@@ -50,7 +51,7 @@ main() {
       'created_at': now.toIso8601String(),
       'updated_at': now.toIso8601String()
     });
-    expect(m, const TypeMatcher<Todo>());
+    expect(m, const IsInstanceOf<Todo>());
     var t = m as Todo;
     expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
   });

From 8fabcef9bcdf8e83231c91234101fbddb549733e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 10:40:06 -0400
Subject: [PATCH 214/414] Tracked down the rogue "null" print

---
 .idea/workspace.xml         | 225 +++++++++++++++++++-----------------
 lib/src/core/injection.dart |   2 +-
 pubspec.yaml                |   1 +
 test/hm.dart                |  14 +++
 4 files changed, 133 insertions(+), 109 deletions(-)
 create mode 100644 test/hm.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 09a9f58c..6d98851c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/test/hm.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/common.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/common.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/typed_service_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/typed_service_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -31,18 +28,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="48">
-              <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
@@ -67,8 +52,17 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="400">
-              <caret line="319" column="20" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
+            <state relative-caret-position="133">
+              <caret line="172" column="47" lean-forward="true" selection-start-line="172" selection-start-column="47" selection-end-line="172" selection-end-column="47" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="43">
+              <caret line="141" lean-forward="true" selection-start-line="141" selection-end-line="141" />
             </state>
           </provider>
         </entry>
@@ -76,8 +70,8 @@
       <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/common.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="205">
-              <caret line="39" column="11" lean-forward="true" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
+            <state relative-caret-position="436">
+              <caret line="39" column="11" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
               <folding>
                 <element signature="e#38#92#0" expanded="true" />
               </folding>
@@ -85,6 +79,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="hm.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hm.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="96">
+              <caret line="6" column="76" selection-start-line="6" selection-start-column="76" selection-end-line="6" selection-end-column="76" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -94,11 +100,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
+            <state relative-caret-position="448">
+              <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
               <folding>
                 <element signature="e#0#54#0" expanded="true" />
               </folding>
@@ -109,8 +115,8 @@
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="99" column="74" lean-forward="true" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
+            <state relative-caret-position="1504">
+              <caret line="99" column="74" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
             </state>
           </provider>
         </entry>
@@ -127,7 +133,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>logger.</find>
       <find>Stopwa</find>
       <find>handleAnge</find>
       <find>errorHandl</find>
@@ -157,6 +162,7 @@
       <find>Typ</find>
       <find>TypeMatcher</find>
       <find>cast(</find>
+      <find>print</find>
     </findStrings>
     <replaceStrings>
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
@@ -197,8 +203,8 @@
       <dir>$PROJECT_DIR$/lib/src</dir>
       <dir>$PROJECT_DIR$/test</dir>
       <dir>$PROJECT_DIR$/lib/src/core</dir>
-      <dir>$PROJECT_DIR$/lib</dir>
       <dir>$PROJECT_DIR$</dir>
+      <dir>$PROJECT_DIR$/lib</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -212,8 +218,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
@@ -253,16 +257,18 @@
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
+        <option value="$PROJECT_DIR$/example/hm.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/hm.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
       </list>
     </option>
   </component>
@@ -289,6 +295,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="AndroidView" />
+      <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -296,6 +305,11 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="example" type="cbb8eebc:String" user="example" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -307,13 +321,6 @@
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -335,9 +342,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -362,6 +366,7 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/test" />
       <recent name="$PROJECT_DIR$/lib/src/core" />
       <recent name="$PROJECT_DIR$/lib/src/http" />
       <recent name="$PROJECT_DIR$/lib/src/util" />
@@ -664,14 +669,8 @@
       <workItem from="1530115464302" duration="135000" />
       <workItem from="1530124258733" duration="601000" />
       <workItem from="1530230623749" duration="89000" />
-      <workItem from="1531145856019" duration="547000" />
-    </task>
-    <task id="LOCAL-00043" summary="1.0.11">
-      <created>1511893540118</created>
-      <option name="number" value="00043" />
-      <option name="presentableId" value="LOCAL-00043" />
-      <option name="project" value="LOCAL" />
-      <updated>1511893540118</updated>
+      <workItem from="1531145856019" duration="691000" />
+      <workItem from="1531146644160" duration="433000" />
     </task>
     <task id="LOCAL-00044" summary="Close #178, bump to 1.1.0">
       <created>1512571595293</created>
@@ -1009,7 +1008,14 @@
       <option name="project" value="LOCAL" />
       <updated>1530124843111</updated>
     </task>
-    <option name="localTasksCounter" value="92" />
+    <task id="LOCAL-00092" summary="Provide custom IsInstanceOf for testing">
+      <created>1531146512450</created>
+      <option name="number" value="00092" />
+      <option name="presentableId" value="LOCAL-00092" />
+      <option name="project" value="LOCAL" />
+      <updated>1531146512451</updated>
+    </task>
+    <option name="localTasksCounter" value="93" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1045,7 +1051,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="154975000" />
+    <option name="totallyTimeSpent" value="155552000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1080,10 +1086,10 @@
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.45560408" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2534901" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25716385" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1108,7 +1114,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Deprecated AngelMetrics" />
     <MESSAGE value="Export HTTP Req+Res context" />
     <MESSAGE value="HTTP ResponseContext works" />
     <MESSAGE value="Created pkg:framework/http.dart" />
@@ -1133,7 +1138,8 @@
     <MESSAGE value="+5" />
     <MESSAGE value="+6" />
     <MESSAGE value="+7" />
-    <option name="LAST_COMMIT_MESSAGE" value="+7" />
+    <MESSAGE value="Provide custom IsInstanceOf for testing" />
+    <option name="LAST_COMMIT_MESSAGE" value="Provide custom IsInstanceOf for testing" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1141,20 +1147,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/example/view.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/core/stacktrace.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="28" column="15" lean-forward="true" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.lock">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="132">
@@ -1373,13 +1365,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="235">
-          <caret line="143" lean-forward="true" selection-start-line="143" selection-end-line="143" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="58">
@@ -1396,7 +1381,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
+        <state relative-caret-position="112">
           <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -1430,15 +1415,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="99" column="74" lean-forward="true" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="271">
-          <caret line="32" column="9" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
+        <state relative-caret-position="1504">
+          <caret line="99" column="74" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
         </state>
       </provider>
     </entry>
@@ -1449,13 +1427,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="319" column="20" selection-start-line="319" selection-start-column="20" selection-end-line="319" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib/src/core_matchers.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="133">
@@ -1463,16 +1434,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="39" column="11" lean-forward="true" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
-          <folding>
-            <element signature="e#38#92#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="64">
@@ -1482,14 +1443,62 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
+        <state relative-caret-position="448">
+          <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
           <folding>
             <element signature="e#0#54#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="77">
+          <caret line="192" column="44" selection-start-line="192" selection-start-column="44" selection-end-line="192" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="79">
+          <caret line="21" column="14" lean-forward="true" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="436">
+          <caret line="39" column="11" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
+          <folding>
+            <element signature="e#38#92#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hm.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="6" column="76" selection-start-line="6" selection-start-column="76" selection-end-line="6" selection-end-column="76" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="172" column="47" lean-forward="true" selection-start-line="172" selection-start-column="47" selection-end-line="172" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="43">
+          <caret line="141" lean-forward="true" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index cd03b412..9c3ebbe2 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -151,7 +151,7 @@ InjectionRequest preInject(Function handler) {
         .firstWhere((m) => m.type.isAssignableTo(_Parameter),
             orElse: () => null)
         ?.reflectee as Parameter;
-    print(p);
+    //print(p);
     if (p != null) {
       injection.parameters[name] = new Parameter(
         cookie: p.cookie,
diff --git a/pubspec.yaml b/pubspec.yaml
index 1d923fa1..d05c1ddc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,4 +30,5 @@ dev_dependencies:
   angel_jael: ^1.0.0
   mock_request: ^1.0.0
   http: ^0.11.3
+  io: ^0.3.0
   test: ^0.12.13
diff --git a/test/hm.dart b/test/hm.dart
new file mode 100644
index 00000000..4231a923
--- /dev/null
+++ b/test/hm.dart
@@ -0,0 +1,14 @@
+import 'dart:async';
+import 'package:io/ansi.dart';
+import 'all.dart' as hm;
+
+main() async {
+  var zone = Zone.current.fork(
+    specification: new ZoneSpecification(print: (self, parent, zone, line) {
+      if (line == 'null') {
+        parent.print(zone, cyan.wrap(StackTrace.current.toString()));
+      }
+    }),
+  );
+  return await zone.run(hm.main);
+}

From d5e3791c55dab15d79d09dc7abbd27b8345fc035 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 10:43:54 -0400
Subject: [PATCH 215/414] CHANGELOG, bump to 1.1.4+8

---
 CHANGELOG.md                       | 6 ++++++
 lib/src/core/response_context.dart | 2 +-
 pubspec.yaml                       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ccbac37..5833003a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.1.4+8
+* Finalizers can now write to the response buffer or send headers,
+because said getter now only returns an unmodifiable Map when using
+`streaming`.
+* Tracked down an annoying line that printed many, many `null` messages.
+
 # 1.1.4+7
 * Remove `cast` for Dart 1.x.
 * `RequestContext.injections` is no longer cached or read-only.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 0f0f8049..d22275f3 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -60,7 +60,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// Headers that will be sent to the user.
   Map<String, String> get headers {
     /// If the response is closed, then this getter will return an immutable `Map`.
-    if (!isOpen)
+    if (streaming)
       return new Map<String, String>.unmodifiable(_headers);
     else
       return _headers;
diff --git a/pubspec.yaml b/pubspec.yaml
index d05c1ddc..9d806e86 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+7
+version: 1.1.4+8
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 999d92ce9504df43cd14df57ec4eb1b7da5c2483 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 10:49:59 -0400
Subject: [PATCH 216/414] Patch services_test for strong mode

---
 .idea/workspace.xml     | 273 ++++++++++++++++++++--------------------
 test/services_test.dart |   2 +-
 2 files changed, 139 insertions(+), 136 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6d98851c..62636b11 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/test/hm.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,33 +29,42 @@
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="112">
-                <caret line="7" column="9" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
+              <first_editor relative-caret-position="144">
+                <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="133">
-              <caret line="172" column="47" lean-forward="true" selection-start-line="172" selection-start-column="47" selection-end-line="172" selection-end-column="47" />
+            <state relative-caret-position="129">
+              <caret line="254" column="36" selection-start-line="254" selection-start-column="36" selection-end-line="254" selection-end-column="36" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="486">
+              <caret line="129" column="10" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="131">
+              <caret line="62" column="8" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="43">
@@ -67,6 +73,33 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="207">
+              <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1520">
+              <caret line="102" column="52" selection-start-line="102" selection-start-column="52" selection-end-line="102" selection-end-column="52" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="128">
+              <caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/common.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -91,36 +124,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="typed_service_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
-              <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-              <folding>
-                <element signature="e#0#54#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1504">
-              <caret line="99" column="74" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -133,10 +136,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Stopwa</find>
-      <find>handleAnge</find>
-      <find>errorHandl</find>
-      <find>handl</find>
       <find>HttpHeaders.ACCEPT</find>
       <find>HttpHeaders.CONTENT_TYPE</find>
       <find>HttpHeaders.CONTE</find>
@@ -163,6 +162,10 @@
       <find>TypeMatcher</find>
       <find>cast(</find>
       <find>print</find>
+      <find>unmodi</find>
+      <find>_lock()</find>
+      <find>unmofi</find>
+      <find>Map&lt;String,</find>
     </findStrings>
     <replaceStrings>
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
@@ -201,10 +204,10 @@
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
-      <dir>$PROJECT_DIR$/test</dir>
       <dir>$PROJECT_DIR$/lib/src/core</dir>
       <dir>$PROJECT_DIR$</dir>
       <dir>$PROJECT_DIR$/lib</dir>
+      <dir>$PROJECT_DIR$/test</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -258,17 +261,17 @@
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -670,21 +673,7 @@
       <workItem from="1530124258733" duration="601000" />
       <workItem from="1530230623749" duration="89000" />
       <workItem from="1531145856019" duration="691000" />
-      <workItem from="1531146644160" duration="433000" />
-    </task>
-    <task id="LOCAL-00044" summary="Close #178, bump to 1.1.0">
-      <created>1512571595293</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1512571595293</updated>
-    </task>
-    <task id="LOCAL-00045" summary="Patched _matchesId, bump to 1.1.0+1">
-      <created>1512882359925</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1512882359925</updated>
+      <workItem from="1531146644160" duration="1107000" />
     </task>
     <task id="LOCAL-00046" summary="Patched handleAngelHttpException, bump to 1.1.0+2">
       <created>1513103332618</created>
@@ -1015,16 +1004,24 @@
       <option name="project" value="LOCAL" />
       <updated>1531146512451</updated>
     </task>
-    <option name="localTasksCounter" value="93" />
+    <task id="LOCAL-00093" summary="Tracked down the rogue &quot;null&quot; print">
+      <created>1531147206687</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1531147206687</updated>
+    </task>
+    <task id="LOCAL-00094" summary="CHANGELOG, bump to 1.1.4+8">
+      <created>1531147434255</created>
+      <option name="number" value="00094" />
+      <option name="presentableId" value="LOCAL-00094" />
+      <option name="project" value="LOCAL" />
+      <updated>1531147434255</updated>
+    </task>
+    <option name="localTasksCounter" value="95" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="can_delete_data_in_services_test_dart - 2018.06.08 at 02h 55m 21s.xml">
-      <configuration name="can delete data in services_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="can_delete_data_in_services_test_dart - 2018.06.08 at 02h 55m 49s.xml">
-      <configuration name="can delete data in services_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.06.08 at 02h 56m 02s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1049,9 +1046,15 @@
     <history-entry file="All_Tests - 2018.06.28 at 20h 05m 10s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.07.09 at 10h 41m 59s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.07.09 at 10h 42m 26s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="155552000" />
+    <option name="totallyTimeSpent" value="156226000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1082,13 +1085,13 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
+      <window_info anchor="bottom" id="Messages" order="7" visible="true" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25716385" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
@@ -1114,8 +1117,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Export HTTP Req+Res context" />
-    <MESSAGE value="HTTP ResponseContext works" />
     <MESSAGE value="Created pkg:framework/http.dart" />
     <MESSAGE value="AnonymousService now takes FutureOr" />
     <MESSAGE value="`Service.toId` no longer only takes a `String`" />
@@ -1139,7 +1140,9 @@
     <MESSAGE value="+6" />
     <MESSAGE value="+7" />
     <MESSAGE value="Provide custom IsInstanceOf for testing" />
-    <option name="LAST_COMMIT_MESSAGE" value="Provide custom IsInstanceOf for testing" />
+    <MESSAGE value="Tracked down the rogue &quot;null&quot; print" />
+    <MESSAGE value="CHANGELOG, bump to 1.1.4+8" />
+    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG, bump to 1.1.4+8" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1253,20 +1256,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="81" column="32" selection-start-line="81" selection-start-column="32" selection-end-line="81" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="122">
-          <caret line="69" column="7" lean-forward="true" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -1316,13 +1305,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="102" column="52" selection-start-line="102" selection-start-column="52" selection-end-line="102" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1372,13 +1354,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="37" column="37" lean-forward="true" selection-start-line="37" selection-start-column="37" selection-end-line="37" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1403,16 +1378,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="112">
-            <caret line="7" column="9" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1504">
@@ -1458,13 +1423,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="79">
-          <caret line="21" column="14" lean-forward="true" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="436">
@@ -1485,13 +1443,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="172" column="47" lean-forward="true" selection-start-line="172" selection-start-column="47" selection-end-line="172" selection-end-column="47" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="43">
@@ -1499,6 +1450,58 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="254" column="36" selection-start-line="254" selection-start-column="36" selection-end-line="254" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="486">
+          <caret line="129" column="10" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="62" column="8" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="144">
+            <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1520">
+          <caret line="102" column="52" selection-start-line="102" selection-start-column="52" selection-end-line="102" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/test/services_test.dart b/test/services_test.dart
index 1be1999e..9f09f523 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -11,7 +11,7 @@ class Todo extends Model {
 }
 
 main() {
-  Map headers = {
+  Map headers = <String, String>{
     'Accept': 'application/json',
     'Content-Type': 'application/json'
   };

From 2a8c5636867ef9171a6031bbf3acb03f8d35ef86 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 10:54:50 -0400
Subject: [PATCH 217/414] More <String, String> patches in tests

---
 test/hooked_test.dart  | 2 +-
 test/routing_test.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index b4856dc9..509dcd41 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -6,7 +6,7 @@ import 'package:test/test.dart';
 import 'common.dart';
 
 main() {
-  Map headers = {
+  Map headers = <String, String>{
     'Accept': 'application/json',
     'Content-Type': 'application/json'
   };
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 5e53c496..184970b6 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -154,7 +154,7 @@ main() {
   });
 
   test('Can serialize function result as JSON', () async {
-    Map headers = {'Content-Type': 'application/json'};
+    Map headers = <String, String>{'Content-Type': 'application/json'};
     String postData = json.encode({'it': 'works'});
     var response = await client.post("$url/lambda",
         headers: headers as Map<String, String>, body: postData);

From 015c3774cc22a9cdb39dc9ab94c039d8290796bf Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 11:02:00 -0400
Subject: [PATCH 218/414] Skip parameter meta tests on newer VM's where it's
 blocked on: https://github.com/dart-lang/sdk/issues/33774

---
 .idea/workspace.xml           | 222 ++++++++++++++++++----------------
 test/parameter_meta_test.dart |  10 +-
 test/routing_test.dart        |  12 ++
 3 files changed, 136 insertions(+), 108 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62636b11..e0c67588 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -25,6 +27,18 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="304">
+              <caret line="21" column="69" selection-start-line="21" selection-start-column="69" selection-end-line="21" selection-end-column="69" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
@@ -49,7 +63,7 @@
       <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="486">
+            <state relative-caret-position="810">
               <caret line="129" column="10" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="10" />
             </state>
           </provider>
@@ -64,24 +78,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="43">
-              <caret line="141" lean-forward="true" selection-start-line="141" selection-end-line="141" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -91,27 +87,36 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
+            <state relative-caret-position="176">
+              <caret line="16" column="4" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="436">
-              <caret line="39" column="11" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
+            <state relative-caret-position="297">
+              <caret line="52" column="65" lean-forward="true" selection-start-line="52" selection-start-column="65" selection-end-line="52" selection-end-column="65" />
               <folding>
-                <element signature="e#38#92#0" expanded="true" />
+                <element signature="e#0#17#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="hm.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hm.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -136,7 +141,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>HttpHeaders.ACCEPT</find>
       <find>HttpHeaders.CONTENT_TYPE</find>
       <find>HttpHeaders.CONTE</find>
       <find>HttpHeaders</find>
@@ -166,6 +170,7 @@
       <find>_lock()</find>
       <find>unmofi</find>
       <find>Map&lt;String,</find>
+      <find>as</find>
     </findStrings>
     <replaceStrings>
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
@@ -245,7 +250,6 @@
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
@@ -256,15 +260,12 @@
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
@@ -272,6 +273,10 @@
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
       </list>
     </option>
   </component>
@@ -673,21 +678,7 @@
       <workItem from="1530124258733" duration="601000" />
       <workItem from="1530230623749" duration="89000" />
       <workItem from="1531145856019" duration="691000" />
-      <workItem from="1531146644160" duration="1107000" />
-    </task>
-    <task id="LOCAL-00046" summary="Patched handleAngelHttpException, bump to 1.1.0+2">
-      <created>1513103332618</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1513103332618</updated>
-    </task>
-    <task id="LOCAL-00047" summary="Patched ResponseContext#isOpen, bump to 1.1.0+3">
-      <created>1513103639013</created>
-      <option name="number" value="00047" />
-      <option name="presentableId" value="LOCAL-00047" />
-      <option name="project" value="LOCAL" />
-      <updated>1513103639013</updated>
+      <workItem from="1531146644160" duration="1843000" />
     </task>
     <task id="LOCAL-00048" summary="Response no longer closes if `serialize` is called with an empty string">
       <created>1517973412941</created>
@@ -1018,7 +1009,21 @@
       <option name="project" value="LOCAL" />
       <updated>1531147434255</updated>
     </task>
-    <option name="localTasksCounter" value="95" />
+    <task id="LOCAL-00095" summary="Patch services_test for strong mode">
+      <created>1531147799220</created>
+      <option name="number" value="00095" />
+      <option name="presentableId" value="LOCAL-00095" />
+      <option name="project" value="LOCAL" />
+      <updated>1531147799220</updated>
+    </task>
+    <task id="LOCAL-00096" summary="More &lt;String, String&gt; patches in tests">
+      <created>1531148090824</created>
+      <option name="number" value="00096" />
+      <option name="presentableId" value="LOCAL-00096" />
+      <option name="project" value="LOCAL" />
+      <updated>1531148090824</updated>
+    </task>
+    <option name="localTasksCounter" value="97" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1054,7 +1059,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="156226000" />
+    <option name="totallyTimeSpent" value="156962000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1085,7 +1090,7 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" visible="true" weight="0.33478895" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
@@ -1117,8 +1122,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Created pkg:framework/http.dart" />
-    <MESSAGE value="AnonymousService now takes FutureOr" />
     <MESSAGE value="`Service.toId` no longer only takes a `String`" />
     <MESSAGE value="IDEA" />
     <MESSAGE value="README update" />
@@ -1142,7 +1145,9 @@
     <MESSAGE value="Provide custom IsInstanceOf for testing" />
     <MESSAGE value="Tracked down the rogue &quot;null&quot; print" />
     <MESSAGE value="CHANGELOG, bump to 1.1.4+8" />
-    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG, bump to 1.1.4+8" />
+    <MESSAGE value="Patch services_test for strong mode" />
+    <MESSAGE value="More &lt;String, String&gt; patches in tests" />
+    <option name="LAST_COMMIT_MESSAGE" value="More &lt;String, String&gt; patches in tests" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,16 +1359,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" column="42" selection-start-line="7" selection-start-column="42" selection-end-line="7" selection-end-column="42" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="366">
@@ -1378,13 +1373,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1504">
-          <caret line="99" column="74" selection-start-line="99" selection-start-column="74" selection-end-line="99" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
@@ -1399,13 +1387,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="448">
@@ -1443,13 +1424,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="43">
-          <caret line="141" lean-forward="true" selection-start-line="141" selection-end-line="141" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -1457,20 +1431,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="486">
-          <caret line="129" column="10" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="62" column="8" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1481,13 +1441,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1520">
@@ -1495,10 +1448,65 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="111">
+          <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="43">
+          <caret line="141" lean-forward="true" selection-start-line="141" selection-end-line="141" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="62" column="8" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="810">
+          <caret line="129" column="10" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
+        <state relative-caret-position="176">
+          <caret line="16" column="4" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="52" column="65" lean-forward="true" selection-start-line="52" selection-start-column="65" selection-end-line="52" selection-end-column="65" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="21" column="69" selection-start-line="21" selection-start-column="69" selection-end-line="21" selection-end-column="69" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 1e568316..376a1f03 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
@@ -14,7 +15,14 @@ Future printResponse(MockHttpResponse rs) {
   });
 }
 
-main() {
+void main() {
+  group('parameter_meta', parameterMetaTests,
+      skip: !Platform.version.contains('2.0.0-dev.6')
+          ? null
+          : 'Blocked on https://github.com/dart-lang/sdk/issues/33774');
+}
+
+parameterMetaTests() {
   Angel app;
   AngelHttp http;
 
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 184970b6..039ce799 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -1,6 +1,9 @@
+import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
+import 'package:io/ansi.dart';
+import 'package:logging/logging.dart';
 import 'package:test/test.dart';
 import 'common.dart';
 
@@ -31,6 +34,15 @@ main() {
     // Lazy-parse in production
     [app, nested, todos].forEach((Angel app) {
       app.lazyParseBodies = app.isProduction;
+      app.logger = new Logger('routing_test')
+        ..onRecord.listen((rec) {
+          if (rec.error != null) {
+            stdout
+              ..writeln(cyan.wrap(rec.toString()))
+              ..writeln(cyan.wrap(rec.error.toString()))
+              ..writeln(cyan.wrap(rec.stackTrace.toString()));
+          }
+        });
     });
 
     app.requestMiddleware

From 1efd14cf7dbc25b9780614fffa4ceba02b7219dd Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 11:08:01 -0400
Subject: [PATCH 219/414] Skip parameter meta tests on newer VM's where it's
 blocked on: https://github.com/dart-lang/sdk/issues/33774

---
 test/all.dart                 | 5 +++++
 test/parameter_meta_test.dart | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/all.dart b/test/all.dart
index a2fa8822..8d69d1c1 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -1,3 +1,7 @@
+import 'dart:io';
+
+import 'package:io/ansi.dart';
+
 import 'accepts_test.dart' as accepts;
 import 'anonymous_service_test.dart' as anonymous_service;
 import 'controller_test.dart' as controller;
@@ -22,6 +26,7 @@ import 'package:test/test.dart';
 
 /// For running with coverage
 main() {
+  print(cyan.wrap('Running tests on ${Platform.version}'));
   group('accepts', accepts.main);
   group('anonymous service', anonymous_service.main);
   group('controller', controller.main);
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 376a1f03..c1460a33 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -17,7 +17,7 @@ Future printResponse(MockHttpResponse rs) {
 
 void main() {
   group('parameter_meta', parameterMetaTests,
-      skip: !Platform.version.contains('2.0.0-dev.6')
+      skip: !Platform.version.contains('2.0.0')
           ? null
           : 'Blocked on https://github.com/dart-lang/sdk/issues/33774');
 }

From bace6a2298de0fc80d795057154e68fd83f013f7 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 11:19:02 -0400
Subject: [PATCH 220/414] * Patch `ResponseContext.redirectTo` to `fold`
 parameters, instead of `as`-casting them to `Map<String, dynamic>`.

---
 .idea/workspace.xml                | 165 ++++++++++++++---------------
 CHANGELOG.md                       |   4 +
 lib/src/core/response_context.dart |  10 +-
 3 files changed, 93 insertions(+), 86 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e0c67588..4895f09f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,11 +27,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="21" column="69" selection-start-line="21" selection-start-column="69" selection-end-line="21" selection-end-column="69" />
+            <state relative-caret-position="257">
+              <caret line="26" column="17" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -39,12 +39,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/all.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="117">
+              <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="144">
-                <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
+              <first_editor relative-caret-position="32">
+                <caret line="2" column="44" selection-start-line="2" selection-start-column="44" selection-end-line="2" selection-end-column="44" />
               </first_editor>
               <second_editor />
             </state>
@@ -72,8 +81,8 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="62" column="8" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
+            <state relative-caret-position="350">
+              <caret line="260" column="32" lean-forward="true" selection-start-line="260" selection-start-column="32" selection-end-line="260" selection-end-column="32" />
             </state>
           </provider>
         </entry>
@@ -117,18 +126,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hm.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hm.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="96">
-              <caret line="6" column="76" selection-start-line="6" selection-start-column="76" selection-end-line="6" selection-end-column="76" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -141,7 +138,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>HttpHeaders.CONTENT_TYPE</find>
       <find>HttpHeaders.CONTE</find>
       <find>HttpHeaders</find>
       <find>HttpStatus.FORBIDDEN</find>
@@ -171,6 +167,7 @@
       <find>unmofi</find>
       <find>Map&lt;String,</find>
       <find>as</find>
+      <find>redirectTo</find>
     </findStrings>
     <replaceStrings>
       <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
@@ -226,7 +223,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
@@ -270,13 +266,14 @@
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -678,21 +675,7 @@
       <workItem from="1530124258733" duration="601000" />
       <workItem from="1530230623749" duration="89000" />
       <workItem from="1531145856019" duration="691000" />
-      <workItem from="1531146644160" duration="1843000" />
-    </task>
-    <task id="LOCAL-00048" summary="Response no longer closes if `serialize` is called with an empty string">
-      <created>1517973412941</created>
-      <option name="number" value="00048" />
-      <option name="presentableId" value="LOCAL-00048" />
-      <option name="project" value="LOCAL" />
-      <updated>1517973412941</updated>
-    </task>
-    <task id="LOCAL-00049" summary="Added `autoSnakeCaseNames` to `MapService`">
-      <created>1517973884510</created>
-      <option name="number" value="00049" />
-      <option name="presentableId" value="LOCAL-00049" />
-      <option name="project" value="LOCAL" />
-      <updated>1517973884510</updated>
+      <workItem from="1531146644160" duration="2793000" />
     </task>
     <task id="LOCAL-00050" summary="Created setup for AngelHttp">
       <created>1517974351104</created>
@@ -1023,16 +1006,24 @@
       <option name="project" value="LOCAL" />
       <updated>1531148090824</updated>
     </task>
-    <option name="localTasksCounter" value="97" />
+    <task id="LOCAL-00097" summary="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774">
+      <created>1531148520815</created>
+      <option name="number" value="00097" />
+      <option name="presentableId" value="LOCAL-00097" />
+      <option name="project" value="LOCAL" />
+      <updated>1531148520815</updated>
+    </task>
+    <task id="LOCAL-00098" summary="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774">
+      <created>1531148881567</created>
+      <option name="number" value="00098" />
+      <option name="presentableId" value="LOCAL-00098" />
+      <option name="project" value="LOCAL" />
+      <updated>1531148881568</updated>
+    </task>
+    <option name="localTasksCounter" value="99" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.06.08 at 02h 56m 02s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.06.10 at 19h 13m 34s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.06.10 at 19h 15m 03s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1057,9 +1048,15 @@
     <history-entry file="All_Tests - 2018.07.09 at 10h 42m 26s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.07.09 at 11h 06m 02s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="All_Tests - 2018.07.09 at 11h 06m 50s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="156962000" />
+    <option name="totallyTimeSpent" value="157912000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1122,7 +1119,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="`Service.toId` no longer only takes a `String`" />
     <MESSAGE value="IDEA" />
     <MESSAGE value="README update" />
     <MESSAGE value="Pubspec -&gt; v1.1.1" />
@@ -1147,7 +1143,8 @@
     <MESSAGE value="CHANGELOG, bump to 1.1.4+8" />
     <MESSAGE value="Patch services_test for strong mode" />
     <MESSAGE value="More &lt;String, String&gt; patches in tests" />
-    <option name="LAST_COMMIT_MESSAGE" value="More &lt;String, String&gt; patches in tests" />
+    <MESSAGE value="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774" />
+    <option name="LAST_COMMIT_MESSAGE" value="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1155,20 +1152,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pubspec.lock">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="150" column="4" selection-start-line="150" selection-start-column="4" selection-end-line="150" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="6" selection-start-line="6" selection-end-line="9" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1431,16 +1414,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="144">
-            <caret line="9" column="10" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1520">
@@ -1462,13 +1435,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
-          <caret line="62" column="8" lean-forward="true" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="810">
@@ -1500,16 +1466,47 @@
         </state>
       </provider>
     </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/io/platform.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="284">
+          <caret line="145" lean-forward="true" selection-start-line="145" selection-end-line="145" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="117">
+          <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="21" column="69" selection-start-line="21" selection-start-column="69" selection-end-line="21" selection-end-column="69" />
+        <state relative-caret-position="257">
+          <caret line="26" column="17" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="350">
+          <caret line="260" column="32" lean-forward="true" selection-start-line="260" selection-start-column="32" selection-end-line="260" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="32">
+            <caret line="2" column="44" selection-start-line="2" selection-start-column="44" selection-end-line="2" selection-end-column="44" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5833003a..b0005516 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.4+9
+* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of
+`as`-casting them to `Map<String, dynamic>`.
+
 # 1.1.4+8
 * Finalizers can now write to the response buffer or send headers,
 because said getter now only returns an unmodifiable Map when using
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index d22275f3..66d294eb 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -205,7 +205,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map data]) {
     if (!isOpen) throw closed();
-    return app.viewGenerator(view, new Map.from(renderParams)..addAll(data ?? {})).then((content) {
+    return app
+        .viewGenerator(view, new Map.from(renderParams)..addAll(data ?? {}))
+        .then((content) {
       write(content);
       headers['content-type'] = 'text/html';
       end();
@@ -265,7 +267,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     Route matched = _findRoute(app);
 
     if (matched != null) {
-      redirect(matched.makeUri(params as Map<String, dynamic>), code: code);
+      redirect(
+          matched.makeUri(params.keys.fold<Map<String, dynamic>>({}, (out, k) {
+            return out..[k.toString()] = params[k];
+          })),
+          code: code);
       return;
     }
 

From 93f0dae1eb338963e3fe5959a8451f543d81f19e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 11:24:39 -0400
Subject: [PATCH 221/414] * Apply `fold` in `redirectToAction`; bump version ->
 1.1.4+9

---
 CHANGELOG.md                       | 1 +
 lib/src/core/response_context.dart | 4 +++-
 pubspec.yaml                       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0005516..c8f6c679 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 1.1.4+9
 * Patch `ResponseContext.redirectTo` to `fold` parameters, instead of
 `as`-casting them to `Map<String, dynamic>`.
+* Apply this same folding to `ResponseContext.redirectToAction`.
 
 # 1.1.4+8
 * Finalizers can now write to the response buffer or send headers,
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 66d294eb..19132f7a 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -303,7 +303,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
     final head =
         controller.findExpose().path.toString().replaceAll(_straySlashes, '');
     final tail = matched
-        .makeUri(params as Map<String, dynamic>)
+        .makeUri(params.keys.fold<Map<String, dynamic>>({}, (out, k) {
+          return out..[k.toString()] = params[k];
+        }))
         .replaceAll(_straySlashes, '');
 
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
diff --git a/pubspec.yaml b/pubspec.yaml
index 9d806e86..7c6af27c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+8
+version: 1.1.4+9
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 49bfe5052dde0fb4a35430b4b054665e032bef10 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 11:59:17 -0400
Subject: [PATCH 222/414] Patch

---
 .idea/workspace.xml          | 155 ++++++++++++++++-------------------
 CHANGELOG.md                 |   3 +
 lib/src/http/angel_http.dart |   3 +-
 3 files changed, 77 insertions(+), 84 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4895f09f..1cb1fc1c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -48,32 +46,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="32">
-                <caret line="2" column="44" selection-start-line="2" selection-start-column="44" selection-end-line="2" selection-end-column="44" />
+              <first_editor relative-caret-position="48">
+                <caret line="3" column="64" selection-start-line="3" selection-start-column="64" selection-end-line="3" selection-end-column="64" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="129">
-              <caret line="254" column="36" selection-start-line="254" selection-start-column="36" selection-end-line="254" selection-end-column="36" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="810">
-              <caret line="129" column="10" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="10" />
+            <state relative-caret-position="170">
+              <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
             </state>
           </provider>
         </entry>
@@ -81,8 +70,8 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="350">
-              <caret line="260" column="32" lean-forward="true" selection-start-line="260" selection-start-column="32" selection-end-line="260" selection-end-column="32" />
+            <state relative-caret-position="437">
+              <caret line="307" column="10" selection-start-line="307" selection-start-column="10" selection-end-line="307" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -90,8 +79,8 @@
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1520">
-              <caret line="102" column="52" selection-start-line="102" selection-start-column="52" selection-end-line="102" selection-end-column="52" />
+            <state relative-caret-position="328">
+              <caret line="56" column="29" lean-forward="true" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -108,8 +97,8 @@
       <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
-              <caret line="52" column="65" lean-forward="true" selection-start-line="52" selection-start-column="65" selection-end-line="52" selection-end-column="65" />
+            <state relative-caret-position="352">
+              <caret line="22" column="12" lean-forward="true" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
               <folding>
                 <element signature="e#0#17#0" expanded="true" />
               </folding>
@@ -266,7 +255,6 @@
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
@@ -274,6 +262,7 @@
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -287,8 +276,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="24" />
-    <option name="y" value="31" />
+    <option name="x" value="10" />
+    <option name="y" value="23" />
     <option name="width" value="1403" />
     <option name="height" value="784" />
   </component>
@@ -675,21 +664,7 @@
       <workItem from="1530124258733" duration="601000" />
       <workItem from="1530230623749" duration="89000" />
       <workItem from="1531145856019" duration="691000" />
-      <workItem from="1531146644160" duration="2793000" />
-    </task>
-    <task id="LOCAL-00050" summary="Created setup for AngelHttp">
-      <created>1517974351104</created>
-      <option name="number" value="00050" />
-      <option name="presentableId" value="LOCAL-00050" />
-      <option name="project" value="LOCAL" />
-      <updated>1517974351105</updated>
-    </task>
-    <task id="LOCAL-00051" summary="Basic server methods transferred to AngelHttp">
-      <created>1517975212864</created>
-      <option name="number" value="00051" />
-      <option name="presentableId" value="LOCAL-00051" />
-      <option name="project" value="LOCAL" />
-      <updated>1517975212864</updated>
+      <workItem from="1531146644160" duration="3494000" />
     </task>
     <task id="LOCAL-00052" summary="Made `Angel.serializer` public">
       <created>1517975306169</created>
@@ -1020,7 +995,21 @@
       <option name="project" value="LOCAL" />
       <updated>1531148881568</updated>
     </task>
-    <option name="localTasksCounter" value="99" />
+    <task id="LOCAL-00099" summary="* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of&#10;`as`-casting them to `Map&lt;String, dynamic&gt;`.">
+      <created>1531149542907</created>
+      <option name="number" value="00099" />
+      <option name="presentableId" value="LOCAL-00099" />
+      <option name="project" value="LOCAL" />
+      <updated>1531149542907</updated>
+    </task>
+    <task id="LOCAL-00100" summary="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9">
+      <created>1531149879228</created>
+      <option name="number" value="00100" />
+      <option name="presentableId" value="LOCAL-00100" />
+      <option name="project" value="LOCAL" />
+      <updated>1531149879229</updated>
+    </task>
+    <option name="localTasksCounter" value="101" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1056,7 +1045,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="157912000" />
+    <option name="totallyTimeSpent" value="158613000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1093,8 +1082,8 @@
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25716385" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25716385" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1119,8 +1108,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="IDEA" />
-    <MESSAGE value="README update" />
     <MESSAGE value="Pubspec -&gt; v1.1.1" />
     <MESSAGE value="MapService dates will be strings" />
     <MESSAGE value="Bring back zones; mysterious hang" />
@@ -1144,7 +1131,9 @@
     <MESSAGE value="Patch services_test for strong mode" />
     <MESSAGE value="More &lt;String, String&gt; patches in tests" />
     <MESSAGE value="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774" />
-    <option name="LAST_COMMIT_MESSAGE" value="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774" />
+    <MESSAGE value="* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of&#10;`as`-casting them to `Map&lt;String, dynamic&gt;`." />
+    <MESSAGE value="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9" />
+    <option name="LAST_COMMIT_MESSAGE" value="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1414,20 +1403,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1520">
-          <caret line="102" column="52" selection-start-line="102" selection-start-column="52" selection-end-line="102" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="111">
-          <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="43">
@@ -1435,13 +1410,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="810">
-          <caret line="129" column="10" selection-start-line="129" selection-start-column="10" selection-end-line="129" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1456,16 +1424,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="52" column="65" lean-forward="true" selection-start-line="52" selection-start-column="65" selection-end-line="52" selection-end-column="65" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/io/platform.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="284">
@@ -1490,23 +1448,54 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="22" column="12" lean-forward="true" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="328">
+          <caret line="56" column="29" lean-forward="true" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="260" column="32" lean-forward="true" selection-start-line="260" selection-start-column="32" selection-end-line="260" selection-end-column="32" />
+        <state relative-caret-position="437">
+          <caret line="307" column="10" selection-start-line="307" selection-start-column="10" selection-end-line="307" selection-end-column="10" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="32">
-            <caret line="2" column="44" selection-start-line="2" selection-start-column="44" selection-end-line="2" selection-end-column="44" />
+          <first_editor relative-caret-position="48">
+            <caret line="3" column="64" selection-start-line="3" selection-start-column="64" selection-end-line="3" selection-end-column="64" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="54" lean-forward="true" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8f6c679..b0124453 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.4+10
+* Change the zone error handler to take an `Object`
+
 # 1.1.4+9
 * Patch `ResponseContext.redirectTo` to `fold` parameters, instead of
 `as`-casting them to `Map<String, dynamic>`.
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index b953ccae..774faab0 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -164,7 +164,8 @@ class AngelHttp {
                 ..stackTrace = st;
             throw new AngelHttpException(e, stackTrace: st, statusCode: 500);
           }, test: (e) => e is! AngelHttpException).catchError(
-              (AngelHttpException e, StackTrace st) {
+              (ee, StackTrace st) {
+            var e = ee as AngelHttpException;
             return handleAngelHttpException(
                 e, e.stackTrace ?? st, req, res, request);
           }).whenComplete(() => res.dispose());

From 8961afde9942e0a6384e36f88d81b88db3f1ca83 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 12:00:11 -0400
Subject: [PATCH 223/414] Bump

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 7c6af27c..9256e1ac 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+9
+version: 1.1.4+10
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 13addcf9821579f4195d5a9cefdb604ffcaf6665 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 9 Jul 2018 12:50:20 -0400
Subject: [PATCH 224/414] Finalizers before sending

---
 .idea/libraries/Dart_Packages.xml |  12 +-
 .idea/workspace.xml               | 249 +++++++++++++++---------------
 CHANGELOG.md                      |   3 +
 lib/src/http/angel_http.dart      |  78 +++++-----
 pubspec.yaml                      |   2 +-
 test/common.dart                  |   4 +-
 6 files changed, 178 insertions(+), 170 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 558b9ca0..d09f170a 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
         <entry key="angel_http_exception">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
             </list>
           </value>
         </entry>
@@ -313,7 +313,7 @@
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
             </list>
           </value>
         </entry>
@@ -474,7 +474,7 @@
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+8/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+9/lib" />
             </list>
           </value>
         </entry>
@@ -496,7 +496,7 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
@@ -539,7 +539,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
@@ -562,7 +562,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.4+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.8/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.14/lib" />
     </CLASSES>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1cb1fc1c..ea55bec7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -28,8 +26,8 @@
       <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="257">
-              <caret line="26" column="17" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
+            <state relative-caret-position="416">
+              <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -37,28 +35,55 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/all.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="117">
-              <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="48">
-                <caret line="3" column="64" selection-start-line="3" selection-start-column="64" selection-end-line="3" selection-end-column="64" />
+              <first_editor relative-caret-position="16">
+                <caret line="1" column="50" selection-start-line="1" selection-start-column="50" selection-end-line="1" selection-end-column="50" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="167" column="45" selection-start-line="167" selection-start-column="45" selection-end-line="167" selection-end-column="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="164">
+              <caret line="135" column="48" lean-forward="true" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="16">
+              <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="path_set.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="161">
+              <caret line="77" column="33" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="170">
@@ -70,7 +95,7 @@
       <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="437">
+            <state relative-caret-position="4752">
               <caret line="307" column="10" selection-start-line="307" selection-start-column="10" selection-end-line="307" selection-end-column="10" />
             </state>
           </provider>
@@ -79,17 +104,8 @@
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="328">
-              <caret line="56" column="29" lean-forward="true" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="16" column="4" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
+            <state relative-caret-position="784">
+              <caret line="56" column="29" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
             </state>
           </provider>
         </entry>
@@ -98,7 +114,7 @@
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="352">
-              <caret line="22" column="12" lean-forward="true" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
+              <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
               <folding>
                 <element signature="e#0#17#0" expanded="true" />
               </folding>
@@ -106,15 +122,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -229,7 +236,6 @@
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
@@ -261,6 +267,7 @@
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
@@ -289,8 +296,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
       <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -336,6 +341,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
+      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -665,20 +672,7 @@
       <workItem from="1530230623749" duration="89000" />
       <workItem from="1531145856019" duration="691000" />
       <workItem from="1531146644160" duration="3494000" />
-    </task>
-    <task id="LOCAL-00052" summary="Made `Angel.serializer` public">
-      <created>1517975306169</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1517975306169</updated>
-    </task>
-    <task id="LOCAL-00053" summary="Remove line that resets `Angel.serializer` on close">
-      <created>1517975399809</created>
-      <option name="number" value="00053" />
-      <option name="presentableId" value="LOCAL-00053" />
-      <option name="project" value="LOCAL" />
-      <updated>1517975399809</updated>
+      <workItem from="1531151880119" duration="141000" />
     </task>
     <task id="LOCAL-00054" summary="Angel._flattened is now accessible via `optimizedRouter`">
       <created>1517975513004</created>
@@ -1009,7 +1003,21 @@
       <option name="project" value="LOCAL" />
       <updated>1531149879229</updated>
     </task>
-    <option name="localTasksCounter" value="101" />
+    <task id="LOCAL-00101" summary="Patch">
+      <created>1531151957605</created>
+      <option name="number" value="00101" />
+      <option name="presentableId" value="LOCAL-00101" />
+      <option name="project" value="LOCAL" />
+      <updated>1531151957606</updated>
+    </task>
+    <task id="LOCAL-00102" summary="Bump">
+      <created>1531152011317</created>
+      <option name="number" value="00102" />
+      <option name="presentableId" value="LOCAL-00102" />
+      <option name="project" value="LOCAL" />
+      <updated>1531152011317</updated>
+    </task>
+    <option name="localTasksCounter" value="103" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1045,7 +1053,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="158613000" />
+    <option name="totallyTimeSpent" value="158754000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1057,7 +1065,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="24" y="31" width="1403" height="784" extended-state="0" />
+    <frame x="10" y="23" width="1403" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1083,8 +1091,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25716385" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2608376" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1095,6 +1102,7 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
@@ -1108,8 +1116,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Pubspec -&gt; v1.1.1" />
-    <MESSAGE value="MapService dates will be strings" />
     <MESSAGE value="Bring back zones; mysterious hang" />
     <MESSAGE value="Fixed tests" />
     <MESSAGE value="CHANGELOG" />
@@ -1133,7 +1139,9 @@
     <MESSAGE value="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774" />
     <MESSAGE value="* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of&#10;`as`-casting them to `Map&lt;String, dynamic&gt;`." />
     <MESSAGE value="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9" />
-    <option name="LAST_COMMIT_MESSAGE" value="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9" />
+    <MESSAGE value="Patch" />
+    <MESSAGE value="Bump" />
+    <option name="LAST_COMMIT_MESSAGE" value="Bump" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1141,20 +1149,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="7" column="31" selection-start-line="7" selection-start-column="31" selection-end-line="7" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="113">
-          <caret line="19" column="15" lean-forward="true" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="98">
@@ -1240,13 +1234,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="148" column="57" selection-start-line="148" selection-start-column="57" selection-end-line="148" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="64">
@@ -1390,16 +1377,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
           <caret line="6" column="76" selection-start-line="6" selection-start-column="76" selection-end-line="6" selection-end-column="76" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="254" column="36" selection-start-line="254" selection-start-column="36" selection-end-line="254" selection-end-column="36" />
         </state>
       </provider>
     </entry>
@@ -1413,14 +1390,14 @@
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
-          <caret line="16" column="4" lean-forward="true" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
+          <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
-          <caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
         </state>
       </provider>
     </entry>
@@ -1433,15 +1410,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="13" column="30" lean-forward="true" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
+        <state relative-caret-position="208">
+          <caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="26" column="17" lean-forward="true" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
+        <state relative-caret-position="416">
+          <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1451,7 +1428,7 @@
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="352">
-          <caret line="22" column="12" lean-forward="true" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
+          <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
           </folding>
@@ -1460,35 +1437,18 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="328">
-          <caret line="56" column="29" lean-forward="true" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
+        <state relative-caret-position="784">
+          <caret line="56" column="29" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
+        <state relative-caret-position="4752">
           <caret line="307" column="10" selection-start-line="307" selection-start-column="10" selection-end-line="307" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="48">
-            <caret line="3" column="64" selection-start-line="3" selection-start-column="64" selection-end-line="3" selection-end-column="64" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="54" lean-forward="true" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
@@ -1496,6 +1456,51 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="164">
+          <caret line="135" column="48" lean-forward="true" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.65.0/libexec/lib/async/future.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="117">
+          <caret line="631" column="39" selection-start-line="631" selection-start-column="39" selection-end-line="631" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="167" column="45" selection-start-line="167" selection-start-column="45" selection-end-line="167" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="16">
+            <caret line="1" column="50" selection-start-line="1" selection-start-column="50" selection-end-line="1" selection-end-column="50" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="77" column="33" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0124453..b5b580ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.4+11
+* Close the response, etc. *after* finalizers are done.
+
 # 1.1.4+10
 * Change the zone error handler to take an `Object`
 
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 774faab0..be85a714 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -273,57 +273,57 @@ class AngelHttp {
         : app.responseFinalizers.fold<Future>(
             new Future.value(), (out, f) => out.then((_) => f(req, res)));
 
-    if (res.isOpen) res.end();
+    return finalizers.then((_) {
+      if (res.isOpen) res.end();
 
-    for (var key in res.headers.keys) {
-      request.response.headers.add(key, res.headers[key]);
-    }
+      for (var key in res.headers.keys) {
+        request.response.headers.add(key, res.headers[key]);
+      }
 
-    request.response.contentLength = res.buffer.length;
-    request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
+      request.response.contentLength = res.buffer.length;
+      request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
 
-    List<int> outputBuffer = res.buffer.toBytes();
+      List<int> outputBuffer = res.buffer.toBytes();
 
-    if (res.encoders.isNotEmpty) {
-      var allowedEncodings = req.headers
-          .value('accept-encoding')
-          ?.split(',')
-          ?.map((s) => s.trim())
-          ?.where((s) => s.isNotEmpty)
-          ?.map((str) {
-        // Ignore quality specifications in accept-encoding
-        // ex. gzip;q=0.8
-        if (!str.contains(';')) return str;
-        return str.split(';')[0];
-      });
+      if (res.encoders.isNotEmpty) {
+        var allowedEncodings = req.headers
+            .value('accept-encoding')
+            ?.split(',')
+            ?.map((s) => s.trim())
+            ?.where((s) => s.isNotEmpty)
+            ?.map((str) {
+          // Ignore quality specifications in accept-encoding
+          // ex. gzip;q=0.8
+          if (!str.contains(';')) return str;
+          return str.split(';')[0];
+        });
 
-      if (allowedEncodings != null) {
-        for (var encodingName in allowedEncodings) {
-          Converter<List<int>, List<int>> encoder;
-          String key = encodingName;
+        if (allowedEncodings != null) {
+          for (var encodingName in allowedEncodings) {
+            Converter<List<int>, List<int>> encoder;
+            String key = encodingName;
 
-          if (res.encoders.containsKey(encodingName))
-            encoder = res.encoders[encodingName];
-          else if (encodingName == '*') {
-            encoder = res.encoders[key = res.encoders.keys.first];
-          }
+            if (res.encoders.containsKey(encodingName))
+              encoder = res.encoders[encodingName];
+            else if (encodingName == '*') {
+              encoder = res.encoders[key = res.encoders.keys.first];
+            }
 
-          if (encoder != null) {
-            request.response.headers.set('content-encoding', key);
-            outputBuffer = res.encoders[key].convert(outputBuffer);
-            request.response.contentLength = outputBuffer.length;
-            break;
+            if (encoder != null) {
+              request.response.headers.set('content-encoding', key);
+              outputBuffer = res.encoders[key].convert(outputBuffer);
+              request.response.contentLength = outputBuffer.length;
+              break;
+            }
           }
         }
       }
-    }
 
-    request.response
-      ..statusCode = res.statusCode
-      ..cookies.addAll(res.cookies)
-      ..add(outputBuffer);
+      request.response
+        ..statusCode = res.statusCode
+        ..cookies.addAll(res.cookies)
+        ..add(outputBuffer);
 
-    return finalizers.then((_) {
       return request.response.close().then((_) {
         if (req.injections.containsKey(PoolResource)) {
           req.injections[PoolResource].release();
diff --git a/pubspec.yaml b/pubspec.yaml
index 9256e1ac..935f2328 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+10
+version: 1.1.4+11
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/common.dart b/test/common.dart
index 268bc9be..1c0b4a3b 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -38,8 +38,8 @@ class IsInstanceOf<T> implements Matcher {
   const IsInstanceOf();
 
   @override
-  Description describeMismatch(item, Description mismatchDescription,
-      Map matchState, bool verbose) {
+  Description describeMismatch(
+      item, Description mismatchDescription, Map matchState, bool verbose) {
     return mismatchDescription.add('$item is not an instance of $T');
   }
 

From 81e768cb16aed0beb26abda409c8b331eb010b0d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 12 Jul 2018 11:08:53 -0400
Subject: [PATCH 225/414] Added findOne to `Service`

---
 .idea/workspace.xml       | 170 +++++++++++++++++++-------------------
 lib/src/core/service.dart |  27 ++++++
 2 files changed, 111 insertions(+), 86 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ea55bec7..7c5c1122 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -23,35 +26,32 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="416">
-              <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
               <first_editor relative-caret-position="16">
-                <caret line="1" column="50" selection-start-line="1" selection-start-column="50" selection-end-line="1" selection-end-column="50" />
+                <caret line="1" column="55" selection-start-line="1" selection-start-column="55" selection-end-line="1" selection-end-column="55" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="186">
-              <caret line="167" column="45" selection-start-line="167" selection-start-column="45" selection-end-line="167" selection-end-column="45" />
+            <state relative-caret-position="4432">
+              <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -59,8 +59,8 @@
       <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="164">
-              <caret line="135" column="48" lean-forward="true" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
+            <state relative-caret-position="2112">
+              <caret line="135" column="48" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
             </state>
           </provider>
         </entry>
@@ -68,17 +68,17 @@
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="16">
-              <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
+            <state relative-caret-position="80">
+              <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="path_set.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="161">
-              <caret line="77" column="33" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="33" />
+            <state relative-caret-position="274">
+              <caret line="78" column="40" lean-forward="true" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -86,7 +86,7 @@
       <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
+            <state relative-caret-position="1360">
               <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
             </state>
           </provider>
@@ -113,7 +113,7 @@
       <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="352">
+            <state relative-caret-position="240">
               <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
               <folding>
                 <element signature="e#0#17#0" expanded="true" />
@@ -134,8 +134,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>HttpHeaders.CONTE</find>
-      <find>HttpHeaders</find>
       <find>HttpStatus.FORBIDDEN</find>
       <find>HttpStatus.</find>
       <find>JSON</find>
@@ -164,9 +162,10 @@
       <find>Map&lt;String,</find>
       <find>as</find>
       <find>redirectTo</find>
+      <find>finalizers.t</find>
+      <find>`Iterable`</find>
     </findStrings>
     <replaceStrings>
-      <replace>if (_isClosed &amp;&amp; !_useStream)</replace>
       <replace>logger?.warning</replace>
       <replace>JSON.decode</replace>
       <replace>query</replace>
@@ -196,6 +195,7 @@
       <replace>as $1</replace>
       <replace>as Map$1</replace>
       <replace>IsInstanceOf</replace>
+      <replace>[Iterable]</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -234,7 +234,6 @@
         <option value="$PROJECT_DIR$/analysis_options.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
@@ -270,6 +269,7 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
       </list>
     </option>
   </component>
@@ -296,7 +296,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -320,6 +320,13 @@
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="core" type="cbb8eebc:String" user="core" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -341,7 +348,7 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane" />
     </panes>
   </component>
@@ -351,6 +358,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="dart.analysis.tool.window.force.activate" value="false" />
+    <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="js-jscs-nodeInterpreter" value="C:\Program Files (x86)\nodejs\node.exe" />
     <property name="js.eslint.eslintPackage" value="" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -673,13 +681,8 @@
       <workItem from="1531145856019" duration="691000" />
       <workItem from="1531146644160" duration="3494000" />
       <workItem from="1531151880119" duration="141000" />
-    </task>
-    <task id="LOCAL-00054" summary="Angel._flattened is now accessible via `optimizedRouter`">
-      <created>1517975513004</created>
-      <option name="number" value="00054" />
-      <option name="presentableId" value="LOCAL-00054" />
-      <option name="project" value="LOCAL" />
-      <updated>1517975513004</updated>
+      <workItem from="1531154836670" duration="378000" />
+      <workItem from="1531407760497" duration="353000" />
     </task>
     <task id="LOCAL-00055" summary="Used function syntax, deprecated `ResponseSerializer` typedef">
       <created>1517975664302</created>
@@ -1017,13 +1020,17 @@
       <option name="project" value="LOCAL" />
       <updated>1531152011317</updated>
     </task>
-    <option name="localTasksCounter" value="103" />
+    <task id="LOCAL-00103" summary="Finalizers before sending">
+      <created>1531155020859</created>
+      <option name="number" value="00103" />
+      <option name="presentableId" value="LOCAL-00103" />
+      <option name="project" value="LOCAL" />
+      <updated>1531155020859</updated>
+    </task>
+    <option name="localTasksCounter" value="104" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.06.10 at 19h 15m 03s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.06.10 at 19h 15m 55s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1051,9 +1058,12 @@
     <history-entry file="All_Tests - 2018.07.09 at 11h 06m 50s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.07.09 at 12h 48m 12s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="158754000" />
+    <option name="totallyTimeSpent" value="159485000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1084,14 +1094,13 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2608376" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.26818517" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1104,6 +1113,7 @@
       <window_info id="DB Browser" order="2" weight="0.32998413" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
     </layout>
@@ -1116,7 +1126,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Bring back zones; mysterious hang" />
     <MESSAGE value="Fixed tests" />
     <MESSAGE value="CHANGELOG" />
     <MESSAGE value="Update example" />
@@ -1141,7 +1150,8 @@
     <MESSAGE value="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9" />
     <MESSAGE value="Patch" />
     <MESSAGE value="Bump" />
-    <option name="LAST_COMMIT_MESSAGE" value="Bump" />
+    <MESSAGE value="Finalizers before sending" />
+    <option name="LAST_COMMIT_MESSAGE" value="Finalizers before sending" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1190,13 +1200,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="155" column="15" lean-forward="true" selection-start-line="155" selection-start-column="15" selection-end-line="155" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="255">
@@ -1325,13 +1328,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
@@ -1350,9 +1346,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="448">
           <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1367,9 +1360,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="436">
           <caret line="39" column="11" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
-          <folding>
-            <element signature="e#38#92#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1417,7 +1407,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
+        <state relative-caret-position="336">
           <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -1427,7 +1417,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
+        <state relative-caret-position="240">
           <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
           <folding>
             <element signature="e#0#17#0" expanded="true" />
@@ -1451,29 +1441,37 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
+        <state relative-caret-position="1360">
           <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="135" column="48" lean-forward="true" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
+        <state relative-caret-position="2112">
+          <caret line="135" column="48" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.65.0/libexec/lib/async/future.dart">
+    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.65.0/libexec/lib/async/future.dart" />
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="631" column="39" selection-start-line="631" selection-start-column="39" selection-end-line="631" selection-end-column="39" />
+        <state relative-caret-position="470">
+          <caret line="77" column="33" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="167" column="45" selection-start-line="167" selection-start-column="45" selection-end-line="167" selection-end-column="45" />
+        <state relative-caret-position="4432">
+          <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
         </state>
       </provider>
     </entry>
@@ -1481,7 +1479,7 @@
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
           <first_editor relative-caret-position="16">
-            <caret line="1" column="50" selection-start-line="1" selection-start-column="50" selection-end-line="1" selection-end-column="50" />
+            <caret line="1" column="55" selection-start-line="1" selection-start-column="55" selection-end-line="1" selection-end-column="55" />
           </first_editor>
           <second_editor />
         </state>
@@ -1489,15 +1487,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
+        <state relative-caret-position="80">
+          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="77" column="33" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="33" />
+        <state relative-caret-position="274">
+          <caret line="78" column="40" lean-forward="true" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
         </state>
       </provider>
     </entry>
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index ca464e7d..659ee639 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -64,6 +64,33 @@ class Service extends Routable {
   /// Closes this service, including any database connections or stream controllers.
   void close() {}
 
+  /// Retrieves the first object from the result of calling [index] with the given [params].
+  ///
+  /// If the result of [index] is `null`, OR an empty [Iterable], a 404 `AngelHttpException` will be thrown.
+  ///
+  /// If the result is both non-null and NOT an [Iterable], it will be returned as-is.
+  ///
+  /// If the result is a non-empty [Iterable], [findOne] will return `it.first`, where `it` is the aforementioned [Iterable].
+  ///
+  /// A custom [errorMessage] may be provided.
+  Future findOne(
+      [Map params,
+      String errorMessage = 'No record was found matching the given query.']) {
+    return index(params).then((result) {
+      if (result == null) {
+        throw new AngelHttpException.notFound(message: errorMessage);
+      } else if (result is Iterable) {
+        if (result.isEmpty) {
+          throw new AngelHttpException.notFound(message: errorMessage);
+        } else {
+          return result.first;
+        }
+      } else {
+        return result;
+      }
+    });
+  }
+
   /// Retrieves all resources.
   Future index([Map params]) {
     throw new AngelHttpException.methodNotAllowed();

From 60cb727ca82d20a98a9ddd6281946bda9ad5f0e7 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 12 Jul 2018 11:19:25 -0400
Subject: [PATCH 226/414] Added `Service.findOne` tests

---
 .idea/libraries/Dart_Packages.xml             |  20 +-
 .../tests_in_find_one_test_dart.xml           |   7 +
 .idea/workspace.xml                           | 208 +++++++++---------
 CHANGELOG.md                                  |   4 +
 lib/src/core/anonymous_service.dart           |  41 ++--
 lib/src/core/request_context.dart             |   4 +-
 lib/src/http/angel_http.dart                  |   4 +-
 performance/hello/main.dart                   |   4 +-
 test/all.dart                                 |   2 +
 test/find_one_test.dart                       |  23 ++
 10 files changed, 177 insertions(+), 140 deletions(-)
 create mode 100644 .idea/runConfigurations/tests_in_find_one_test_dart.xml
 create mode 100644 test/find_one_test.dart

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index d09f170a..3cbc4924 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -68,7 +68,7 @@
         <entry key="charcode">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
             </list>
           </value>
         </entry>
@@ -159,7 +159,7 @@
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+17/lib" />
             </list>
           </value>
         </entry>
@@ -180,7 +180,7 @@
         <entry key="http_server">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.8/lib" />
             </list>
           </value>
         </entry>
@@ -222,7 +222,7 @@
         <entry key="json_god">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+3/lib" />
             </list>
           </value>
         </entry>
@@ -355,7 +355,7 @@
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+2/lib" />
             </list>
           </value>
         </entry>
@@ -504,7 +504,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0+3/lib" />
@@ -517,16 +517,16 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+17/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.8/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.6+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
@@ -545,7 +545,7 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
diff --git a/.idea/runConfigurations/tests_in_find_one_test_dart.xml b/.idea/runConfigurations/tests_in_find_one_test_dart.xml
new file mode 100644
index 00000000..ad42b586
--- /dev/null
+++ b/.idea/runConfigurations/tests_in_find_one_test_dart.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tests in find_one_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/find_one_test.dart" />
+    <option name="testRunnerOptions" value="-j4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7c5c1122..5485fef2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/tests_in_find_one_test_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/test/find_one_test.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/all.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/all.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,12 +30,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="16">
-                <caret line="1" column="55" selection-start-line="1" selection-start-column="55" selection-end-line="1" selection-end-column="55" />
+              <first_editor relative-caret-position="32">
+                <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
               </first_editor>
               <second_editor />
             </state>
@@ -50,7 +54,7 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4432">
+            <state relative-caret-position="187">
               <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
             </state>
           </provider>
@@ -74,11 +78,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <file leaf-file-name="find_one_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="274">
-              <caret line="78" column="40" lean-forward="true" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
+            <state relative-caret-position="128">
+              <caret line="8" column="30" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
+              <folding>
+                <element signature="e#0#54#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -101,27 +108,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="784">
-              <caret line="56" column="29" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
-              <folding>
-                <element signature="e#0#17#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -134,7 +120,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>HttpStatus.FORBIDDEN</find>
       <find>HttpStatus.</find>
       <find>JSON</find>
       <find>ContentType.JSON.toString()</find>
@@ -164,6 +149,7 @@
       <find>redirectTo</find>
       <find>finalizers.t</find>
       <find>`Iterable`</find>
+      <find>instance</find>
     </findStrings>
     <replaceStrings>
       <replace>logger?.warning</replace>
@@ -219,7 +205,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
         <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
@@ -242,7 +227,6 @@
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
@@ -263,13 +247,15 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/test/find_one_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -353,6 +339,7 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="GO_FMT" value="false" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/thosakwe/Source/Dart/framework/lib/src/http/request_context.dart" />
     <property name="WebServerToolWindowFactoryState" value="false" />
@@ -393,7 +380,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.All Tests">
+  <component name="RunManager" selected="Dart Test.tests in find_one_test.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -588,6 +575,7 @@
       <item itemvalue="Dart Command Line App.view.dart" />
       <item itemvalue="Dart Command Line App.handle_error.dart" />
       <item itemvalue="Dart Command Line App.templating.dart" />
+      <item itemvalue="Dart Test.tests in find_one_test.dart" />
     </list>
   </component>
   <component name="SvnConfiguration">
@@ -682,14 +670,7 @@
       <workItem from="1531146644160" duration="3494000" />
       <workItem from="1531151880119" duration="141000" />
       <workItem from="1531154836670" duration="378000" />
-      <workItem from="1531407760497" duration="353000" />
-    </task>
-    <task id="LOCAL-00055" summary="Used function syntax, deprecated `ResponseSerializer` typedef">
-      <created>1517975664302</created>
-      <option name="number" value="00055" />
-      <option name="presentableId" value="LOCAL-00055" />
-      <option name="project" value="LOCAL" />
-      <updated>1517975664302</updated>
+      <workItem from="1531407760497" duration="832000" />
     </task>
     <task id="LOCAL-00056" summary="Deprecated all serving logic in `Angel`">
       <created>1517976649593</created>
@@ -1027,19 +1008,17 @@
       <option name="project" value="LOCAL" />
       <updated>1531155020859</updated>
     </task>
-    <option name="localTasksCounter" value="104" />
+    <task id="LOCAL-00104" summary="Added findOne to `Service`">
+      <created>1531408133584</created>
+      <option name="number" value="00104" />
+      <option name="presentableId" value="LOCAL-00104" />
+      <option name="project" value="LOCAL" />
+      <updated>1531408133586</updated>
+    </task>
+    <option name="localTasksCounter" value="105" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.06.10 at 19h 15m 55s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.06.20 at 15h 44m 03s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 46m 08s.xml">
-      <configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 57m 51s.xml">
       <configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1061,9 +1040,18 @@
     <history-entry file="All_Tests - 2018.07.09 at 12h 48m 12s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 13m 12s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 14m 14s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 16m 10s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="159485000" />
+    <option name="totallyTimeSpent" value="159964000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1098,9 +1086,10 @@
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.26818517" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26818517" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1111,7 +1100,6 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -1126,7 +1114,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Fixed tests" />
     <MESSAGE value="CHANGELOG" />
     <MESSAGE value="Update example" />
     <MESSAGE value="Use dart2_constant" />
@@ -1151,7 +1138,8 @@
     <MESSAGE value="Patch" />
     <MESSAGE value="Bump" />
     <MESSAGE value="Finalizers before sending" />
-    <option name="LAST_COMMIT_MESSAGE" value="Finalizers before sending" />
+    <MESSAGE value="Added findOne to `Service`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added findOne to `Service`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1159,13 +1147,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="98">
-          <caret line="25" column="68" selection-start-line="25" selection-start-column="68" selection-end-line="25" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/views/index.jl">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="128">
@@ -1237,13 +1218,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="5" column="28" lean-forward="true" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="236">
@@ -1335,17 +1309,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib/src/core_matchers.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="116" column="8" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="448">
           <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1360,6 +1330,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="436">
           <caret line="39" column="11" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
+          <folding>
+            <element signature="e#38#92#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1398,13 +1371,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -1461,27 +1427,27 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+        <state relative-caret-position="536">
+          <caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib/src/core_matchers.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4432">
-          <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
+        <state relative-caret-position="86">
+          <caret line="116" column="8" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="16">
-            <caret line="1" column="55" selection-start-line="1" selection-start-column="55" selection-end-line="1" selection-end-column="55" />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="78" column="40" lean-forward="true" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
         </state>
       </provider>
     </entry>
@@ -1492,10 +1458,44 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="78" column="40" lean-forward="true" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
+        <state relative-caret-position="187">
+          <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="29" column="57" lean-forward="true" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="8" column="30" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="32">
+            <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5b580ca..396cd60c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.5
+* `AnonymousService` methods can now return `FutureOr`.
+* Added `findOne` to `Service`.
+
 # 1.1.4+11
 * Close the response, etc. *after* finalizers are done.
 
diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index 0faf3b12..4878b54c 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -5,17 +5,17 @@ import 'service.dart';
 ///
 /// Well-suited for testing.
 class AnonymousService extends Service {
-  Future Function([Map]) _index;
-  Future Function(Object, [Map]) _read, _create, _remove;
-  Future Function(Object, Object, [Map]) _modify, _update;
+  FutureOr Function([Map]) _index;
+  FutureOr Function(Object, [Map]) _read, _create, _remove;
+  FutureOr Function(Object, Object, [Map]) _modify, _update;
 
   AnonymousService(
-      {Future index([Map params]),
-      Future read(id, [Map params]),
-      Future create(data, [Map params]),
-      Future modify(id, data, [Map params]),
-      Future update(id, data, [Map params]),
-      Future remove(id, [Map params])})
+      {FutureOr index([Map params]),
+      FutureOr read(id, [Map params]),
+      FutureOr create(data, [Map params]),
+      FutureOr modify(id, data, [Map params]),
+      FutureOr update(id, data, [Map params]),
+      FutureOr remove(id, [Map params])})
       : super() {
     _index = index;
     _read = read;
@@ -26,27 +26,28 @@ class AnonymousService extends Service {
   }
 
   @override
-  index([Map params]) => _index != null ? _index(params) : super.index(params);
+  index([Map params]) => new Future.sync(
+      () => _index != null ? _index(params) : super.index(params));
 
   @override
-  read(id, [Map params]) =>
-      _read != null ? _read(id, params) : super.read(id, params);
+  read(id, [Map params]) => new Future.sync(
+      () => _read != null ? _read(id, params) : super.read(id, params));
 
   @override
-  create(data, [Map params]) =>
-      _create != null ? _create(data, params) : super.create(data, params);
+  create(data, [Map params]) => new Future.sync(() =>
+      _create != null ? _create(data, params) : super.create(data, params));
 
   @override
-  modify(id, data, [Map params]) => _modify != null
+  modify(id, data, [Map params]) => new Future.sync(() => _modify != null
       ? _modify(id, data, params)
-      : super.modify(id, data, params);
+      : super.modify(id, data, params));
 
   @override
-  update(id, data, [Map params]) => _update != null
+  update(id, data, [Map params]) => new Future.sync(() => _update != null
       ? _update(id, data, params)
-      : super.update(id, data, params);
+      : super.update(id, data, params));
 
   @override
-  remove(id, [Map params]) =>
-      _remove != null ? _remove(id, params) : super.remove(id, params);
+  remove(id, [Map params]) => new Future.sync(
+      () => _remove != null ? _remove(id, params) : super.remove(id, params));
 }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index cc4edf54..daee6ab1 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -167,8 +167,8 @@ abstract class RequestContext {
   void inject(type, value) {
     if (!app.isProduction && type is Type) {
       if (!reflect(value).type.isAssignableTo(reflectType(type)))
-        throw new ArgumentError('Cannot inject $value (${value
-                .runtimeType}) as an instance of $type.');
+        throw new ArgumentError(
+            'Cannot inject $value (${value.runtimeType}) as an instance of $type.');
     }
 
     _injections[type] = value;
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index be85a714..d23cce48 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -334,8 +334,8 @@ class AngelHttp {
 
           if (sw.isRunning) {
             sw?.stop();
-            app.logger.info("${res.statusCode} ${req.method} ${req.uri} (${sw
-                ?.elapsedMilliseconds ?? 'unknown'} ms)");
+            app.logger.info(
+                "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
           }
         }
       });
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 6127e30c..73b69b35 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -35,7 +35,7 @@ void start(int id) {
   };
 
   http.startServer('127.0.0.1', 3000).then((server) {
-    print('Instance #$id listening at http://${server.address.address}:${server
-            .port}');
+    print(
+        'Instance #$id listening at http://${server.address.address}:${server.port}');
   });
 }
diff --git a/test/all.dart b/test/all.dart
index 8d69d1c1..9473c038 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -9,6 +9,7 @@ import 'di_test.dart' as di;
 import 'encoders_buffer_test.dart' as encoders_buffer;
 import 'exception_test.dart' as exception;
 import 'extension_test.dart' as extension;
+import 'find_one_test.dart' as find_one;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
 import 'parameter_meta_test.dart' as parameter_meta;
@@ -34,6 +35,7 @@ main() {
   group('encoders_buffer', encoders_buffer.main);
   group('exception', exception.main);
   group('extension', extension.main);
+  group('find_one', find_one.main);
   group('general', general.main);
   group('hooked', hooked.main);
   group('parameter_meta', parameter_meta.main);
diff --git a/test/find_one_test.dart b/test/find_one_test.dart
new file mode 100644
index 00000000..530047ff
--- /dev/null
+++ b/test/find_one_test.dart
@@ -0,0 +1,23 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:test/test.dart';
+import 'common.dart';
+
+void main() {
+  var throwsAnAngelHttpException =
+      throwsA(const IsInstanceOf<AngelHttpException>());
+
+  test('throw 404 on null', () {
+    var service = new AnonymousService(index: ([p]) => null);
+    expect(() => service.findOne(), throwsAnAngelHttpException);
+  });
+
+  test('throw 404 on empty iterable', () {
+    var service = new AnonymousService(index: ([p]) => []);
+    expect(() => service.findOne(), throwsAnAngelHttpException);
+  });
+
+  test('return first element of iterable', () async {
+    var service = new AnonymousService(index: ([p]) => [2]);
+    expect(await service.findOne(), 2);
+  });
+}

From b0fae482ac62daaf2deac9c14e0b51a1a4f32e18 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 12 Jul 2018 11:28:20 -0400
Subject: [PATCH 227/414] Bump version -> 1.1.5

---
 pubspec.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 935f2328..78b7256f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.4+11
+version: 1.1.5
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -28,7 +28,8 @@ dependencies:
   tuple: ^1.0.0
 dev_dependencies:
   angel_jael: ^1.0.0
-  mock_request: ^1.0.0
+  file: ^2.0.0
   http: ^0.11.3
   io: ^0.3.0
+  mock_request: ^1.0.0
   test: ^0.12.13

From 4c0cdf4d1897ae59b9aa1584e2f1666ae9a7dfd3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 3 Aug 2018 23:38:31 -0400
Subject: [PATCH 228/414] Patched another cast bug

---
 .idea/workspace.xml           | 292 +++++++++++++++++-----------------
 CHANGELOG.md                  |   4 +
 lib/src/core/map_service.dart |  13 +-
 pubspec.yaml                  |   4 +-
 4 files changed, 161 insertions(+), 152 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5485fef2..4c29113d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/tests_in_find_one_test_dart.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/test/find_one_test.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/all.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/all.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,23 +28,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="32">
-                <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
+            <state relative-caret-position="80">
+              <caret line="14" column="56" selection-start-line="14" selection-start-column="56" selection-end-line="14" selection-end-column="56" />
             </state>
           </provider>
         </entry>
@@ -54,7 +40,7 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
+            <state relative-caret-position="4432">
               <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
             </state>
           </provider>
@@ -69,11 +55,41 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
+            <state relative-caret-position="48">
+              <caret line="3" column="35" lean-forward="true" selection-start-line="3" selection-start-column="35" selection-end-line="3" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="313">
+              <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="48">
+                <caret line="2" column="77" selection-start-line="2" selection-start-column="77" selection-end-line="2" selection-end-column="77" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="448">
+              <caret line="37" column="18" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="18" />
             </state>
           </provider>
         </entry>
@@ -81,8 +97,20 @@
       <file leaf-file-name="find_one_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="8" column="30" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
+            <state relative-caret-position="256">
+              <caret line="18" column="52" selection-start-line="18" selection-start-column="52" selection-end-line="18" selection-end-column="52" />
+              <folding>
+                <element signature="e#0#54#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="anonymous_service_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="512">
+              <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
               <folding>
                 <element signature="e#0#54#0" expanded="true" />
               </folding>
@@ -99,15 +127,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4752">
-              <caret line="307" column="10" selection-start-line="307" selection-start-column="10" selection-end-line="307" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -120,7 +139,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>HttpStatus.</find>
       <find>JSON</find>
       <find>ContentType.JSON.toString()</find>
       <find>(req, res)</find>
@@ -150,6 +168,7 @@
       <find>finalizers.t</find>
       <find>`Iterable`</find>
       <find>instance</find>
+      <find>==</find>
     </findStrings>
     <replaceStrings>
       <replace>logger?.warning</replace>
@@ -237,7 +256,6 @@
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
@@ -250,12 +268,13 @@
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/test/find_one_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -269,8 +288,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="10" />
-    <option name="y" value="23" />
+    <option name="x" value="60" />
+    <option name="y" value="45" />
     <option name="width" value="1403" />
     <option name="height" value="784" />
   </component>
@@ -282,6 +301,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -334,8 +355,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -527,13 +546,13 @@
       <envs />
     </configuration>
     <list>
+      <item itemvalue="Dart Test.All Tests (PRODUCTION)" />
       <item itemvalue="Dart Test.Can serialize function result as JSON in routing_test.dart" />
       <item itemvalue="Dart Test.Match routes, even with query params in routing_test.dart" />
       <item itemvalue="Dart Test.listen before and after in hooked_test.dart" />
       <item itemvalue="Dart Command Line App.performance::hello (DEV)" />
       <item itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
       <item itemvalue="Dart Command Line App.All Tests (for coverage)" />
-      <item itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
       <item itemvalue="Dart Command Line App.performance::hello::raw" />
       <item itemvalue="Dart Command Line App.main.dart" />
       <item itemvalue="Dart Test.tests in extension_test.dart" />
@@ -670,21 +689,8 @@
       <workItem from="1531146644160" duration="3494000" />
       <workItem from="1531151880119" duration="141000" />
       <workItem from="1531154836670" duration="378000" />
-      <workItem from="1531407760497" duration="832000" />
-    </task>
-    <task id="LOCAL-00056" summary="Deprecated all serving logic in `Angel`">
-      <created>1517976649593</created>
-      <option name="number" value="00056" />
-      <option name="presentableId" value="LOCAL-00056" />
-      <option name="project" value="LOCAL" />
-      <updated>1517976649593</updated>
-    </task>
-    <task id="LOCAL-00057" summary="Removed use of `HttpHeaders` in `Angel`">
-      <created>1517976712783</created>
-      <option name="number" value="00057" />
-      <option name="presentableId" value="LOCAL-00057" />
-      <option name="project" value="LOCAL" />
-      <updated>1517976712783</updated>
+      <workItem from="1531407760497" duration="1958000" />
+      <workItem from="1533353660185" duration="243000" />
     </task>
     <task id="LOCAL-00058" summary="Deprecated createZoneForRequest">
       <created>1517976806435</created>
@@ -1015,22 +1021,24 @@
       <option name="project" value="LOCAL" />
       <updated>1531408133586</updated>
     </task>
-    <option name="localTasksCounter" value="105" />
+    <task id="LOCAL-00105" summary="Added `Service.findOne` tests">
+      <created>1531408765286</created>
+      <option name="number" value="00105" />
+      <option name="presentableId" value="LOCAL-00105" />
+      <option name="project" value="LOCAL" />
+      <updated>1531408765286</updated>
+    </task>
+    <task id="LOCAL-00106" summary="Bump version -&gt; 1.1.5">
+      <created>1531409300283</created>
+      <option name="number" value="00106" />
+      <option name="presentableId" value="LOCAL-00106" />
+      <option name="project" value="LOCAL" />
+      <updated>1531409300283</updated>
+    </task>
+    <option name="localTasksCounter" value="107" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_extension_test_dart - 2018.06.22 at 23h 57m 51s.xml">
-      <configuration name="tests in extension_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.06.28 at 20h 05m 10s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.07.09 at 10h 41m 59s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="All_Tests - 2018.07.09 at 10h 42m 26s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.07.09 at 11h 06m 02s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1049,9 +1057,21 @@
     <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 16m 10s.xml">
       <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 17m 32s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 17m 58s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 18m 03s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 18m 30s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="159964000" />
+    <option name="totallyTimeSpent" value="161333000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1063,7 +1083,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="10" y="23" width="1403" height="784" extended-state="0" />
+    <frame x="60" y="45" width="1403" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1085,11 +1105,10 @@
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
-      <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26818517" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27185893" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1100,6 +1119,7 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -1114,8 +1134,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="CHANGELOG" />
-    <MESSAGE value="Update example" />
     <MESSAGE value="Use dart2_constant" />
     <MESSAGE value="Fixed all broken tests" />
     <MESSAGE value="1.1.3" />
@@ -1139,7 +1157,9 @@
     <MESSAGE value="Bump" />
     <MESSAGE value="Finalizers before sending" />
     <MESSAGE value="Added findOne to `Service`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added findOne to `Service`" />
+    <MESSAGE value="Added `Service.findOne` tests" />
+    <MESSAGE value="Bump version -&gt; 1.1.5" />
+    <option name="LAST_COMMIT_MESSAGE" value="Bump version -&gt; 1.1.5" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1147,13 +1167,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/example/views/index.jl">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/templating.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1167,13 +1180,7 @@
     <entry file="file://$PROJECT_DIR$/tool/travis.sh">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/validation.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/validation.dart" />
     <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="32">
@@ -1274,13 +1281,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="816">
-          <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="146">
@@ -1302,20 +1303,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="120" column="46" lean-forward="true" selection-start-line="120" selection-start-column="46" selection-end-line="120" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="448">
           <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1330,9 +1321,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="436">
           <caret line="39" column="11" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
-          <folding>
-            <element signature="e#38#92#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1375,9 +1363,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
           <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1385,9 +1370,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
           <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1431,9 +1413,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="536">
           <caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1444,34 +1423,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="78" column="40" lean-forward="true" selection-start-line="78" selection-start-column="40" selection-end-line="78" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
+        <state relative-caret-position="4432">
           <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="182">
@@ -1479,26 +1437,64 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="14" column="56" selection-start-line="14" selection-start-column="56" selection-end-line="14" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="8" column="30" selection-start-line="8" selection-start-column="30" selection-end-line="8" selection-end-column="30" />
+        <state relative-caret-position="256">
+          <caret line="18" column="52" selection-start-line="18" selection-start-column="52" selection-end-line="18" selection-end-column="52" />
           <folding>
             <element signature="e#0#54#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="512">
+          <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="448">
+          <caret line="37" column="18" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="313">
+          <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="32">
-            <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
+          <first_editor relative-caret-position="48">
+            <caret line="2" column="77" selection-start-line="2" selection-start-column="77" selection-end-line="2" selection-end-column="77" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="35" lean-forward="true" selection-start-line="3" selection-start-column="35" selection-end-line="3" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 396cd60c..bac6849d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.1.5+1
+* Patched annoying error that prevented MapServices from working,
+simply because `<dynamic, dynamic>` is incompatible with `<String, dynamic>`.
+
 # 1.1.5
 * `AnonymousService` methods can now return `FutureOr`.
 * Added `findOne` to `Service`.
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index d89576f4..7fd79f23 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -1,5 +1,7 @@
 import 'dart:async';
+
 import 'package:angel_http_exception/angel_http_exception.dart';
+
 import 'service.dart';
 
 /// A basic service that manages an in-memory list of maps.
@@ -85,10 +87,17 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] = now
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
-    items.add(result as Map<String, dynamic>);
+    items.add(_foldStringDynamic(result));
     return new Future.value(result);
   }
 
+  Map<String, dynamic> _foldStringDynamic(Map map) {
+    return map == null
+        ? null
+        : map.keys.fold<Map<String, dynamic>>(
+            <String, dynamic>{}, (out, k) => out..[k.toString()] = map[k]);
+  }
+
   @override
   Future<Map> modify(id, data, [Map params]) {
     if (data is! Map)
@@ -130,7 +139,7 @@ class MapService extends Service {
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
               new DateTime.now().toIso8601String();
       }
-      items.add(result as Map<String, dynamic>);
+      items.add(_foldStringDynamic(result));
       return new Future.value(result);
     });
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 78b7256f..83aa086f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,10 +1,10 @@
 name: angel_framework
-version: 1.1.5
+version: 1.1.5+1
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
-  sdk: ">=1.19.0 <3.0.0"
+  sdk: ">=1.8.0 <3.0.0"
 dependencies:
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0

From 0cd7750a781926b46aca54051bbca6fe858b0591 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 17 Aug 2018 19:03:28 -0400
Subject: [PATCH 229/414] Removed random_string dependency

---
 .idea/workspace.xml | 67 ++++++++++++++++++++++-----------------------
 pubspec.yaml        |  1 -
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4c29113d..37317968 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -58,8 +56,8 @@
       <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="48">
-              <caret line="3" column="35" lean-forward="true" selection-start-line="3" selection-start-column="35" selection-end-line="3" selection-end-column="35" />
+            <state relative-caret-position="384">
+              <caret line="24" column="14" selection-start-line="24" selection-start-column="14" selection-end-line="24" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -67,7 +65,7 @@
       <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="313">
+            <state relative-caret-position="1424">
               <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
             </state>
           </provider>
@@ -77,7 +75,7 @@
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="48">
+              <first_editor relative-caret-position="32">
                 <caret line="2" column="77" selection-start-line="2" selection-start-column="77" selection-end-line="2" selection-end-column="77" />
               </first_editor>
               <second_editor />
@@ -139,8 +137,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>JSON</find>
-      <find>ContentType.JSON.toString()</find>
       <find>(req, res)</find>
       <find>headers: headers,</find>
       <find>_</find>
@@ -169,9 +165,10 @@
       <find>`Iterable`</find>
       <find>instance</find>
       <find>==</find>
+      <find>as Map&lt;String, dynamic&gt;</find>
+      <find>result as Map&lt;String, dynamic&gt;</find>
     </findStrings>
     <replaceStrings>
-      <replace>logger?.warning</replace>
       <replace>JSON.decode</replace>
       <replace>query</replace>
       <replace>cookie</replace>
@@ -201,6 +198,7 @@
       <replace>as Map$1</replace>
       <replace>IsInstanceOf</replace>
       <replace>[Iterable]</replace>
+      <replace>_foldStringDynamic(result)</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -288,8 +286,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="60" />
-    <option name="y" value="45" />
+    <option name="x" value="37" />
+    <option name="y" value="23" />
     <option name="width" value="1403" />
     <option name="height" value="784" />
   </component>
@@ -301,8 +299,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane" />
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
       <pane id="Scope">
         <subPane subId="Project Files">
@@ -355,6 +351,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -690,14 +688,8 @@
       <workItem from="1531151880119" duration="141000" />
       <workItem from="1531154836670" duration="378000" />
       <workItem from="1531407760497" duration="1958000" />
-      <workItem from="1533353660185" duration="243000" />
-    </task>
-    <task id="LOCAL-00058" summary="Deprecated createZoneForRequest">
-      <created>1517976806435</created>
-      <option name="number" value="00058" />
-      <option name="presentableId" value="LOCAL-00058" />
-      <option name="project" value="LOCAL" />
-      <updated>1517976806435</updated>
+      <workItem from="1533353660185" duration="262000" />
+      <workItem from="1534009494986" duration="594000" />
     </task>
     <task id="LOCAL-00059" summary="Deprecated `ServerGenerator`">
       <created>1517977060369</created>
@@ -1035,7 +1027,14 @@
       <option name="project" value="LOCAL" />
       <updated>1531409300283</updated>
     </task>
-    <option name="localTasksCounter" value="107" />
+    <task id="LOCAL-00107" summary="Patched another cast bug">
+      <created>1533353912000</created>
+      <option name="number" value="00107" />
+      <option name="presentableId" value="LOCAL-00107" />
+      <option name="project" value="LOCAL" />
+      <updated>1533353912001</updated>
+    </task>
+    <option name="localTasksCounter" value="108" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1071,7 +1070,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="161333000" />
+    <option name="totallyTimeSpent" value="161946000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1083,7 +1082,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="60" y="45" width="1403" height="784" extended-state="0" />
+    <frame x="141" y="23" width="1403" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1108,22 +1107,22 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27185893" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2755327" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
-      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1134,7 +1133,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Use dart2_constant" />
     <MESSAGE value="Fixed all broken tests" />
     <MESSAGE value="1.1.3" />
     <MESSAGE value="Test against Dart 1.x" />
@@ -1159,7 +1157,8 @@
     <MESSAGE value="Added findOne to `Service`" />
     <MESSAGE value="Added `Service.findOne` tests" />
     <MESSAGE value="Bump version -&gt; 1.1.5" />
-    <option name="LAST_COMMIT_MESSAGE" value="Bump version -&gt; 1.1.5" />
+    <MESSAGE value="Patched another cast bug" />
+    <option name="LAST_COMMIT_MESSAGE" value="Patched another cast bug" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1473,7 +1472,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
+        <state relative-caret-position="1424">
           <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
         </state>
       </provider>
@@ -1481,7 +1480,7 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="48">
+          <first_editor relative-caret-position="32">
             <caret line="2" column="77" selection-start-line="2" selection-start-column="77" selection-end-line="2" selection-end-column="77" />
           </first_editor>
           <second_editor />
@@ -1490,8 +1489,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="35" lean-forward="true" selection-start-line="3" selection-start-column="35" selection-end-line="3" selection-end-column="35" />
+        <state relative-caret-position="384">
+          <caret line="24" column="14" selection-start-line="24" selection-start-column="14" selection-end-line="24" selection-end-column="14" />
         </state>
       </provider>
     </entry>
diff --git a/pubspec.yaml b/pubspec.yaml
index 83aa086f..48cb8dcf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,7 +23,6 @@ dependencies:
   mime: ^0.9.3
   path: ">=1.0.0 <2.0.0"
   pool: ^1.0.0
-  random_string: ^0.0.1
   stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:

From 32a85c97efa21ba4a4aac3c3db9853ef94fac4e4 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 17 Aug 2018 19:05:32 -0400
Subject: [PATCH 230/414] Removed random_string dependency

---
 CHANGELOG.md | 3 +++
 pubspec.yaml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bac6849d..d3d8842f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.1.5+2
+* Removed `random_string` dependency.
+
 # 1.1.5+1
 * Patched annoying error that prevented MapServices from working,
 simply because `<dynamic, dynamic>` is incompatible with `<String, dynamic>`.
diff --git a/pubspec.yaml b/pubspec.yaml
index 48cb8dcf..09ebd2b2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 1.1.5+1
+version: 1.1.5+2
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 2855017d68a727eaf68d937ef664981c5f1ac4d9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 11:33:25 -0400
Subject: [PATCH 231/414] Switch to MediaType

---
 .idea/libraries/Dart_Packages.xml  | 274 +++++-------
 .idea/workspace.xml                | 680 ++++++++++++++++-------------
 CHANGELOG.md                       |   6 +-
 README.md                          |   2 +-
 example/handle_error.dart          |   3 +-
 example/json.dart                  |   3 +-
 example/main.dart                  |   3 +-
 example/templating.dart            |   3 +-
 example/view.dart                  |   3 +-
 lib/src/core/angel_base.dart       |   8 +-
 lib/src/core/response_context.dart |  30 +-
 lib/src/core/server.dart           |  11 +-
 performance/hello/main.dart        |   3 +-
 pubspec.yaml                       |  12 +-
 test/accepts_test.dart             |   3 +-
 test/controller_test.dart          |   9 +-
 test/di_test.dart                  |   3 +-
 test/encoders_buffer_test.dart     |   3 +-
 test/extension_test.dart           |   3 +-
 test/general_test.dart             |   3 +-
 test/hooked_test.dart              |   3 +-
 test/parameter_meta_test.dart      |   3 +-
 test/precontained_test.dart        |   3 +-
 test/primitives_test.dart          |   3 +-
 test/repeat_request_test.dart      |   3 +-
 test/routing_test.dart             |   7 +-
 test/serialize_test.dart           |   3 +-
 test/server_test.dart              |  23 +-
 test/services_test.dart            |   3 +-
 test/streaming_test.dart           |   3 +-
 test/view_generator_test.dart      |   3 +-
 31 files changed, 592 insertions(+), 530 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 3cbc4924..568c7bb1 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,7 +5,14 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="angel_container">
+          <value>
+            <list>
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib" />
             </list>
           </value>
         </entry>
@@ -16,17 +23,10 @@
             </list>
           </value>
         </entry>
-        <entry key="angel_jael">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.2/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="angel_model">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0+1/lib" />
             </list>
           </value>
         </entry>
@@ -40,28 +40,28 @@
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.5.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="async">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="body_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="boolean_selector">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib" />
             </list>
           </value>
         </entry>
@@ -82,7 +82,7 @@
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
             </list>
           </value>
         </entry>
@@ -93,66 +93,59 @@
             </list>
           </value>
         </entry>
-        <entry key="container">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="convert">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="dart2_constant">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.2+dart2/lib" />
             </list>
           </value>
         </entry>
         <entry key="file">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-2.3.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-5.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="front_end">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+3/lib" />
             </list>
           </value>
         </entry>
@@ -173,7 +166,7 @@
         <entry key="http_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib" />
             </list>
           </value>
         </entry>
@@ -187,35 +180,21 @@
         <entry key="intl">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="io">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="jael">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.6+1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="jael_preprocessor">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="js">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib" />
             </list>
           </value>
         </entry>
@@ -229,49 +208,49 @@
         <entry key="json_rpc_2">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.9/lib" />
             </list>
           </value>
         </entry>
         <entry key="kernel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="logging">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="merge_map">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+2/lib" />
             </list>
           </value>
         </entry>
@@ -285,286 +264,267 @@
         <entry key="multi_server_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="node_preamble">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_config">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_resolver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="plugin">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="pub_semver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.2/lib" />
             </list>
           </value>
         </entry>
-        <entry key="quiver_hashcode">
+        <entry key="quiver">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="random_string">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.0+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_packages_handler">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+4/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_map_stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.6/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_span">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.7+1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="string_scanner">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="symbol_table">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/symbol_table-1.0.4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="term_glyph">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.42/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-1.3.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="tuple">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="typed_data">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="utf">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+5/lib" />
             </list>
           </value>
         </entry>
         <entry key="vm_service_client">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.4+3/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+9/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+10/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.8/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.14/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.15/lib" />
             </list>
           </value>
         </entry>
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_jael-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.5.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_buffer-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.10/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/combinator-1.0.0+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/container-0.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.1+dart2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-2.3.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/convert-2.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart2_constant-1.0.2+dart2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/file-5.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+17/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_server-0.9.8/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael-1.0.6+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/jael_preprocessor-1.0.0+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.8/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.9/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/merge_map-1.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+2/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver_hashcode-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/random_string-0.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.7+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/symbol_table-1.0.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-0.12.42/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.4+3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+9/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.8/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.14/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.3.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.0+1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/test-1.3.0/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.2/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.6/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+10/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.15/lib" />
     </CLASSES>
     <JAVADOC />
     <LIBRARY_FILE />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 37317968..d3b6f07a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,37 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/handle_error.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/templating.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/templating.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/view.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/angel_base.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/angel_base.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/extension_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/extension_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/view_generator_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,101 +55,95 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="14" column="56" selection-start-line="14" selection-start-column="56" selection-end-line="14" selection-end-column="56" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4432">
-              <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2112">
-              <caret line="135" column="48" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pubspec.yaml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="384">
-              <caret line="24" column="14" selection-start-line="24" selection-start-column="14" selection-end-line="24" selection-end-column="14" />
+            <state relative-caret-position="245">
+              <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1424">
-              <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
+            <state relative-caret-position="208">
+              <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="32">
-                <caret line="2" column="77" selection-start-line="2" selection-start-column="77" selection-end-line="2" selection-end-column="77" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
-              <caret line="37" column="18" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="18" />
+            <state relative-caret-position="336">
+              <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="find_one_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="256">
-              <caret line="18" column="52" selection-start-line="18" selection-start-column="52" selection-end-line="18" selection-end-column="52" />
+            <state relative-caret-position="202">
+              <caret line="106" column="61" selection-start-line="106" selection-start-column="61" selection-end-line="106" selection-end-column="61" />
               <folding>
-                <element signature="e#0#54#0" expanded="true" />
+                <element signature="e#48#68#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="anonymous_service_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
+      <file leaf-file-name="general_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/general_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="512">
-              <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
+            <state relative-caret-position="144">
+              <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/templating.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
               <folding>
-                <element signature="e#0#54#0" expanded="true" />
+                <element signature="e#0#17#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1360">
-              <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
+            <state relative-caret-position="64">
+              <caret line="4" column="42" lean-forward="true" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
+              <folding>
+                <element signature="e#0#46#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="view.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/view.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="9" column="31" lean-forward="true" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
+              <folding>
+                <element signature="e#0#46#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="224">
+              <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -137,9 +160,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>(req, res)</find>
-      <find>headers: headers,</find>
-      <find>_</find>
       <find>ContentType.HTML.mimeType</find>
       <find>ContentType.JSON.mimeType</find>
       <find>parameters</find>
@@ -167,9 +187,11 @@
       <find>==</find>
       <find>as Map&lt;String, dynamic&gt;</find>
       <find>result as Map&lt;String, dynamic&gt;</find>
+      <find>random_strin</find>
+      <find>Angel()</find>
+      <find>change</find>
     </findStrings>
     <replaceStrings>
-      <replace>JSON.decode</replace>
       <replace>query</replace>
       <replace>cookie</replace>
       <replace>req.path</replace>
@@ -199,6 +221,7 @@
       <replace>IsInstanceOf</replace>
       <replace>[Iterable]</replace>
       <replace>_foldStringDynamic(result)</replace>
+      <replace>Angel(MirrorsReflector())</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -206,9 +229,9 @@
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
       <dir>$PROJECT_DIR$/lib/src/core</dir>
-      <dir>$PROJECT_DIR$</dir>
       <dir>$PROJECT_DIR$/lib</dir>
       <dir>$PROJECT_DIR$/test</dir>
+      <dir>$PROJECT_DIR$</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -222,37 +245,16 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/http.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/raw.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
-        <option value="$PROJECT_DIR$/.travis.yml" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
-        <option value="$PROJECT_DIR$/example/async.dart" />
-        <option value="$PROJECT_DIR$/example/view.dart" />
-        <option value="$PROJECT_DIR$/example/handle_error.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/example/templating.dart" />
-        <option value="$PROJECT_DIR$/example/views/index.jl" />
-        <option value="$PROJECT_DIR$/analysis_options.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
-        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
@@ -260,19 +262,40 @@
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/example/handle_error.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/example/view.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
+        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
+        <option value="$PROJECT_DIR$/test/extension_test.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/test/accepts_test.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/test/general_test.dart" />
+        <option value="$PROJECT_DIR$/example/templating.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
       </list>
     </option>
   </component>
@@ -300,6 +323,8 @@
     </navigator>
     <panes>
       <pane id="AndroidView" />
+      <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -351,8 +376,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -397,7 +420,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.tests in find_one_test.dart">
+  <component name="RunManager" selected="Dart Command Line App.handle_error.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -690,20 +713,8 @@
       <workItem from="1531407760497" duration="1958000" />
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
-    </task>
-    <task id="LOCAL-00059" summary="Deprecated `ServerGenerator`">
-      <created>1517977060369</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1517977060369</updated>
-    </task>
-    <task id="LOCAL-00060" summary="Updated tests to use `AngelHttp` API">
-      <created>1517978048042</created>
-      <option name="number" value="00060" />
-      <option name="presentableId" value="LOCAL-00060" />
-      <option name="project" value="LOCAL" />
-      <updated>1517978048043</updated>
+      <workItem from="1534546784803" duration="353000" />
+      <workItem from="1534547885788" duration="1330000" />
     </task>
     <task id="LOCAL-00061" summary="Added example/main.dart">
       <created>1517978306602</created>
@@ -1034,13 +1045,24 @@
       <option name="project" value="LOCAL" />
       <updated>1533353912001</updated>
     </task>
-    <option name="localTasksCounter" value="108" />
+    <task id="LOCAL-00108" summary="Removed random_string dependency">
+      <created>1534547008912</created>
+      <option name="number" value="00108" />
+      <option name="presentableId" value="LOCAL-00108" />
+      <option name="project" value="LOCAL" />
+      <updated>1534547008913</updated>
+    </task>
+    <task id="LOCAL-00109" summary="Removed random_string dependency">
+      <created>1534547132671</created>
+      <option name="number" value="00109" />
+      <option name="presentableId" value="LOCAL-00109" />
+      <option name="project" value="LOCAL" />
+      <updated>1534547132671</updated>
+    </task>
+    <option name="localTasksCounter" value="110" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.07.09 at 11h 06m 02s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.07.09 at 11h 06m 50s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1068,9 +1090,12 @@
     <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 18m 30s.xml">
       <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="tests_in_find_one_test_dart - 2018.08.19 at 11h 22m 50s.xml">
+      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="161946000" />
+    <option name="totallyTimeSpent" value="163629000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1082,7 +1107,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="141" y="23" width="1403" height="784" extended-state="0" />
+    <frame x="37" y="23" width="1403" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1101,28 +1126,28 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2755327" />
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Data View" order="4" />
       <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" id="Data View" order="4" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1133,7 +1158,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Fixed all broken tests" />
     <MESSAGE value="1.1.3" />
     <MESSAGE value="Test against Dart 1.x" />
     <MESSAGE value="1.1.4+1" />
@@ -1158,7 +1182,8 @@
     <MESSAGE value="Added `Service.findOne` tests" />
     <MESSAGE value="Bump version -&gt; 1.1.5" />
     <MESSAGE value="Patched another cast bug" />
-    <option name="LAST_COMMIT_MESSAGE" value="Patched another cast bug" />
+    <MESSAGE value="Removed random_string dependency" />
+    <option name="LAST_COMMIT_MESSAGE" value="Removed random_string dependency" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1166,128 +1191,7 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/example/templating.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tool/travis.sh">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+1/lib/src/validation.dart" />
-    <entry file="file://$PROJECT_DIR$/analysis_options.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="25" selection-start-line="2" selection-start-column="25" selection-end-line="2" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="47" column="57" selection-start-line="47" selection-start-column="57" selection-end-line="47" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="130">
-          <caret line="33" column="69" selection-start-line="33" selection-start-column="69" selection-end-line="33" selection-end-column="69" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="22" column="66" selection-start-line="22" selection-start-column="66" selection-end-line="22" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/stats.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="20" column="68" selection-start-line="20" selection-start-column="68" selection-end-line="20" selection-end-column="68" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="145" column="66" selection-start-line="145" selection-start-column="66" selection-end-line="145" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="20" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="63" column="49" selection-start-line="63" selection-start-column="49" selection-end-line="63" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="20" selection-start-column="20" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1488">
-          <caret line="97" column="49" selection-start-line="97" selection-start-column="49" selection-end-line="97" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="17" column="71" selection-start-line="17" selection-start-column="71" selection-end-line="17" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="17" column="27" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="58">
@@ -1337,20 +1241,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/io/platform.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="284">
@@ -1358,34 +1248,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="22" column="12" selection-start-line="22" selection-start-column="12" selection-end-line="22" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="784">
-          <caret line="56" column="29" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4752">
-          <caret line="307" column="10" selection-start-line="307" selection-start-column="10" selection-end-line="307" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1360">
@@ -1445,7 +1307,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
+        <state relative-caret-position="288">
           <caret line="18" column="52" selection-start-line="18" selection-start-column="52" selection-end-line="18" selection-end-column="52" />
           <folding>
             <element signature="e#0#54#0" expanded="true" />
@@ -1455,7 +1317,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="512">
+        <state relative-caret-position="528">
           <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
           <folding>
             <element signature="e#0#54#0" expanded="true" />
@@ -1472,25 +1334,247 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1424">
+        <state relative-caret-position="400">
           <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="209">
+          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="149">
+          <caret line="517" column="31" selection-start-line="517" selection-start-column="31" selection-end-line="517" selection-end-column="31" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="81">
+          <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="12" column="20" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="14" column="40" lean-forward="true" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="417">
+          <caret line="88" column="34" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="289">
+          <caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/templating.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="42" lean-forward="true" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="9" column="31" lean-forward="true" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="245">
+          <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="32">
-            <caret line="2" column="77" selection-start-line="2" selection-start-column="77" selection-end-line="2" selection-end-column="77" />
+          <first_editor relative-caret-position="80">
+            <caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="384">
-          <caret line="24" column="14" selection-start-line="24" selection-start-column="14" selection-end-line="24" selection-end-column="14" />
+        <state relative-caret-position="336">
+          <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="235">
+          <caret line="75" column="7" lean-forward="true" selection-start-line="75" selection-start-column="7" selection-end-line="75" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="202">
+          <caret line="106" column="61" selection-start-line="106" selection-start-column="61" selection-end-line="106" selection-end-column="61" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3d8842f..aa3ccbfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
-# 1.1.5+2
+# 2.0.0-alpha
 * Removed `random_string` dependency.
+* Moved reflection to `package:angel_container`.
+* Upgraded `package:file` to `5.0.0`.
+* `ResponseContext.sendFile` now uses `package:file`.
+* Abandon `ContentType` in favor of `MediaType`.
 
 # 1.1.5+1
 * Patched annoying error that prevented MapServices from working,
diff --git a/README.md b/README.md
index d8276fba..95d45434 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ To build real-world applications, please see the [homepage](https://angel-dart.g
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel();
+  var app = new Angel(MirrorsReflector());
 
   // Index route. Returns JSON.
   app.get('/', () => 'Welcome to Angel!');
diff --git a/example/handle_error.dart b/example/handle_error.dart
index 5b5b2d50..f8a4c9a3 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:logging/logging.dart';
 
 main() async {
-  var app = new Angel()
+  var app = new Angel(MirrorsReflector())
     ..lazyParseBodies = true
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
diff --git a/example/json.dart b/example/json.dart
index 27426ba9..ce7e762a 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:isolate';
 import 'package:dart2_constant/convert.dart';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
@@ -28,7 +29,7 @@ main() async {
 }
 
 serverMain(_) async {
-  var app = new Angel();
+  var app = new Angel(MirrorsReflector());
   var http = new AngelHttp.custom(app, startShared); // Run a cluster
 
   app.get('/', {
diff --git a/example/main.dart b/example/main.dart
index 1b5cca7f..9602570c 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -1,7 +1,8 @@
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel();
+  var app = new Angel(MirrorsReflector());
 
   // Index route. Returns JSON.
   app.get('/', () => 'Welcome to Angel!');
diff --git a/example/templating.dart b/example/templating.dart
index 728d65b1..a55ea0d5 100644
--- a/example/templating.dart
+++ b/example/templating.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_jael/angel_jael.dart';
 import 'package:file/local.dart';
@@ -6,7 +7,7 @@ import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 
 main() async {
-  var app = new Angel()
+  var app = new Angel(MirrorsReflector())
     ..lazyParseBodies = true
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
diff --git a/example/view.dart b/example/view.dart
index 72cd14f9..dec27de8 100644
--- a/example/view.dart
+++ b/example/view.dart
@@ -1,7 +1,8 @@
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel();
+  var app = new Angel(MirrorsReflector());
 
   app.viewGenerator = (name, [data]) async =>
       'View generator invoked with name $name and data: $data';
diff --git a/lib/src/core/angel_base.dart b/lib/src/core/angel_base.dart
index bf055630..0d1f1745 100644
--- a/lib/src/core/angel_base.dart
+++ b/lib/src/core/angel_base.dart
@@ -1,7 +1,7 @@
 library angel_framework.http.angel_base;
 
 import 'dart:async';
-import 'package:container/container.dart';
+import 'package:angel_container/angel_container.dart';
 import 'routable.dart';
 
 /// A function that asynchronously generates a view from the given path and data.
@@ -12,7 +12,11 @@ class AngelBase extends Routable {
   static ViewGenerator noViewEngineConfigured = (String view, [Map data]) =>
       new Future<String>.value("No view engine has been configured yet.");
 
-  Container _container = new Container();
+  Container _container;
+
+  AngelBase(Reflector reflector) {
+    _container = new Container(reflector);
+  }
 
   final Map configuration = {};
 
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 19132f7a..7d94424c 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -2,9 +2,11 @@ library angel_framework.http.response_context;
 
 import 'dart:async';
 import 'dart:convert' show Converter, Encoding;
-import 'dart:io';
-import 'package:dart2_constant/convert.dart';
+import 'dart:io' show BytesBuilder, HttpResponse;
 import 'package:angel_route/angel_route.dart';
+import 'package:dart2_constant/convert.dart';
+import 'package:file/file.dart';
+import 'package:http_parser/http_parser.dart';
 import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
 import 'package:pool/pool.dart';
@@ -102,26 +104,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// The underlying [HttpResponse] under this instance.
   HttpResponse get io;
 
-  /// Gets the Content-Type header.
-  ContentType get contentType {
-    if (!headers.containsKey('content-type')) return null;
-
-    var header = headers['content-type'];
-    var match = _contentType.firstMatch(header);
-
-    if (match == null)
-      throw new Exception('Malformed Content-Type response header: "$header".');
-
-    if (match[4]?.isNotEmpty != true)
-      return new ContentType(match[1], match[2]);
-    else
-      return new ContentType(match[1], match[2], charset: match[4]);
-  }
-
-  /// Sets the Content-Type header.
-  void set contentType(ContentType contentType) {
-    headers['content-type'] = contentType.toString();
-  }
+  /// Gets or sets the content type to send back to a client.
+  MediaType contentType = new MediaType('text', 'plain');
 
   /// Set this to true if you will manually close the response.
   ///
@@ -187,7 +171,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   void json(value) => serialize(value, contentType: 'application/json');
 
   /// Returns a JSONP response.
-  void jsonp(value, {String callbackName: "callback", contentType}) {
+  void jsonp(value, {String callbackName: "callback", MediaType contentType}) {
     if (!isOpen) throw closed();
     write("$callbackName(${serializer(value)})");
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 063d4f8c..a143d8f6 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -4,10 +4,11 @@ import 'dart:async';
 import 'dart:collection' show HashMap;
 import 'dart:convert';
 import 'dart:io';
+import 'package:angel_container/angel_container.dart';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
-export 'package:container/container.dart';
 import 'package:logging/logging.dart';
 import 'package:tuple/tuple.dart';
 import '../http/http.dart';
@@ -482,7 +483,7 @@ class Angel extends AngelBase {
   }
 
   /// Default constructor. ;)
-  Angel() : super() {
+  Angel(Reflector reflector) : super(reflector) {
     bootstrapContainer();
     // ignore: deprecated_member_use
     createZoneForRequest = defaultZoneCreator;
@@ -507,14 +508,14 @@ class Angel extends AngelBase {
   @deprecated
   factory Angel.custom(
       Future<HttpServer> Function(dynamic, int) serverGenerator) {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     return app.._http = new AngelHttp.custom(app, serverGenerator);
   }
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
   factory Angel.fromSecurityContext(SecurityContext context) {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
 
     app._http = new AngelHttp.custom(app, (address, int port) {
       return HttpServer.bindSecure(address, port, context);
@@ -527,7 +528,7 @@ class Angel extends AngelBase {
   @deprecated
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
       {String password}) {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     return app
       .._http = new AngelHttp.secure(app, certificateChainPath, serverKeyPath,
           password: password);
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 73b69b35..3400e8b7 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -4,6 +4,7 @@ library performance.hello;
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
@@ -22,7 +23,7 @@ main() async {
 }
 
 void start(int id) {
-  var app = new Angel()..lazyParseBodies = true;
+  var app = new Angel(MirrorsReflector())..lazyParseBodies = true;
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
   app.get('/', (ResponseContext res) => res.write('Hello, world!'));
diff --git a/pubspec.yaml b/pubspec.yaml
index 09ebd2b2..b4731d0c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,18 +1,18 @@
 name: angel_framework
-version: 1.1.5+2
+version: 2.0.0-alpha
 description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
   sdk: ">=1.8.0 <3.0.0"
 dependencies:
+  angel_container: ^1.0.0-alpha
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0
   angel_route: ^2.0.0
   body_parser: ^1.0.0-dev
   charcode: ^1.0.0
   combinator: ">=1.0.0-beta <2.0.0"
-  container: ^0.1.2
   dart2_constant: ^1.0.0
   http_parser: ^3.0.0
   json_god: ^2.0.0-beta
@@ -26,9 +26,11 @@ dependencies:
   stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
-  angel_jael: ^1.0.0
-  file: ^2.0.0
+  #angel_jael: ^1.0.0
+  file: ^5.0.0
   http: ^0.11.3
   io: ^0.3.0
   mock_request: ^1.0.0
-  test: ^0.12.13
+  test: ^1.0.0
+dependency_overrides:
+  file: ^5.0.0
\ No newline at end of file
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index 2fe4e6bc..caa6a2eb 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -60,7 +61,7 @@ Future<RequestContext> acceptContentTypes(
   var rq = new MockHttpRequest('GET', ENDPOINT);
   rq.headers.set('accept', headerString);
   rq.close();
-  var app = new Angel();
+  var app = new Angel(MirrorsReflector());
   var http = new AngelHttp(app);
   return http.createRequestContext(rq);
 }
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 12ff29d6..e90c4167 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
@@ -42,7 +43,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel();
+    app = new Angel(MirrorsReflector());
     app.requestMiddleware["foo"] = (req, res) async {
       res.write("Hello, ");
       return true;
@@ -76,7 +77,7 @@ main() {
 
   test('require expose', () async {
     try {
-      var app = new Angel();
+      var app = new Angel(MirrorsReflector());
       await app.configure(new NoExposeController().configureServer);
       throw 'Should require @Expose';
     } on Exception {
@@ -85,7 +86,7 @@ main() {
   });
 
   test('create dynamic handler', () async {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     app.get(
         '/foo',
         createDynamicHandler(({String bar}) {
@@ -98,7 +99,7 @@ main() {
   });
 
   test('optional name', () async {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     await app.configure(new NamedController().configureServer);
     expect(app.controllers['foo'], const IsInstanceOf<NamedController>());
   });
diff --git a/test/di_test.dart b/test/di_test.dart
index db9db0c9..5138ac60 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
@@ -15,7 +16,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel();
+    app = new Angel(MirrorsReflector());
     client = new http.Client();
 
     // Inject some todos
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 3a76eef7..1d52708e 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io' show BytesBuilder;
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:dart2_constant/io.dart';
@@ -17,7 +18,7 @@ main() {
   Angel app;
 
   setUp(() {
-    app = new Angel();
+    app = new Angel(MirrorsReflector());
     app.injectEncoders(
       {
         'deflate': zlib.encoder,
diff --git a/test/extension_test.dart b/test/extension_test.dart
index 34a5f37f..f585e060 100644
--- a/test/extension_test.dart
+++ b/test/extension_test.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -24,7 +25,7 @@ main() {
 
 Future<RequestContext> makeRequest(String path) {
   var rq = new MockHttpRequest('GET', ENDPOINT.replace(path: path))..close();
-  var app = new Angel();
+  var app = new Angel(MirrorsReflector());
   var http = new AngelHttp(app);
   return http.createRequestContext(rq);
 }
diff --git a/test/general_test.dart b/test/general_test.dart
index 36550b70..c04e9c31 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
@@ -11,7 +12,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel()
+    app = new Angel(MirrorsReflector())
       ..post('/foo', () => {'hello': 'world'})
       ..all('*', () => throw new AngelHttpException.notFound());
     client = new http.Client();
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 509dcd41..fb8ebacd 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:json_god/json_god.dart' as god;
@@ -18,7 +19,7 @@ main() {
   HookedService Todos;
 
   setUp(() async {
-    app = new Angel();
+    app = new Angel(MirrorsReflector());
     client = new http.Client();
     app.use('/todos', new TypedService<Todo>(new MapService()));
     app.use('/books', new BookService());
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index c1460a33..c5d113f5 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
@@ -27,7 +28,7 @@ parameterMetaTests() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel()..lazyParseBodies = true;
+    app = new Angel(MirrorsReflector())..lazyParseBodies = true;
     http = new AngelHttp(app);
 
     app.get('/cookie', (@CookieValue('token') String jwt) {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 64a67096..299b4042 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -1,3 +1,4 @@
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
@@ -5,7 +6,7 @@ import 'package:test/test.dart';
 
 main() {
   test('preinjects functions', () async {
-    var app = new Angel()
+    var app = new Angel(MirrorsReflector())
       ..configuration['foo'] = 'bar'
       ..get('/foo', echoAppFoo);
     app.optimizeForProduction(force: true);
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 289eb533..c5988f55 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -1,4 +1,5 @@
 import 'dart:io' show stderr;
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
@@ -9,7 +10,7 @@ main() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel()..inject('global', 305); // Pitbull!
+    app = new Angel(MirrorsReflector())..inject('global', 305); // Pitbull!
     http = new AngelHttp(app);
 
     app.get('/string/:string', (String string) => string);
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index 294066b4..ca7bc3bd 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
@@ -10,7 +11,7 @@ main() {
   }
 
   test('can request the same url twice', () async {
-    var app = new Angel()..get('/test/:id', (id) => 'Hello $id');
+    var app = new Angel(MirrorsReflector())..get('/test/:id', (id) => 'Hello $id');
     var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
     await Future.wait([rq1, rq2, rq3].map(new AngelHttp(app).handleRequest));
     var body1 = await rq1.response.transform(utf8.decoder).join(),
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 039ce799..cb624317 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
@@ -27,9 +28,9 @@ main() {
   http.Client client;
 
   setUp(() async {
-    app = new Angel();
-    nested = new Angel();
-    todos = new Angel();
+    app = new Angel(MirrorsReflector());
+    nested = new Angel(MirrorsReflector());
+    todos = new Angel(MirrorsReflector());
 
     // Lazy-parse in production
     [app, nested, todos].forEach((Angel app) {
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index 24929afb..2e027d30 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
@@ -10,7 +11,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel()
+    app = new Angel(MirrorsReflector())
       ..get('/foo', () => {'hello': 'world'})
       ..get(
           '/bar',
diff --git a/test/server_test.dart b/test/server_test.dart
index 7c450f81..8c1ca114 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:matcher/matcher.dart';
@@ -11,8 +12,8 @@ final Uri $foo = Uri.parse('http://localhost:3000/foo');
 /// Additional tests to improve coverage of server.dart
 main() {
   group('scoping', () {
-    var parent = new Angel()..configuration['two'] = 2;
-    var child = new Angel();
+    var parent = new Angel(MirrorsReflector())..configuration['two'] = 2;
+    var child = new Angel(MirrorsReflector());
     parent.use('/child', child);
 
     test('sets children', () {
@@ -29,13 +30,13 @@ main() {
   });
 
   test('custom server generator', () {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     var http = new AngelHttp.custom(app, HttpServer.bind);
     expect(http.serverGenerator, HttpServer.bind);
   });
 
   test('default error handler', () async {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     var http = new AngelHttp(app);
     var rq = new MockHttpRequest('GET', $foo);
     rq.close();
@@ -58,7 +59,7 @@ main() {
   });
 
   test('plug-ins run on startup', () async {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     app.startupHooks.add((app) => app.configuration['two'] = 2);
 
     var http = new AngelHttp(app);
@@ -69,14 +70,14 @@ main() {
   });
 
   test('warning when adding routes to flattened router', () {
-    var app = new Angel()..optimizeForProduction(force: true);
+    var app = new Angel(MirrorsReflector())..optimizeForProduction(force: true);
     app.dumpTree();
     app.get('/', () => 2);
     app.mount('/foo', new Router()..get('/', 3));
   });
 
   test('services close on close call', () async {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     var svc = new CustomCloseService();
     expect(svc.value, 2);
     app.use('/', svc);
@@ -85,7 +86,7 @@ main() {
   });
 
   test('global injection added to injection map', () async {
-    var app = new Angel()..inject('a', 'b');
+    var app = new Angel(MirrorsReflector())..inject('a', 'b');
     var http = new AngelHttp(app);
     app.get('/', (String a) => a);
     var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
@@ -95,7 +96,7 @@ main() {
   });
 
   test('global injected serializer', () async {
-    var app = new Angel()..serializer = (_) => 'x';
+    var app = new Angel(MirrorsReflector())..serializer = (_) => 'x';
     var http = new AngelHttp(app);
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
     var rq = new MockHttpRequest('GET', $foo)..close();
@@ -105,7 +106,7 @@ main() {
   });
 
   group('handler results', () {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     var http = new AngelHttp(app);
     app.responseFinalizers
         .add((req, res) => throw new AngelHttpException.forbidden());
@@ -151,7 +152,7 @@ main() {
     AngelHttp http;
 
     setUp(() async {
-      app = new Angel();
+      app = new Angel(MirrorsReflector());
       app.get('/wtf', () => throw new AngelHttpException.forbidden());
       app.get('/wtf2', () => throw new AngelHttpException.forbidden());
       http = new AngelHttp(app);
diff --git a/test/services_test.dart b/test/services_test.dart
index 9f09f523..3a5cdd99 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,3 +1,4 @@
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
@@ -20,7 +21,7 @@ main() {
   http.Client client;
 
   setUp(() async {
-    app = new Angel()
+    app = new Angel(MirrorsReflector())
       ..use('/todos', new TypedService<Todo>(new MapService()))
       ..errorHandler = (e, req, res) {
         print('Whoops: ${e.error}');
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index f6b86091..1b65e9be 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io' show stderr;
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:dart2_constant/io.dart';
@@ -13,7 +14,7 @@ main() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel();
+    app = new Angel(MirrorsReflector());
     http = new AngelHttp(app);
 
     app.logger = new Logger('streaming_test')
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
index 177fb63f..a886edb6 100644
--- a/test/view_generator_test.dart
+++ b/test/view_generator_test.dart
@@ -1,9 +1,10 @@
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:test/test.dart';
 
 main() {
   test('default view generator', () async {
-    var app = new Angel();
+    var app = new Angel(MirrorsReflector());
     var view = await app.viewGenerator('foo', {'bar': 'baz'});
     expect(view, contains('No view engine'));
   });

From 696fb8dd81ba8511565d991bc0196984c5e51010 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 11:40:49 -0400
Subject: [PATCH 232/414] Change signature of ResponseContext.jsonp

---
 lib/src/core/response_context.dart | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 7d94424c..c4a6ed83 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -171,18 +171,12 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   void json(value) => serialize(value, contentType: 'application/json');
 
   /// Returns a JSONP response.
+  ///
+  /// You can override the [contentType] sent; by default it is `application/javascript`.
   void jsonp(value, {String callbackName: "callback", MediaType contentType}) {
     if (!isOpen) throw closed();
     write("$callbackName(${serializer(value)})");
-
-    if (contentType != null) {
-      if (contentType is ContentType)
-        this.contentType = contentType;
-      else
-        headers['content-type'] = contentType.toString();
-    } else
-      headers['content-type'] = 'application/javascript';
-
+    this.contentType = contentType ?? new MediaType('application', 'javascript');
     end();
   }
 

From b326e6c5475536c408f6a3f035d7fa908c435670 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 11:42:40 -0400
Subject: [PATCH 233/414] Changed view engine to use `Map<String, dynamic>`

---
 CHANGELOG.md                       | 1 +
 lib/src/core/angel_base.dart       | 9 ++++++---
 lib/src/core/response_context.dart | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa3ccbfc..dfdc50e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Upgraded `package:file` to `5.0.0`.
 * `ResponseContext.sendFile` now uses `package:file`.
 * Abandon `ContentType` in favor of `MediaType`.
+* Changed view engine to use `Map<String, dynamic>`.
 
 # 1.1.5+1
 * Patched annoying error that prevented MapServices from working,
diff --git a/lib/src/core/angel_base.dart b/lib/src/core/angel_base.dart
index 0d1f1745..a1d0cc37 100644
--- a/lib/src/core/angel_base.dart
+++ b/lib/src/core/angel_base.dart
@@ -1,16 +1,19 @@
 library angel_framework.http.angel_base;
 
 import 'dart:async';
+
 import 'package:angel_container/angel_container.dart';
+
 import 'routable.dart';
 
 /// A function that asynchronously generates a view from the given path and data.
-typedef Future<String> ViewGenerator(String path, [Map data]);
+typedef FutureOr<String> ViewGenerator(String path,
+    [Map<String, dynamic> data]);
 
 /// Base class for Angel servers. Do not bother extending this.
 class AngelBase extends Routable {
-  static ViewGenerator noViewEngineConfigured = (String view, [Map data]) =>
-      new Future<String>.value("No view engine has been configured yet.");
+  static ViewGenerator noViewEngineConfigured =
+      (String view, [Map data]) => 'No view engine has been configured yet.';
 
   Container _container;
 
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index c4a6ed83..547fd51b 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -51,7 +51,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// A [Map] of data to inject when `res.render` is called.
   ///
   /// This can be used to reduce boilerplate when using templating engines.
-  final Map renderParams = {};
+  final Map<String, dynamic> renderParams = {};
 
   /// Points to the [RequestContext] corresponding to this response.
   RequestContext get correspondingRequest;
@@ -181,10 +181,10 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Renders a view to the response stream, and closes the response.
-  Future render(String view, [Map data]) {
+  Future render(String view, [Map<String, dynamic> data]) {
     if (!isOpen) throw closed();
     return app
-        .viewGenerator(view, new Map.from(renderParams)..addAll(data ?? {}))
+        .viewGenerator(view, new Map<String, dynamic>.from(renderParams)..addAll(data ?? <String, dynamic>{}))
         .then((content) {
       write(content);
       headers['content-type'] = 'text/html';

From 45c3206ff673cc40ab630155a2e275e4b2cfc697 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 11:49:33 -0400
Subject: [PATCH 234/414] Strip out json god

---
 .idea/libraries/Dart_Packages.xml  |   8 -
 .idea/workspace.xml                | 435 ++++++++++++++---------------
 CHANGELOG.md                       |   2 +
 lib/hooks.dart                     |   4 +-
 lib/src/core/response_context.dart |  17 +-
 lib/src/core/server.dart           |   2 +-
 lib/src/core/typed_service.dart    |   3 +-
 lib/src/http/angel_http.dart       |   3 +-
 pubspec.yaml                       |   1 -
 test/hooked_test.dart              |   3 +-
 test/services_test.dart            |  15 +-
 11 files changed, 237 insertions(+), 256 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 568c7bb1..37425f8a 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -198,13 +198,6 @@
             </list>
           </value>
         </entry>
-        <entry key="json_god">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+3/lib" />
-            </list>
-          </value>
-        </entry>
         <entry key="json_rpc_2">
           <value>
             <list>
@@ -488,7 +481,6 @@
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/intl-0.15.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/io-0.3.3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_god-2.0.0-beta+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.9/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.4/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d3b6f07a..ee6bcc52 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,34 +5,14 @@
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/handle_error.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/templating.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/templating.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/view.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/angel_base.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/angel_base.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/extension_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/extension_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/view_generator_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -55,15 +35,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="245">
-              <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -73,6 +44,66 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-5320">
+              <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="48">
+              <caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1376">
+              <caret line="86" column="27" selection-start-line="86" selection-start-column="27" selection-end-line="86" selection-end-column="27" />
+              <folding>
+                <element signature="e#0#46#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="typed_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="16">
+              <caret line="1" column="22" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/templating.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="240">
+              <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+              <folding>
+                <element signature="e#0#17#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="64">
+              <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -82,72 +113,27 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="106" column="61" selection-start-line="106" selection-start-column="61" selection-end-line="106" selection-end-column="61" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="general_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/general_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="144">
-              <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+              <caret line="9" column="46" selection-start-line="9" selection-start-column="46" selection-end-line="9" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/templating.dart">
+      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+            <state relative-caret-position="145">
+              <caret line="23" column="11" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="11" />
               <folding>
-                <element signature="e#0#17#0" expanded="true" />
+                <element signature="e#42#62#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="4" column="42" lean-forward="true" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="view.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/view.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="9" column="31" lean-forward="true" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="224">
-              <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -160,8 +146,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>ContentType.HTML.mimeType</find>
-      <find>ContentType.JSON.mimeType</find>
       <find>parameters</find>
       <find>cannot re</find>
       <find>cookie</find>
@@ -190,10 +174,10 @@
       <find>random_strin</find>
       <find>Angel()</find>
       <find>change</find>
+      <find>render</find>
+      <find>god.serialize</find>
     </findStrings>
     <replaceStrings>
-      <replace>query</replace>
-      <replace>cookie</replace>
       <replace>req.path</replace>
       <replace>req.path`</replace>
       <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
@@ -222,6 +206,8 @@
       <replace>[Iterable]</replace>
       <replace>_foldStringDynamic(result)</replace>
       <replace>Angel(MirrorsReflector())</replace>
+      <replace>json.decode</replace>
+      <replace>json.encode</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -246,11 +232,9 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
@@ -262,27 +246,22 @@
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
@@ -294,8 +273,15 @@
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
       </list>
     </option>
   </component>
@@ -714,28 +700,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="1330000" />
-    </task>
-    <task id="LOCAL-00061" summary="Added example/main.dart">
-      <created>1517978306602</created>
-      <option name="number" value="00061" />
-      <option name="presentableId" value="LOCAL-00061" />
-      <option name="project" value="LOCAL" />
-      <updated>1517978306602</updated>
-    </task>
-    <task id="LOCAL-00062" summary="Create HttpRequestContextImpl">
-      <created>1517979545063</created>
-      <option name="number" value="00062" />
-      <option name="presentableId" value="LOCAL-00062" />
-      <option name="project" value="LOCAL" />
-      <updated>1517979545063</updated>
-    </task>
-    <task id="LOCAL-00063" summary="Change return type of `AngelHttp.createRequestContext`">
-      <created>1517979599468</created>
-      <option name="number" value="00063" />
-      <option name="presentableId" value="LOCAL-00063" />
-      <option name="project" value="LOCAL" />
-      <updated>1517979599468</updated>
+      <workItem from="1534547885788" duration="2287000" />
     </task>
     <task id="LOCAL-00064" summary="Deprecated `ResponseContext.io`, added HTTP equivalent">
       <created>1517980874143</created>
@@ -1059,7 +1024,28 @@
       <option name="project" value="LOCAL" />
       <updated>1534547132671</updated>
     </task>
-    <option name="localTasksCounter" value="110" />
+    <task id="LOCAL-00110" summary="Switch to MediaType">
+      <created>1534692805087</created>
+      <option name="number" value="00110" />
+      <option name="presentableId" value="LOCAL-00110" />
+      <option name="project" value="LOCAL" />
+      <updated>1534692805087</updated>
+    </task>
+    <task id="LOCAL-00111" summary="Change signature of ResponseContext.jsonp">
+      <created>1534693249779</created>
+      <option name="number" value="00111" />
+      <option name="presentableId" value="LOCAL-00111" />
+      <option name="project" value="LOCAL" />
+      <updated>1534693249779</updated>
+    </task>
+    <task id="LOCAL-00112" summary="Changed view engine to use `Map&lt;String, dynamic&gt;`">
+      <created>1534693360366</created>
+      <option name="number" value="00112" />
+      <option name="presentableId" value="LOCAL-00112" />
+      <option name="project" value="LOCAL" />
+      <updated>1534693360366</updated>
+    </task>
+    <option name="localTasksCounter" value="113" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1095,7 +1081,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="163629000" />
+    <option name="totallyTimeSpent" value="164586000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1115,7 +1101,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
+      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1133,7 +1119,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1158,10 +1144,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="1.1.3" />
-    <MESSAGE value="Test against Dart 1.x" />
-    <MESSAGE value="1.1.4+1" />
-    <MESSAGE value="1.1.4+2" />
     <MESSAGE value="Fix async bugs" />
     <MESSAGE value="Fix hooking bug" />
     <MESSAGE value="+5" />
@@ -1183,7 +1165,11 @@
     <MESSAGE value="Bump version -&gt; 1.1.5" />
     <MESSAGE value="Patched another cast bug" />
     <MESSAGE value="Removed random_string dependency" />
-    <option name="LAST_COMMIT_MESSAGE" value="Removed random_string dependency" />
+    <MESSAGE value="Switch to MediaType" />
+    <MESSAGE value="Begin 2.0.0-alpha" />
+    <MESSAGE value="Change signature of ResponseContext.jsonp" />
+    <MESSAGE value="Changed view engine to use `Map&lt;String, dynamic&gt;`" />
+    <option name="LAST_COMMIT_MESSAGE" value="Changed view engine to use `Map&lt;String, dynamic&gt;`" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1191,7 +1177,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="58">
@@ -1255,13 +1240,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2112">
-          <caret line="135" column="48" selection-start-line="135" selection-start-column="48" selection-end-line="135" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.65.0/libexec/lib/async/future.dart" />
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1284,13 +1262,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4432">
-          <caret line="297" column="23" selection-start-line="297" selection-start-column="23" selection-end-line="297" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="182">
@@ -1339,16 +1310,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="16">
@@ -1369,13 +1330,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="21" column="31" lean-forward="true" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="81">
@@ -1421,16 +1375,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1486,34 +1430,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/templating.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="64">
-          <caret line="4" column="42" lean-forward="true" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
+          <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
           <folding>
             <element signature="e#0#46#0" expanded="true" />
           </folding>
@@ -1523,7 +1443,7 @@
     <entry file="file://$PROJECT_DIR$/example/view.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
-          <caret line="9" column="31" lean-forward="true" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
+          <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
           <folding>
             <element signature="e#0#46#0" expanded="true" />
           </folding>
@@ -1533,31 +1453,7 @@
     <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="224">
-          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="80">
-            <caret line="5" column="48" selection-start-line="5" selection-start-column="48" selection-end-line="5" selection-end-column="48" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+          <caret line="18" column="1" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
         </state>
       </provider>
     </entry>
@@ -1568,16 +1464,109 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="15" column="42" selection-start-line="15" selection-start-column="42" selection-end-line="15" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="23" column="11" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="11" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="106" column="61" selection-start-line="106" selection-start-column="61" selection-end-line="106" selection-end-column="61" />
+        <state relative-caret-position="144">
+          <caret line="9" column="46" selection-start-line="9" selection-start-column="46" selection-end-line="9" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="293">
+          <caret line="20" column="14" lean-forward="true" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5320">
+          <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1376">
+          <caret line="86" column="27" selection-start-line="86" selection-start-column="27" selection-end-line="86" selection-end-column="27" />
           <folding>
-            <element signature="e#48#68#0" expanded="true" />
+            <element signature="e#0#46#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="128">
+            <caret line="8" column="48" selection-start-line="8" selection-start-column="48" selection-end-line="8" selection-end-column="48" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="1" column="22" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/templating.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfdc50e2..d9f25bb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * `ResponseContext.sendFile` now uses `package:file`.
 * Abandon `ContentType` in favor of `MediaType`.
 * Changed view engine to use `Map<String, dynamic>`.
+* Remove dependency on `package:json_god` by default.
+* Remove dependency on `package:dart2_constant`.
 
 # 1.1.5+1
 * Patched annoying error that prevented MapServices from working,
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 0b50dccd..b0d3f064 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -2,8 +2,8 @@
 library angel_framework.hooks;
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:mirrors';
-import 'package:json_god/json_god.dart' as god;
 import 'angel_framework.dart';
 
 /// Sequentially runs a set of [listeners].
@@ -36,7 +36,7 @@ AngelConfigurer hookAllServices(callback(Service service)) {
 ///
 /// The [condition] is optional, and is passed to [transform].
 HookedServiceEventListener toJson([condition]) =>
-    transform(god.serializeObject, condition);
+    transform(json.encode, condition);
 
 /// Mutates `e.data` or `e.result` using the given [transformer].
 ///
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 547fd51b..cfced7c3 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -3,16 +3,17 @@ library angel_framework.http.response_context;
 import 'dart:async';
 import 'dart:convert' show Converter, Encoding;
 import 'dart:io' show BytesBuilder, HttpResponse;
+
 import 'package:angel_route/angel_route.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:file/file.dart';
 import 'package:http_parser/http_parser.dart';
-import 'package:json_god/json_god.dart' as god;
 import 'package:mime/mime.dart';
 import 'package:pool/pool.dart';
+
 import '../http/http.dart';
-import 'server.dart' show Angel;
 import 'request_context.dart';
+import 'server.dart' show Angel;
 
 final RegExp _contentType =
     new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
@@ -80,7 +81,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// ```dart
   /// app.injectSerializer(JSON.encode);
   /// ```
-  String Function(dynamic) serializer = god.serialize;
+  String Function(dynamic) serializer = json.encode;
 
   /// This response's status code.
   int get statusCode => _statusCode;
@@ -176,16 +177,18 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   void jsonp(value, {String callbackName: "callback", MediaType contentType}) {
     if (!isOpen) throw closed();
     write("$callbackName(${serializer(value)})");
-    this.contentType = contentType ?? new MediaType('application', 'javascript');
+    this.contentType =
+        contentType ?? new MediaType('application', 'javascript');
     end();
   }
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map<String, dynamic> data]) {
     if (!isOpen) throw closed();
-    return app
-        .viewGenerator(view, new Map<String, dynamic>.from(renderParams)..addAll(data ?? <String, dynamic>{}))
-        .then((content) {
+    return Future<String>.sync(() => app.viewGenerator(
+        view,
+        new Map<String, dynamic>.from(renderParams)
+          ..addAll(data ?? <String, dynamic>{}))).then((content) {
       write(content);
       headers['content-type'] = 'text/html';
       end();
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index a143d8f6..a0df148f 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -212,7 +212,7 @@ class Angel extends AngelBase {
     handlerCache.clear();
     _injections.clear();
     encoders.clear();
-    //_serializer = god.serialize;
+    //_serializer = json.encode;
     _children.clear();
     _parent = null;
     logger = null;
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index aa9821c9..f3a5ba81 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:mirrors';
-import 'package:json_god/json_god.dart' as god;
 import '../../common.dart';
 import 'service.dart';
 
@@ -56,7 +55,7 @@ class TypedService<T> extends Service {
 
   serialize(x) {
     if (x is Model)
-      return god.serializeObject(x);
+      return json.encodeObject(x);
     else if (x is Map)
       return x;
     else if (x is Iterable)
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index d23cce48..e55bc041 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -12,7 +12,6 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:dart2_constant/io.dart';
-import 'package:json_god/json_god.dart' as god;
 import 'package:pool/pool.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:tuple/tuple.dart';
@@ -356,7 +355,7 @@ class AngelHttp {
           [RequestContext correspondingRequest]) =>
       new Future<ResponseContext>.value(new HttpResponseContextImpl(
           response, app, correspondingRequest as HttpRequestContextImpl)
-        ..serializer = (app.serializer ?? god.serialize)
+        ..serializer = (app.serializer ?? json.encode)
         ..encoders.addAll(app.encoders ?? {}));
 
   /// Limits the maximum number of requests to be handled concurrently by this instance.
diff --git a/pubspec.yaml b/pubspec.yaml
index b4731d0c..af0bc863 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,6 @@ dependencies:
   combinator: ">=1.0.0-beta <2.0.0"
   dart2_constant: ^1.0.0
   http_parser: ^3.0.0
-  json_god: ^2.0.0-beta
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
   merge_map: ^1.0.0
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index fb8ebacd..677deb8c 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
-import 'package:json_god/json_god.dart' as god;
 import 'package:test/test.dart';
 import 'common.dart';
 
@@ -72,7 +71,7 @@ main() {
       });
 
     var response = await client.post("$url/todos",
-        body: god.serialize({"arbitrary": "data"}),
+        body: json.encode({"arbitrary": "data"}),
         headers: headers as Map<String, String>);
     print(response.body);
     Map result = god.deserialize(response.body);
diff --git a/test/services_test.dart b/test/services_test.dart
index 3a5cdd99..2f0a8714 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -2,7 +2,6 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:dart2_constant/convert.dart';
 import 'package:http/http.dart' as http;
-import 'package:json_god/json_god.dart' as god;
 import 'package:stack_trace/stack_trace.dart';
 import 'package:test/test.dart';
 
@@ -51,7 +50,7 @@ main() {
     });
 
     test('can create data', () async {
-      String postData = god.serialize({'text': 'Hello, world!'});
+      String postData = json.encode({'text': 'Hello, world!'});
       var response = await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 201);
@@ -61,7 +60,7 @@ main() {
     });
 
     test('can fetch data', () async {
-      String postData = god.serialize({'text': 'Hello, world!'});
+      String postData = json.encode({'text': 'Hello, world!'});
       await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
       var response = await client.get("$url/todos/0");
@@ -72,10 +71,10 @@ main() {
     });
 
     test('can modify data', () async {
-      String postData = god.serialize({'text': 'Hello, world!'});
+      String postData = json.encode({'text': 'Hello, world!'});
       await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
-      postData = god.serialize({'text': 'modified'});
+      postData = json.encode({'text': 'modified'});
       var response = await client.patch("$url/todos/0",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);
@@ -85,10 +84,10 @@ main() {
     });
 
     test('can overwrite data', () async {
-      String postData = god.serialize({'text': 'Hello, world!'});
+      String postData = json.encode({'text': 'Hello, world!'});
       await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
-      postData = god.serialize({'over': 'write'});
+      postData = json.encode({'over': 'write'});
       var response = await client.post("$url/todos/0",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);
@@ -99,7 +98,7 @@ main() {
     });
 
     test('can delete data', () async {
-      String postData = god.serialize({'text': 'Hello, world!'});
+      String postData = json.encode({'text': 'Hello, world!'});
       var created = await client
           .post("$url/todos",
               headers: headers as Map<String, String>, body: postData)

From 074b640980bbf6441baa1d2b1bb3e9e4d20360b9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:31:08 -0400
Subject: [PATCH 235/414] Remove traces of json_god

---
 CHANGELOG.md                       |  1 +
 lib/src/core/response_context.dart | 24 +++++++-----------------
 lib/src/core/server.dart           |  5 +++--
 lib/src/core/typed_service.dart    |  9 ++++++---
 test/hooked_test.dart              |  7 ++++---
 test/serialize_test.dart           | 10 ++++++----
 test/services_test.dart            | 28 ++++++++++++++--------------
 7 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9f25bb4..53a14ead 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Changed view engine to use `Map<String, dynamic>`.
 * Remove dependency on `package:json_god` by default.
 * Remove dependency on `package:dart2_constant`.
+* Remove `contentType` argument in `ResponseContext.serialize`.
 
 # 1.1.5+1
 * Patched annoying error that prevented MapServices from working,
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index cfced7c3..7bb0eb6c 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -2,7 +2,8 @@ library angel_framework.http.response_context;
 
 import 'dart:async';
 import 'dart:convert' show Converter, Encoding;
-import 'dart:io' show BytesBuilder, HttpResponse;
+import 'dart:convert' as c show json;
+import 'dart:io' show BytesBuilder, Cookie, HttpResponse;
 
 import 'package:angel_route/angel_route.dart';
 import 'package:dart2_constant/convert.dart';
@@ -15,9 +16,6 @@ import '../http/http.dart';
 import 'request_context.dart';
 import 'server.dart' show Angel;
 
-final RegExp _contentType =
-    new RegExp(r'([^/\n]+)\/\s*([^;\n]+)\s*(;\s*charset=([^$;\n]+))?');
-
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// Serializes response data into a String.
@@ -81,7 +79,7 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// ```dart
   /// app.injectSerializer(JSON.encode);
   /// ```
-  String Function(dynamic) serializer = json.encode;
+  String Function(dynamic) serializer = c.json.encode;
 
   /// This response's status code.
   int get statusCode => _statusCode;
@@ -169,7 +167,9 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Serializes JSON to the response.
-  void json(value) => serialize(value, contentType: 'application/json');
+  void json(value) => this
+    ..contentType = MediaType('application', 'json')
+    ..serialize(value);
 
   /// Returns a JSONP response.
   ///
@@ -302,21 +302,11 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Serializes data to the response.
-  ///
-  /// [contentType] can be either a [String], or a [ContentType].
-  bool serialize(value, {contentType}) {
+  bool serialize(value) {
     if (!isOpen) throw closed();
-
     var text = serializer(value);
-
     if (text.isEmpty) return true;
-
-    if (contentType is String)
-      headers['content-type'] = contentType;
-    else if (contentType is ContentType) this.contentType = contentType;
-
     write(text);
-
     end();
     return false;
   }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index a0df148f..05f4cea2 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import 'dart:collection' show HashMap;
 import 'dart:convert';
 import 'dart:io';
+
 import 'package:angel_container/angel_container.dart';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_http_exception/angel_http_exception.dart';
@@ -11,6 +12,7 @@ import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:logging/logging.dart';
 import 'package:tuple/tuple.dart';
+
 import '../http/http.dart';
 import 'angel_base.dart';
 import 'request_context.dart';
@@ -305,8 +307,7 @@ class Angel extends AngelBase {
       else if (result is bool) {
         return result;
       } else if (result != null) {
-        return res.serialize(result,
-            contentType: res.headers['content-type'] ?? 'application/json');
+        return res.serialize(result);
       } else
         return res.isOpen;
     });
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index f3a5ba81..d352deec 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:mirrors';
+
 import '../../common.dart';
 import 'service.dart';
 
@@ -54,9 +55,11 @@ class TypedService<T> extends Service {
   }
 
   serialize(x) {
-    if (x is Model)
-      return json.encodeObject(x);
-    else if (x is Map)
+    // TODO: Custom serializer, i.e. json_god?
+//    if (x is Model)
+//      return json.encodeObject(x);
+//    else
+    if (x is Map)
       return x;
     else if (x is Iterable)
       return x.map(serialize).toList();
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 677deb8c..539ac1c9 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
@@ -74,7 +75,7 @@ main() {
         body: json.encode({"arbitrary": "data"}),
         headers: headers as Map<String, String>);
     print(response.body);
-    Map result = god.deserialize(response.body);
+    Map result = json.decode(response.body);
     expect(result["hello"], equals("hooked world"));
   });
 
@@ -92,7 +93,7 @@ main() {
 
     var response = await client.get("$url/todos");
     print(response.body);
-    List result = god.deserialize(response.body);
+    List result = json.decode(response.body);
     expect(result[0]["angel"], equals("framework"));
   });
 
@@ -115,7 +116,7 @@ main() {
     var response = await client.get('$url/books');
     print(response.body);
 
-    var result = god.deserialize(response.body);
+    var result = json.decode(response.body);
     expect(result, isList);
     expect(result, isNotEmpty);
     expect(result[0], equals({'foo': 'bar'}));
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index 2e027d30..48ee42f3 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -1,7 +1,9 @@
 import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
+import 'package:http_parser/http_parser.dart';
 import 'package:test/test.dart';
 
 main() {
@@ -13,10 +15,10 @@ main() {
   setUp(() async {
     app = new Angel(MirrorsReflector())
       ..get('/foo', () => {'hello': 'world'})
-      ..get(
-          '/bar',
-          (req, ResponseContext res) =>
-              res.serialize({'hello': 'world'}, contentType: 'text/html'));
+      ..get('/bar', (req, ResponseContext res) async {
+        res.contentType = new MediaType('text', 'html');
+        await res.serialize({'hello': 'world'});
+      });
     client = new http.Client();
 
     server = await new AngelHttp(app).startServer();
diff --git a/test/services_test.dart b/test/services_test.dart
index 2f0a8714..7884ed85 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -54,9 +54,9 @@ main() {
       var response = await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 201);
-      var json = god.deserialize(response.body);
-      print(json);
-      expect(json['text'], equals('Hello, world!'));
+      var jsons = json.decode(response.body);
+      print(jsons);
+      expect(jsons['text'], equals('Hello, world!'));
     });
 
     test('can fetch data', () async {
@@ -65,9 +65,9 @@ main() {
           headers: headers as Map<String, String>, body: postData);
       var response = await client.get("$url/todos/0");
       expect(response.statusCode, 200);
-      var json = god.deserialize(response.body);
-      print(json);
-      expect(json['text'], equals('Hello, world!'));
+      var jsons = json.decode(response.body);
+      print(jsons);
+      expect(jsons['text'], equals('Hello, world!'));
     });
 
     test('can modify data', () async {
@@ -78,9 +78,9 @@ main() {
       var response = await client.patch("$url/todos/0",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);
-      var json = god.deserialize(response.body);
-      print(json);
-      expect(json['text'], equals('modified'));
+      var jsons = json.decode(response.body);
+      print(jsons);
+      expect(jsons['text'], equals('modified'));
     });
 
     test('can overwrite data', () async {
@@ -91,10 +91,10 @@ main() {
       var response = await client.post("$url/todos/0",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);
-      var json = god.deserialize(response.body);
-      print(json);
-      expect(json['text'], equals(null));
-      expect(json['over'], equals('write'));
+      var jsons = json.decode(response.body);
+      print(jsons);
+      expect(jsons['text'], equals(null));
+      expect(jsons['over'], equals('write'));
     });
 
     test('can delete data', () async {
@@ -105,7 +105,7 @@ main() {
           .then((r) => json.decode(r.body));
       var response = await client.delete("$url/todos/${created['id']}");
       expect(response.statusCode, 200);
-      var json_ = god.deserialize(response.body);
+      var json_ = json.decode(response.body);
       print(json_);
       expect(json_['text'], equals('Hello, world!'));
     });

From b60a89e3644aaa01c5da72ad82da7602b4a85600 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:32:45 -0400
Subject: [PATCH 236/414] Remove lib/hooks.dart

---
 .idea/workspace.xml | 324 +++++++++++++++++++++++---------------------
 lib/hooks.dart      | 298 ----------------------------------------
 2 files changed, 169 insertions(+), 453 deletions(-)
 delete mode 100644 lib/hooks.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ee6bcc52..874007b3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/hooks.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/hooks.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
@@ -35,19 +31,10 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="208">
-              <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5320">
+            <state relative-caret-position="-5114">
               <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
             </state>
           </provider>
@@ -56,8 +43,11 @@
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="48">
-              <caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
+            <state relative-caret-position="187">
+              <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
+              <folding>
+                <element signature="e#0#22#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -65,8 +55,8 @@
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1376">
-              <caret line="86" column="27" selection-start-line="86" selection-start-column="27" selection-end-line="86" selection-end-column="27" />
+            <state relative-caret-position="187">
+              <caret line="67" column="29" selection-start-line="67" selection-start-column="29" selection-end-line="67" selection-end-column="29" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
               </folding>
@@ -74,11 +64,26 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="typed_service.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="typed_service.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="16">
-              <caret line="1" column="22" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
+            <state relative-caret-position="-485">
+              <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="228">
+              <caret line="309" column="35" selection-start-line="309" selection-start-column="35" selection-end-line="309" selection-end-column="35" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -95,11 +100,26 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
+            <state relative-caret-position="-350">
+              <caret line="120" column="15" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
+              <folding>
+                <element signature="e#55#75#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-3930">
+              <caret line="171" column="23" selection-start-line="171" selection-start-column="23" selection-end-line="171" selection-end-column="23" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -113,27 +133,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="9" column="46" selection-start-line="9" selection-start-column="46" selection-end-line="9" selection-end-column="46" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="145">
-              <caret line="23" column="11" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="11" />
-              <folding>
-                <element signature="e#42#62#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -146,8 +145,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>parameters</find>
-      <find>cannot re</find>
       <find>cookie</find>
       <find>cast</find>
       <find>cast(&lt;[^&gt;]+&gt;)\(\)</find>
@@ -176,6 +173,8 @@
       <find>change</find>
       <find>render</find>
       <find>god.serialize</find>
+      <find>dart:mirrors</find>
+      <find>god.deserialize</find>
     </findStrings>
     <replaceStrings>
       <replace>req.path</replace>
@@ -206,8 +205,8 @@
       <replace>[Iterable]</replace>
       <replace>_foldStringDynamic(result)</replace>
       <replace>Angel(MirrorsReflector())</replace>
-      <replace>json.decode</replace>
       <replace>json.encode</replace>
+      <replace>json.decode</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -255,14 +254,12 @@
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
@@ -275,13 +272,15 @@
         <option value="$PROJECT_DIR$/example/templating.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
       </list>
     </option>
   </component>
@@ -700,14 +699,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="2287000" />
-    </task>
-    <task id="LOCAL-00064" summary="Deprecated `ResponseContext.io`, added HTTP equivalent">
-      <created>1517980874143</created>
-      <option name="number" value="00064" />
-      <option name="presentableId" value="LOCAL-00064" />
-      <option name="project" value="LOCAL" />
-      <updated>1517980874143</updated>
+      <workItem from="1534547885788" duration="3528000" />
     </task>
     <task id="LOCAL-00065" summary="Removed `HttpHeaders` in `ResponseContext`">
       <created>1517980935063</created>
@@ -1045,7 +1037,14 @@
       <option name="project" value="LOCAL" />
       <updated>1534693360366</updated>
     </task>
-    <option name="localTasksCounter" value="113" />
+    <task id="LOCAL-00113" summary="Strip out json god">
+      <created>1534693773968</created>
+      <option name="number" value="00113" />
+      <option name="presentableId" value="LOCAL-00113" />
+      <option name="project" value="LOCAL" />
+      <updated>1534693773968</updated>
+    </task>
+    <option name="localTasksCounter" value="114" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1081,7 +1080,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="164586000" />
+    <option name="totallyTimeSpent" value="165827000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1144,7 +1143,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Fix async bugs" />
     <MESSAGE value="Fix hooking bug" />
     <MESSAGE value="+5" />
     <MESSAGE value="+6" />
@@ -1169,7 +1167,8 @@
     <MESSAGE value="Begin 2.0.0-alpha" />
     <MESSAGE value="Change signature of ResponseContext.jsonp" />
     <MESSAGE value="Changed view engine to use `Map&lt;String, dynamic&gt;`" />
-    <option name="LAST_COMMIT_MESSAGE" value="Changed view engine to use `Map&lt;String, dynamic&gt;`" />
+    <MESSAGE value="Strip out json god" />
+    <option name="LAST_COMMIT_MESSAGE" value="Strip out json god" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1177,13 +1176,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="58">
-          <caret line="121" lean-forward="true" selection-start-line="121" selection-end-line="121" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="366">
@@ -1269,13 +1261,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="14" column="56" selection-start-line="14" selection-start-column="56" selection-end-line="14" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="288">
@@ -1320,16 +1305,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="517" column="31" selection-start-line="517" selection-start-column="31" selection-end-line="517" selection-end-column="31" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="81">
@@ -1375,13 +1350,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1481,6 +1449,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="53">
+          <caret line="5" column="12" lean-forward="true" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -1488,68 +1473,16 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="9" column="46" selection-start-line="9" selection-start-column="46" selection-end-line="9" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="20" column="14" lean-forward="true" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5320">
-          <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1376">
-          <caret line="86" column="27" selection-start-line="86" selection-start-column="27" selection-end-line="86" selection-end-column="27" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="128">
-            <caret line="8" column="48" selection-start-line="8" selection-start-column="48" selection-end-line="8" selection-end-column="48" />
+          <first_editor relative-caret-position="144">
+            <caret line="9" column="63" selection-start-line="9" selection-start-column="63" selection-end-line="9" selection-end-column="63" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="1" column="22" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/templating.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
@@ -1560,10 +1493,91 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="21" column="34" lean-forward="true" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="17" column="12" lean-forward="true" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3930">
+          <caret line="171" column="23" selection-start-line="171" selection-start-column="23" selection-end-line="171" selection-end-column="23" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="67" column="29" selection-start-line="67" selection-start-column="29" selection-end-line="67" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5114">
+          <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="309" column="35" selection-start-line="309" selection-start-column="35" selection-end-line="309" selection-end-column="35" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
+        <state relative-caret-position="-350">
+          <caret line="120" column="15" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
+          <folding>
+            <element signature="e#55#75#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-485">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/lib/hooks.dart b/lib/hooks.dart
deleted file mode 100644
index b0d3f064..00000000
--- a/lib/hooks.dart
+++ /dev/null
@@ -1,298 +0,0 @@
-/// Easy helper hooks.
-library angel_framework.hooks;
-
-import 'dart:async';
-import 'dart:convert';
-import 'dart:mirrors';
-import 'angel_framework.dart';
-
-/// Sequentially runs a set of [listeners].
-HookedServiceEventListener chainListeners(
-    Iterable<HookedServiceEventListener> listeners) {
-  return (HookedServiceEvent e) {
-    for (HookedServiceEventListener listener in listeners) listener(e);
-  };
-}
-
-/// Runs a [callback] on every service, and listens for future services to run it again.
-AngelConfigurer hookAllServices(callback(Service service)) {
-  return (Angel app) {
-    List<Service> touched = [];
-
-    for (var service in app.services.values) {
-      if (!touched.contains(service)) {
-        callback(service);
-        touched.add(service);
-      }
-    }
-
-    app.onService.listen((service) {
-      if (!touched.contains(service)) return callback(service);
-    });
-  };
-}
-
-/// Transforms `e.data` or `e.result` into JSON-friendly data, i.e. a Map. Runs on Iterables as well.
-///
-/// The [condition] is optional, and is passed to [transform].
-HookedServiceEventListener toJson([condition]) =>
-    transform(json.encode, condition);
-
-/// Mutates `e.data` or `e.result` using the given [transformer].
-///
-/// You can optionally provide a [condition], which can be:
-/// * A [Providers] instance, or String, to run only on certain clients
-/// * The type [Providers], in which case the transformer will run on every client, but *not* on server-side events.
-/// * A function: if the function returns `true` (sync or async, doesn't matter),
-/// then the transformer will run. If not, the event will be skipped.
-/// * An [Iterable] of the above three.
-///
-/// A provided function must take a [HookedServiceEvent] as its only parameter.
-HookedServiceEventListener transform(transformer(obj), [condition]) {
-  Iterable cond = condition is Iterable ? condition : [condition];
-  if (condition == null) cond = [];
-
-  _condition(HookedServiceEvent e, condition) {
-    if (condition is Function)
-      return condition(e);
-    else if (condition == Providers)
-      return true;
-    else {
-      if (e.params?.containsKey('provider') == true) {
-        var provider = e.params['provider'] as Providers;
-        if (condition is Providers)
-          return condition == provider;
-        else
-          return condition.toString() == provider.via;
-      } else {
-        return false;
-      }
-    }
-  }
-
-  normalize(HookedServiceEvent e, obj) {
-    bool transform = true;
-
-    for (var c in cond) {
-      var r = _condition(e, c);
-
-      if (r != true) {
-        transform = false;
-        break;
-      }
-    }
-
-    if (transform != true) {
-      if (obj == null)
-        return null;
-      else if (obj is Iterable)
-        return obj.toList();
-      else
-        return obj;
-    }
-
-    if (obj == null)
-      return null;
-    else if (obj is Iterable) {
-      var r = [];
-
-      for (var o in obj) {
-        r.add(normalize(e, o));
-      }
-
-      return r;
-    } else
-      return transformer(obj);
-  }
-
-  return (HookedServiceEvent e) {
-    if (e.isBefore) {
-      e.data = normalize(e, e.data);
-    } else if (e.isAfter) e.result = normalize(e, e.result);
-  };
-}
-
-/// Transforms `e.data` or `e.result` into an instance of the given [type],
-/// if it is not already.
-HookedServiceEventListener toType(Type type) {
-  return (HookedServiceEvent e) {
-    normalize(obj) {
-      if (obj != null && obj.runtimeType != type)
-        return god.deserializeDatum(obj, outputType: type);
-      return obj;
-    }
-
-    if (e.isBefore) {
-      e.data = normalize(e.data);
-    } else
-      e.result = normalize(e.result);
-  };
-}
-
-/// Removes one or more [key]s from `e.data` or `e.result`.
-/// Works on single objects and iterables.
-///
-/// Only applies to the client-side.
-HookedServiceEventListener remove(key, [remover(key, obj)]) {
-  return (HookedServiceEvent e) async {
-    _remover(key, obj) async {
-      if (remover != null)
-        return remover(key, obj);
-      else if (obj is List)
-        return obj..remove(key);
-      else if (obj is Iterable)
-        return obj.where((k) => key != true);
-      else if (obj is Map)
-        return obj..remove(key);
-      else {
-        try {
-          reflect(obj).setField(new Symbol(key.toString()), null);
-          return obj;
-        } catch (e) {
-          throw new ArgumentError("Cannot remove key '$key' from $obj.");
-        }
-      }
-    }
-
-    var keys = key is Iterable ? key : [key];
-
-    _removeAll(obj) async {
-      var r = obj;
-
-      for (var key in keys) {
-        r = await _remover(key, r);
-      }
-
-      return r;
-    }
-
-    normalize(obj) async {
-      if (obj != null) {
-        if (obj is Iterable) {
-          return await Future.wait(obj.map(_removeAll));
-        } else
-          return _removeAll(obj);
-      }
-    }
-
-    if (e.params?.containsKey('provider') == true) {
-      if (e.isBefore) {
-        e.data = normalize(e.data);
-      } else if (e.isAfter) {
-        e.result = normalize(e.result);
-      }
-    }
-  };
-}
-
-/// Disables a service method for client access from a provider.
-///
-/// [provider] can be either a String, [Providers], an Iterable of String, or a
-/// function that takes a [HookedServiceEvent] and returns a bool.
-/// Futures are allowed.
-///
-/// If [provider] is `null`, then it will be disabled to all clients.
-HookedServiceEventListener disable([provider]) {
-  return (HookedServiceEvent e) {
-    if (e.params.containsKey('provider')) {
-      if (provider == null)
-        throw new AngelHttpException.methodNotAllowed();
-      else if (provider is Function) {
-        var r = provider(e);
-        if (r != true) throw new AngelHttpException.methodNotAllowed();
-      } else {
-        _provide(p) => p is Providers ? p : new Providers(p.toString());
-
-        var providers = provider is Iterable
-            ? provider.map(_provide)
-            : [_provide(provider)];
-
-        if (providers.any((Providers p) => p == e.params['provider'])) {
-          throw new AngelHttpException.methodNotAllowed();
-        }
-      }
-    }
-  };
-}
-
-/// Serializes the current time to `e.data` or `e.result`.
-/// You can provide an [assign] function to set the property on your object, and skip reflection.
-/// If [serialize] is `true` (default), then the set date will be a `String`. If not, a raw `DateTime` will be used.
-///
-/// Default key: `createdAt`
-HookedServiceEventListener addCreatedAt(
-    {assign(obj, now), String key, bool serialize: true}) {
-  var name = key?.isNotEmpty == true ? key : 'createdAt';
-
-  return (HookedServiceEvent e) {
-    _assign(obj, now) {
-      if (assign != null)
-        return assign(obj, now);
-      else if (obj is Map)
-        obj[name] = now;
-      else {
-        try {
-          reflect(obj).setField(new Symbol(name), now);
-        } catch (e) {
-          throw new ArgumentError("Cannot set key '$name' on $obj.");
-        }
-      }
-    }
-
-    var d = new DateTime.now().toUtc();
-    var now = serialize == false ? d : d.toIso8601String();
-
-    normalize(obj) {
-      if (obj != null) {
-        if (obj is Iterable) {
-          obj.forEach(normalize);
-        } else {
-          _assign(obj, now);
-        }
-      }
-    }
-
-    normalize(e.isBefore ? e.data : e.result);
-  };
-}
-
-/// Serializes the current time to `e.data` or `e.result`.
-/// You can provide an [assign] function to set the property on your object, and skip reflection.
-/// If [serialize] is `true` (default), then the set date will be a `String`. If not, a raw `DateTime` will be used.
-///
-/// Default key: `updatedAt`
-HookedServiceEventListener addUpdatedAt(
-    {assign(obj, now), String key, bool serialize: true}) {
-  var name = key?.isNotEmpty == true ? key : 'updatedAt';
-
-  return (HookedServiceEvent e) {
-    _assign(obj, now) {
-      if (assign != null)
-        return assign(obj, now);
-      else if (obj is Map)
-        obj[name] = now;
-      else {
-        try {
-          reflect(obj).setField(new Symbol(name), now);
-        } catch (e) {
-          throw new ArgumentError("Cannot SET key '$name' ON $obj.");
-        }
-      }
-    }
-
-    var d = new DateTime.now().toUtc();
-    var now = serialize == false ? d : d.toIso8601String();
-
-    normalize(obj) {
-      if (obj != null) {
-        if (obj is Iterable) {
-          obj.forEach(normalize);
-        } else {
-          _assign(obj, now);
-        }
-      }
-    }
-
-    normalize(e.isBefore ? e.data : e.result);
-  };
-}

From b69b6f3fa5644d25a5afd97a8a69300a468af082 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:35:27 -0400
Subject: [PATCH 237/414] Remove lib/common.dart

---
 lib/common.dart | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 lib/common.dart

diff --git a/lib/common.dart b/lib/common.dart
deleted file mode 100644
index f7beed60..00000000
--- a/lib/common.dart
+++ /dev/null
@@ -1 +0,0 @@
-export 'package:angel_model/angel_model.dart';

From 4fce6594e21a58a9f7593ce960658de5439ac538 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:37:48 -0400
Subject: [PATCH 238/414] Strip out TypedService

---
 .idea/workspace.xml             | 167 +++++++++++++++-----------------
 CHANGELOG.md                    |   2 +
 lib/src/core/typed_service.dart |  90 -----------------
 test/all.dart                   |   2 -
 test/hooked_test.dart           |   2 +-
 test/services_test.dart         |   2 +-
 test/typed_service_test.dart    |  66 -------------
 7 files changed, 84 insertions(+), 247 deletions(-)
 delete mode 100644 test/typed_service_test.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 874007b3..a26d4602 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,12 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -64,11 +59,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="typed_service.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="typed_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-485">
-              <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+            <state relative-caret-position="304">
+              <caret line="19" column="40" lean-forward="true" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -88,6 +83,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="176">
+                <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/example/templating.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -100,14 +107,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooks.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-350">
-              <caret line="120" column="15" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
-              <folding>
-                <element signature="e#55#75#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="16">
+              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
             </state>
           </provider>
         </entry>
@@ -273,14 +277,14 @@
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -699,28 +703,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="3528000" />
-    </task>
-    <task id="LOCAL-00065" summary="Removed `HttpHeaders` in `ResponseContext`">
-      <created>1517980935063</created>
-      <option name="number" value="00065" />
-      <option name="presentableId" value="LOCAL-00065" />
-      <option name="project" value="LOCAL" />
-      <updated>1517980935063</updated>
-    </task>
-    <task id="LOCAL-00066" summary="Deprecated AngelMetrics">
-      <created>1517981171771</created>
-      <option name="number" value="00066" />
-      <option name="presentableId" value="LOCAL-00066" />
-      <option name="project" value="LOCAL" />
-      <updated>1517981171771</updated>
-    </task>
-    <task id="LOCAL-00067" summary="Export HTTP Req+Res context">
-      <created>1517981193409</created>
-      <option name="number" value="00067" />
-      <option name="presentableId" value="LOCAL-00067" />
-      <option name="project" value="LOCAL" />
-      <updated>1517981193409</updated>
+      <workItem from="1534547885788" duration="3873000" />
     </task>
     <task id="LOCAL-00068" summary="HTTP ResponseContext works">
       <created>1517981784675</created>
@@ -1044,7 +1027,28 @@
       <option name="project" value="LOCAL" />
       <updated>1534693773968</updated>
     </task>
-    <option name="localTasksCounter" value="114" />
+    <task id="LOCAL-00114" summary="Remove traces of json_god">
+      <created>1534732268467</created>
+      <option name="number" value="00114" />
+      <option name="presentableId" value="LOCAL-00114" />
+      <option name="project" value="LOCAL" />
+      <updated>1534732268467</updated>
+    </task>
+    <task id="LOCAL-00115" summary="Remove lib/hooks.dart">
+      <created>1534732365272</created>
+      <option name="number" value="00115" />
+      <option name="presentableId" value="LOCAL-00115" />
+      <option name="project" value="LOCAL" />
+      <updated>1534732365272</updated>
+    </task>
+    <task id="LOCAL-00116" summary="Remove lib/common.dart">
+      <created>1534732527424</created>
+      <option name="number" value="00116" />
+      <option name="presentableId" value="LOCAL-00116" />
+      <option name="project" value="LOCAL" />
+      <updated>1534732527424</updated>
+    </task>
+    <option name="localTasksCounter" value="117" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1080,7 +1084,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="165827000" />
+    <option name="totallyTimeSpent" value="166172000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1100,7 +1104,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1118,7 +1122,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.27920645" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1143,9 +1147,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Fix hooking bug" />
-    <MESSAGE value="+5" />
-    <MESSAGE value="+6" />
     <MESSAGE value="+7" />
     <MESSAGE value="Provide custom IsInstanceOf for testing" />
     <MESSAGE value="Tracked down the rogue &quot;null&quot; print" />
@@ -1168,7 +1169,10 @@
     <MESSAGE value="Change signature of ResponseContext.jsonp" />
     <MESSAGE value="Changed view engine to use `Map&lt;String, dynamic&gt;`" />
     <MESSAGE value="Strip out json god" />
-    <option name="LAST_COMMIT_MESSAGE" value="Strip out json god" />
+    <MESSAGE value="Remove traces of json_god" />
+    <MESSAGE value="Remove lib/hooks.dart" />
+    <MESSAGE value="Remove lib/common.dart" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove lib/common.dart" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1176,13 +1180,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="448">
@@ -1350,13 +1347,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
@@ -1473,26 +1463,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="144">
-            <caret line="9" column="63" selection-start-line="9" selection-start-column="63" selection-end-line="9" selection-end-column="63" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/templating.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
@@ -1561,26 +1531,49 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+    <entry file="file://$PROJECT_DIR$/example/templating.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-350">
-          <caret line="120" column="15" selection-start-line="120" selection-start-column="15" selection-end-line="120" selection-end-column="15" />
+        <state relative-caret-position="240">
+          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
           <folding>
-            <element signature="e#55#75#0" expanded="true" />
+            <element signature="e#0#17#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/common.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-485">
-          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+        <state relative-caret-position="304">
+          <caret line="19" column="40" lean-forward="true" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="176">
+            <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53a14ead..6aeacb95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 * Remove dependency on `package:json_god` by default.
 * Remove dependency on `package:dart2_constant`.
 * Remove `contentType` argument in `ResponseContext.serialize`.
+* Moved `lib/hooks.dart` into `package:angel_hooks`.
+* Moved `TypedService` into `package:angel_typed_service`.
 
 # 1.1.5+1
 * Patched annoying error that prevented MapServices from working,
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index d352deec..e69de29b 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -1,90 +0,0 @@
-import 'dart:async';
-import 'dart:mirrors';
-
-import '../../common.dart';
-import 'service.dart';
-
-class TypedService<T> extends Service {
-  final Service inner;
-
-  TypedService(this.inner) : super() {
-    if (!reflectType(T).isAssignableTo(reflectType(Model)))
-      throw new Exception(
-          "If you specify a type for TypedService, it must extend Model.");
-  }
-
-  deserialize(x) {
-    // print('DESERIALIZE: $x (${x.runtimeType})');
-    if (x is Type || x is T)
-      return x;
-    else if (x is Iterable)
-      return x.map(deserialize).toList();
-    else if (x is Map) {
-      Map data = x.keys.fold({}, (map, key) {
-        var value = x[key];
-
-        if ((key == 'createdAt' ||
-                key == 'updatedAt' ||
-                key == 'created_at' ||
-                key == 'updated_at') &&
-            value is String) {
-          return map..[key] = DateTime.parse(value);
-        } else {
-          return map..[key] = value;
-        }
-      });
-
-      Model result = god.deserializeDatum(data, outputType: T);
-
-      if (data['createdAt'] is DateTime) {
-        result.createdAt = data['createdAt'] as DateTime;
-      } else if (data['created_at'] is DateTime) {
-        result.createdAt = data['created_at'] as DateTime;
-      }
-
-      if (data['updatedAt'] is DateTime) {
-        result.updatedAt = data['updatedAt'] as DateTime;
-      } else if (data['updated_at'] is DateTime) {
-        result.updatedAt = data['updated_at'] as DateTime;
-      }
-
-      // print('x: $x\nresult: $result');
-      return result;
-    } else
-      return x;
-  }
-
-  serialize(x) {
-    // TODO: Custom serializer, i.e. json_god?
-//    if (x is Model)
-//      return json.encodeObject(x);
-//    else
-    if (x is Map)
-      return x;
-    else if (x is Iterable)
-      return x.map(serialize).toList();
-    else
-      throw new ArgumentError('Cannot serialize ${x.runtimeType}');
-  }
-
-  @override
-  Future index([Map params]) => inner.index(params).then(deserialize);
-
-  @override
-  Future create(data, [Map params]) =>
-      inner.create(serialize(data), params).then(deserialize);
-
-  @override
-  Future read(id, [Map params]) => inner.read(id, params).then(deserialize);
-
-  @override
-  Future modify(id, data, [Map params]) =>
-      inner.modify(id, serialize(data), params).then(deserialize);
-
-  @override
-  Future update(id, data, [Map params]) =>
-      inner.update(id, serialize(data), params).then(deserialize);
-
-  @override
-  Future remove(id, [Map params]) => inner.remove(id, params).then(deserialize);
-}
diff --git a/test/all.dart b/test/all.dart
index 9473c038..21bd6803 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -21,7 +21,6 @@ import 'serialize_test.dart' as serialize;
 import 'server_test.dart' as server;
 import 'services_test.dart' as services;
 import 'streaming_test.dart' as streaming;
-import 'typed_service_test.dart' as typed_service;
 import 'view_generator_test.dart' as view_generator;
 import 'package:test/test.dart';
 
@@ -47,6 +46,5 @@ main() {
   group('server', server.main);
   group('services', services.main);
   group('streaming', streaming.main);
-  group('typed_service', typed_service.main);
   group('view generator', view_generator.main);
 }
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 539ac1c9..1dc73524 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -21,7 +21,7 @@ main() {
   setUp(() async {
     app = new Angel(MirrorsReflector());
     client = new http.Client();
-    app.use('/todos', new TypedService<Todo>(new MapService()));
+    app.use('/todos', new MapService());
     app.use('/books', new BookService());
     Todos = app.service("todos") as HookedService;
 
diff --git a/test/services_test.dart b/test/services_test.dart
index 7884ed85..7da56158 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -21,7 +21,7 @@ main() {
 
   setUp(() async {
     app = new Angel(MirrorsReflector())
-      ..use('/todos', new TypedService<Todo>(new MapService()))
+      ..use('/todos', new MapService())
       ..errorHandler = (e, req, res) {
         print('Whoops: ${e.error}');
         if (e.stackTrace != null) print(new Chain.forTrace(e.stackTrace).terse);
diff --git a/test/typed_service_test.dart b/test/typed_service_test.dart
deleted file mode 100644
index b5b3a3c9..00000000
--- a/test/typed_service_test.dart
+++ /dev/null
@@ -1,66 +0,0 @@
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_framework/common.dart';
-import 'package:test/test.dart';
-import 'common.dart';
-
-main() {
-  var svc = new TypedService<Todo>(new MapService());
-
-  test('force model', () {
-    expect(() => new TypedService<String>(null), throwsException);
-  });
-
-  test('serialize', () {
-    expect(svc.serialize({'foo': 'bar'}), {'foo': 'bar'});
-    expect(
-        svc.serialize([
-          {'foo': 'bar'}
-        ]),
-        [
-          {'foo': 'bar'}
-        ]);
-    expect(() => svc.serialize(2), throwsArgumentError);
-    var now = new DateTime.now();
-    var t =
-        new Todo(text: 'a', completed: false, createdAt: now, updatedAt: now);
-    var m = svc.serialize(t);
-    print(m);
-    expect(m..remove('_identityHashCode'), {
-      'id': null,
-      'createdAt': now.toIso8601String(),
-      'updatedAt': now.toIso8601String(),
-      'text': 'a',
-      'completed': false
-    });
-  });
-
-  test('deserialize date', () {
-    var now = new DateTime.now();
-    var m = svc.deserialize({
-      'createdAt': now.toIso8601String(),
-      'updatedAt': now.toIso8601String()
-    });
-    expect(m, const IsInstanceOf<Todo>());
-    var t = m as Todo;
-    expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
-  });
-
-  test('deserialize date w/ underscore', () {
-    var now = new DateTime.now();
-    var m = svc.deserialize({
-      'created_at': now.toIso8601String(),
-      'updated_at': now.toIso8601String()
-    });
-    expect(m, const IsInstanceOf<Todo>());
-    var t = m as Todo;
-    expect(t.createdAt.millisecondsSinceEpoch, now.millisecondsSinceEpoch);
-  });
-}
-
-class Todo extends Model {
-  String text;
-  bool completed;
-  @override
-  DateTime createdAt, updatedAt;
-  Todo({this.text, this.completed, this.createdAt, this.updatedAt});
-}

From 1d8f06b54c78166decccb02eb7f2b8844cac0ca6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:40:11 -0400
Subject: [PATCH 239/414] Make reflector a named parameter

---
 README.md                      |  2 +-
 example/handle_error.dart      |  2 +-
 example/json.dart              |  2 +-
 example/main.dart              |  2 +-
 example/templating.dart        |  2 +-
 example/view.dart              |  2 +-
 lib/src/core/server.dart       |  9 +++++----
 performance/hello/main.dart    |  2 +-
 test/accepts_test.dart         |  2 +-
 test/controller_test.dart      |  8 ++++----
 test/di_test.dart              |  2 +-
 test/encoders_buffer_test.dart |  2 +-
 test/extension_test.dart       |  2 +-
 test/general_test.dart         |  2 +-
 test/hooked_test.dart          |  2 +-
 test/parameter_meta_test.dart  |  2 +-
 test/precontained_test.dart    |  2 +-
 test/primitives_test.dart      |  2 +-
 test/repeat_request_test.dart  |  2 +-
 test/routing_test.dart         |  6 +++---
 test/serialize_test.dart       |  2 +-
 test/server_test.dart          | 22 +++++++++++-----------
 test/services_test.dart        |  2 +-
 test/streaming_test.dart       |  2 +-
 test/view_generator_test.dart  |  2 +-
 25 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 95d45434..a287997c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ To build real-world applications, please see the [homepage](https://angel-dart.g
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel(MirrorsReflector());
+  var app = new Angel(reflector: MirrorsReflector());
 
   // Index route. Returns JSON.
   app.get('/', () => 'Welcome to Angel!');
diff --git a/example/handle_error.dart b/example/handle_error.dart
index f8a4c9a3..413a8f0c 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -5,7 +5,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:logging/logging.dart';
 
 main() async {
-  var app = new Angel(MirrorsReflector())
+  var app = new Angel(reflector: MirrorsReflector())
     ..lazyParseBodies = true
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
diff --git a/example/json.dart b/example/json.dart
index ce7e762a..cc6b3b70 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -29,7 +29,7 @@ main() async {
 }
 
 serverMain(_) async {
-  var app = new Angel(MirrorsReflector());
+  var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp.custom(app, startShared); // Run a cluster
 
   app.get('/', {
diff --git a/example/main.dart b/example/main.dart
index 9602570c..e1437137 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -2,7 +2,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel(MirrorsReflector());
+  var app = new Angel(reflector: MirrorsReflector());
 
   // Index route. Returns JSON.
   app.get('/', () => 'Welcome to Angel!');
diff --git a/example/templating.dart b/example/templating.dart
index a55ea0d5..118013c7 100644
--- a/example/templating.dart
+++ b/example/templating.dart
@@ -7,7 +7,7 @@ import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 
 main() async {
-  var app = new Angel(MirrorsReflector())
+  var app = new Angel(reflector: MirrorsReflector())
     ..lazyParseBodies = true
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
diff --git a/example/view.dart b/example/view.dart
index dec27de8..6f8cddd7 100644
--- a/example/view.dart
+++ b/example/view.dart
@@ -2,7 +2,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel(MirrorsReflector());
+  var app = new Angel(reflector: MirrorsReflector());
 
   app.viewGenerator = (name, [data]) async =>
       'View generator invoked with name $name and data: $data';
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 05f4cea2..40fd18ac 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -11,6 +11,7 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:logging/logging.dart';
+import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
 
 import '../http/http.dart';
@@ -484,7 +485,7 @@ class Angel extends AngelBase {
   }
 
   /// Default constructor. ;)
-  Angel(Reflector reflector) : super(reflector) {
+  Angel({@required Reflector reflector}) : super(reflector) {
     bootstrapContainer();
     // ignore: deprecated_member_use
     createZoneForRequest = defaultZoneCreator;
@@ -509,14 +510,14 @@ class Angel extends AngelBase {
   @deprecated
   factory Angel.custom(
       Future<HttpServer> Function(dynamic, int) serverGenerator) {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     return app.._http = new AngelHttp.custom(app, serverGenerator);
   }
 
   /// Use the serving methods in [AngelHttp] instead.
   @deprecated
   factory Angel.fromSecurityContext(SecurityContext context) {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
 
     app._http = new AngelHttp.custom(app, (address, int port) {
       return HttpServer.bindSecure(address, port, context);
@@ -529,7 +530,7 @@ class Angel extends AngelBase {
   @deprecated
   factory Angel.secure(String certificateChainPath, String serverKeyPath,
       {String password}) {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     return app
       .._http = new AngelHttp.secure(app, certificateChainPath, serverKeyPath,
           password: password);
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 3400e8b7..a238447e 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -23,7 +23,7 @@ main() async {
 }
 
 void start(int id) {
-  var app = new Angel(MirrorsReflector())..lazyParseBodies = true;
+  var app = new Angel(reflector: MirrorsReflector())..lazyParseBodies = true;
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
   app.get('/', (ResponseContext res) => res.write('Hello, world!'));
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index caa6a2eb..a7752d0b 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -61,7 +61,7 @@ Future<RequestContext> acceptContentTypes(
   var rq = new MockHttpRequest('GET', ENDPOINT);
   rq.headers.set('accept', headerString);
   rq.close();
-  var app = new Angel(MirrorsReflector());
+  var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp(app);
   return http.createRequestContext(rq);
 }
diff --git a/test/controller_test.dart b/test/controller_test.dart
index e90c4167..ab354335 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -43,7 +43,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(MirrorsReflector());
+    app = new Angel(reflector: MirrorsReflector());
     app.requestMiddleware["foo"] = (req, res) async {
       res.write("Hello, ");
       return true;
@@ -77,7 +77,7 @@ main() {
 
   test('require expose', () async {
     try {
-      var app = new Angel(MirrorsReflector());
+      var app = new Angel(reflector: MirrorsReflector());
       await app.configure(new NoExposeController().configureServer);
       throw 'Should require @Expose';
     } on Exception {
@@ -86,7 +86,7 @@ main() {
   });
 
   test('create dynamic handler', () async {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     app.get(
         '/foo',
         createDynamicHandler(({String bar}) {
@@ -99,7 +99,7 @@ main() {
   });
 
   test('optional name', () async {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     await app.configure(new NamedController().configureServer);
     expect(app.controllers['foo'], const IsInstanceOf<NamedController>());
   });
diff --git a/test/di_test.dart b/test/di_test.dart
index 5138ac60..02fa485e 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -16,7 +16,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(MirrorsReflector());
+    app = new Angel(reflector: MirrorsReflector());
     client = new http.Client();
 
     // Inject some todos
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 1d52708e..aa4f4792 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -18,7 +18,7 @@ main() {
   Angel app;
 
   setUp(() {
-    app = new Angel(MirrorsReflector());
+    app = new Angel(reflector: MirrorsReflector());
     app.injectEncoders(
       {
         'deflate': zlib.encoder,
diff --git a/test/extension_test.dart b/test/extension_test.dart
index f585e060..1fce7b68 100644
--- a/test/extension_test.dart
+++ b/test/extension_test.dart
@@ -25,7 +25,7 @@ main() {
 
 Future<RequestContext> makeRequest(String path) {
   var rq = new MockHttpRequest('GET', ENDPOINT.replace(path: path))..close();
-  var app = new Angel(MirrorsReflector());
+  var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp(app);
   return http.createRequestContext(rq);
 }
diff --git a/test/general_test.dart b/test/general_test.dart
index c04e9c31..93b60faf 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -12,7 +12,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(MirrorsReflector())
+    app = new Angel(reflector: MirrorsReflector())
       ..post('/foo', () => {'hello': 'world'})
       ..all('*', () => throw new AngelHttpException.notFound());
     client = new http.Client();
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 1dc73524..8c9ce923 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -19,7 +19,7 @@ main() {
   HookedService Todos;
 
   setUp(() async {
-    app = new Angel(MirrorsReflector());
+    app = new Angel(reflector: MirrorsReflector());
     client = new http.Client();
     app.use('/todos', new MapService());
     app.use('/books', new BookService());
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index c5d113f5..a5b1e9db 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -28,7 +28,7 @@ parameterMetaTests() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(MirrorsReflector())..lazyParseBodies = true;
+    app = new Angel(reflector: MirrorsReflector())..lazyParseBodies = true;
     http = new AngelHttp(app);
 
     app.get('/cookie', (@CookieValue('token') String jwt) {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 299b4042..6f88526e 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -6,7 +6,7 @@ import 'package:test/test.dart';
 
 main() {
   test('preinjects functions', () async {
-    var app = new Angel(MirrorsReflector())
+    var app = new Angel(reflector: MirrorsReflector())
       ..configuration['foo'] = 'bar'
       ..get('/foo', echoAppFoo);
     app.optimizeForProduction(force: true);
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index c5988f55..3e01d56d 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -10,7 +10,7 @@ main() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(MirrorsReflector())..inject('global', 305); // Pitbull!
+    app = new Angel(reflector: MirrorsReflector())..inject('global', 305); // Pitbull!
     http = new AngelHttp(app);
 
     app.get('/string/:string', (String string) => string);
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index ca7bc3bd..5ae563c6 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -11,7 +11,7 @@ main() {
   }
 
   test('can request the same url twice', () async {
-    var app = new Angel(MirrorsReflector())..get('/test/:id', (id) => 'Hello $id');
+    var app = new Angel(reflector: MirrorsReflector())..get('/test/:id', (id) => 'Hello $id');
     var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
     await Future.wait([rq1, rq2, rq3].map(new AngelHttp(app).handleRequest));
     var body1 = await rq1.response.transform(utf8.decoder).join(),
diff --git a/test/routing_test.dart b/test/routing_test.dart
index cb624317..838bbf07 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -28,9 +28,9 @@ main() {
   http.Client client;
 
   setUp(() async {
-    app = new Angel(MirrorsReflector());
-    nested = new Angel(MirrorsReflector());
-    todos = new Angel(MirrorsReflector());
+    app = new Angel(reflector: MirrorsReflector());
+    nested = new Angel(reflector: MirrorsReflector());
+    todos = new Angel(reflector: MirrorsReflector());
 
     // Lazy-parse in production
     [app, nested, todos].forEach((Angel app) {
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index 48ee42f3..6a601011 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -13,7 +13,7 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(MirrorsReflector())
+    app = new Angel(reflector: MirrorsReflector())
       ..get('/foo', () => {'hello': 'world'})
       ..get('/bar', (req, ResponseContext res) async {
         res.contentType = new MediaType('text', 'html');
diff --git a/test/server_test.dart b/test/server_test.dart
index 8c1ca114..6126d322 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -12,8 +12,8 @@ final Uri $foo = Uri.parse('http://localhost:3000/foo');
 /// Additional tests to improve coverage of server.dart
 main() {
   group('scoping', () {
-    var parent = new Angel(MirrorsReflector())..configuration['two'] = 2;
-    var child = new Angel(MirrorsReflector());
+    var parent = new Angel(reflector: MirrorsReflector())..configuration['two'] = 2;
+    var child = new Angel(reflector: MirrorsReflector());
     parent.use('/child', child);
 
     test('sets children', () {
@@ -30,13 +30,13 @@ main() {
   });
 
   test('custom server generator', () {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     var http = new AngelHttp.custom(app, HttpServer.bind);
     expect(http.serverGenerator, HttpServer.bind);
   });
 
   test('default error handler', () async {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     var http = new AngelHttp(app);
     var rq = new MockHttpRequest('GET', $foo);
     rq.close();
@@ -59,7 +59,7 @@ main() {
   });
 
   test('plug-ins run on startup', () async {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     app.startupHooks.add((app) => app.configuration['two'] = 2);
 
     var http = new AngelHttp(app);
@@ -70,14 +70,14 @@ main() {
   });
 
   test('warning when adding routes to flattened router', () {
-    var app = new Angel(MirrorsReflector())..optimizeForProduction(force: true);
+    var app = new Angel(reflector: MirrorsReflector())..optimizeForProduction(force: true);
     app.dumpTree();
     app.get('/', () => 2);
     app.mount('/foo', new Router()..get('/', 3));
   });
 
   test('services close on close call', () async {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     var svc = new CustomCloseService();
     expect(svc.value, 2);
     app.use('/', svc);
@@ -86,7 +86,7 @@ main() {
   });
 
   test('global injection added to injection map', () async {
-    var app = new Angel(MirrorsReflector())..inject('a', 'b');
+    var app = new Angel(reflector: MirrorsReflector())..inject('a', 'b');
     var http = new AngelHttp(app);
     app.get('/', (String a) => a);
     var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
@@ -96,7 +96,7 @@ main() {
   });
 
   test('global injected serializer', () async {
-    var app = new Angel(MirrorsReflector())..serializer = (_) => 'x';
+    var app = new Angel(reflector: MirrorsReflector())..serializer = (_) => 'x';
     var http = new AngelHttp(app);
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
     var rq = new MockHttpRequest('GET', $foo)..close();
@@ -106,7 +106,7 @@ main() {
   });
 
   group('handler results', () {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     var http = new AngelHttp(app);
     app.responseFinalizers
         .add((req, res) => throw new AngelHttpException.forbidden());
@@ -152,7 +152,7 @@ main() {
     AngelHttp http;
 
     setUp(() async {
-      app = new Angel(MirrorsReflector());
+      app = new Angel(reflector: MirrorsReflector());
       app.get('/wtf', () => throw new AngelHttpException.forbidden());
       app.get('/wtf2', () => throw new AngelHttpException.forbidden());
       http = new AngelHttp(app);
diff --git a/test/services_test.dart b/test/services_test.dart
index 7da56158..a6759d0c 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -20,7 +20,7 @@ main() {
   http.Client client;
 
   setUp(() async {
-    app = new Angel(MirrorsReflector())
+    app = new Angel(reflector: MirrorsReflector())
       ..use('/todos', new MapService())
       ..errorHandler = (e, req, res) {
         print('Whoops: ${e.error}');
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 1b65e9be..f1b9649a 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -14,7 +14,7 @@ main() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(MirrorsReflector());
+    app = new Angel(reflector: MirrorsReflector());
     http = new AngelHttp(app);
 
     app.logger = new Logger('streaming_test')
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
index a886edb6..0b304061 100644
--- a/test/view_generator_test.dart
+++ b/test/view_generator_test.dart
@@ -4,7 +4,7 @@ import 'package:test/test.dart';
 
 main() {
   test('default view generator', () async {
-    var app = new Angel(MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
     var view = await app.viewGenerator('foo', {'bar': 'baz'});
     expect(view, contains('No view engine'));
   });

From 3584ae2b227ef25f0925a74e0a8401d00f4c7cb9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:40:47 -0400
Subject: [PATCH 240/414] Force dep on Dart >=2.0.0-dev

---
 .idea/workspace.xml | 322 ++++++++++++++++++++++----------------------
 pubspec.yaml        |   2 +-
 2 files changed, 163 insertions(+), 161 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a26d4602..61301373 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/typed_service.dart" afterDir="false" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Strip out TypedService">
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/handle_error.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/templating.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/templating.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/view.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/extension_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/extension_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/view_generator_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -38,8 +61,8 @@
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
+            <state relative-caret-position="-611">
+              <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
               <folding>
                 <element signature="e#0#22#0" expanded="true" />
               </folding>
@@ -47,11 +70,20 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/all.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="352">
+              <caret line="22" column="42" selection-start-line="22" selection-start-column="42" selection-end-line="22" selection-end-column="42" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="67" column="29" selection-start-line="67" selection-start-column="29" selection-end-line="67" selection-end-column="29" />
+            <state relative-caret-position="438">
+              <caret line="105" column="35" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
               </folding>
@@ -61,21 +93,14 @@
       </file>
       <file leaf-file-name="typed_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="19" column="40" lean-forward="true" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="309" column="35" selection-start-line="309" selection-start-column="35" selection-end-line="309" selection-end-column="35" />
+            <state relative-caret-position="238">
+              <caret line="487" column="47" lean-forward="true" selection-start-line="487" selection-start-column="47" selection-end-line="487" selection-end-column="47" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -83,14 +108,23 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="176">
-                <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="64">
+              <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="304">
+              <caret line="19" column="2" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
+              <folding>
+                <element signature="e#42#62#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -98,8 +132,8 @@
       <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/example/templating.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+            <state relative-caret-position="144">
+              <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
               <folding>
                 <element signature="e#0#17#0" expanded="true" />
               </folding>
@@ -116,27 +150,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3930">
-              <caret line="171" column="23" selection-start-line="171" selection-start-column="23" selection-end-line="171" selection-end-column="23" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
-              <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -149,8 +162,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>cookie</find>
-      <find>cast</find>
       <find>cast(&lt;[^&gt;]+&gt;)\(\)</find>
       <find>\.cast(&lt;[^&gt;]+&gt;)\(\)</find>
       <find>.cast</find>
@@ -179,9 +190,10 @@
       <find>god.serialize</find>
       <find>dart:mirrors</find>
       <find>god.deserialize</find>
+      <find>reflector</find>
+      <find>Angel(M</find>
     </findStrings>
     <replaceStrings>
-      <replace>req.path</replace>
       <replace>req.path`</replace>
       <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
       <replace>appa</replace>
@@ -211,6 +223,7 @@
       <replace>Angel(MirrorsReflector())</replace>
       <replace>json.encode</replace>
       <replace>json.decode</replace>
+      <replace>Angel(reflector: M</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -245,17 +258,14 @@
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
-        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
@@ -278,13 +288,16 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
+        <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/test/all.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/example/handle_error.dart" />
       </list>
     </option>
   </component>
@@ -703,14 +716,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="3873000" />
-    </task>
-    <task id="LOCAL-00068" summary="HTTP ResponseContext works">
-      <created>1517981784675</created>
-      <option name="number" value="00068" />
-      <option name="presentableId" value="LOCAL-00068" />
-      <option name="project" value="LOCAL" />
-      <updated>1517981784676</updated>
+      <workItem from="1534547885788" duration="4117000" />
     </task>
     <task id="LOCAL-00069" summary="Created pkg:framework/http.dart">
       <created>1517982261106</created>
@@ -1048,7 +1054,14 @@
       <option name="project" value="LOCAL" />
       <updated>1534732527424</updated>
     </task>
-    <option name="localTasksCounter" value="117" />
+    <task id="LOCAL-00117" summary="Strip out TypedService">
+      <created>1534732668246</created>
+      <option name="number" value="00117" />
+      <option name="presentableId" value="LOCAL-00117" />
+      <option name="project" value="LOCAL" />
+      <updated>1534732668246</updated>
+    </task>
+    <option name="localTasksCounter" value="118" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1084,7 +1097,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="166172000" />
+    <option name="totallyTimeSpent" value="166416000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1104,7 +1117,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1122,7 +1135,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27920645" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1147,7 +1160,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="+7" />
     <MESSAGE value="Provide custom IsInstanceOf for testing" />
     <MESSAGE value="Tracked down the rogue &quot;null&quot; print" />
     <MESSAGE value="CHANGELOG, bump to 1.1.4+8" />
@@ -1172,7 +1184,8 @@
     <MESSAGE value="Remove traces of json_god" />
     <MESSAGE value="Remove lib/hooks.dart" />
     <MESSAGE value="Remove lib/common.dart" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove lib/common.dart" />
+    <MESSAGE value="Strip out TypedService" />
+    <option name="LAST_COMMIT_MESSAGE" value="Strip out TypedService" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1180,20 +1193,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="28" column="17" selection-start-line="28" selection-start-column="17" selection-end-line="28" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="192" column="44" selection-start-line="192" selection-start-column="44" selection-end-line="192" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="436">
@@ -1237,13 +1236,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="536">
-          <caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib/src/core_matchers.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="86">
@@ -1408,13 +1400,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="18" column="1" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="235">
@@ -1429,16 +1414,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="23" column="11" selection-start-line="23" selection-start-column="11" selection-end-line="23" selection-end-column="11" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="53">
@@ -1487,16 +1462,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="67" column="29" selection-start-line="67" selection-start-column="29" selection-end-line="67" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-5114">
@@ -1504,16 +1469,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="257">
@@ -1521,26 +1476,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="309" column="35" selection-start-line="309" selection-start-column="35" selection-end-line="309" selection-end-column="35" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/templating.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1554,16 +1489,6 @@
     <entry file="file://$PROJECT_DIR$/lib/common.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="19" column="40" lean-forward="true" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1574,6 +1499,83 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="438">
+          <caret line="105" column="35" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-611">
+          <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="22" column="42" selection-start-line="22" selection-start-column="42" selection-end-line="22" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib/src/mirrors/reflector.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/templating.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="19" column="2" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="487" column="47" lean-forward="true" selection-start-line="487" selection-start-column="47" selection-end-line="487" selection-end-column="47" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/pubspec.yaml b/pubspec.yaml
index af0bc863..3ba66a2c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ description: A high-powered HTTP server with DI, routing and more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
-  sdk: ">=1.8.0 <3.0.0"
+  sdk: ">=2.0.0-dev <3.0.0"
 dependencies:
   angel_container: ^1.0.0-alpha
   angel_http_exception: ^1.0.0

From 7a2054ff466a0383c55a8dbea57428a6d072b487 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:42:07 -0400
Subject: [PATCH 241/414] CHANGELOG now only reflects on 2.0.0-alpha+

---
 CHANGELOG.md | 139 +--------------------------------------------------
 1 file changed, 1 insertion(+), 138 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6aeacb95..287c5f52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,141 +9,4 @@
 * Remove dependency on `package:dart2_constant`.
 * Remove `contentType` argument in `ResponseContext.serialize`.
 * Moved `lib/hooks.dart` into `package:angel_hooks`.
-* Moved `TypedService` into `package:angel_typed_service`.
-
-# 1.1.5+1
-* Patched annoying error that prevented MapServices from working,
-simply because `<dynamic, dynamic>` is incompatible with `<String, dynamic>`.
-
-# 1.1.5
-* `AnonymousService` methods can now return `FutureOr`.
-* Added `findOne` to `Service`.
-
-# 1.1.4+11
-* Close the response, etc. *after* finalizers are done.
-
-# 1.1.4+10
-* Change the zone error handler to take an `Object`
-
-# 1.1.4+9
-* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of
-`as`-casting them to `Map<String, dynamic>`.
-* Apply this same folding to `ResponseContext.redirectToAction`.
-
-# 1.1.4+8
-* Finalizers can now write to the response buffer or send headers,
-because said getter now only returns an unmodifiable Map when using
-`streaming`.
-* Tracked down an annoying line that printed many, many `null` messages.
-
-# 1.1.4+7
-* Remove `cast` for Dart 1.x.
-* `RequestContext.injections` is no longer cached or read-only.
-* `ResponseContext` now has `renderParams`.
-
-# 1.1.4+6
-* Almost 100% working with `2.0.0-dev.64.1`. In said version
-of Dart, `dart:mirrors` is broken, and therefore breaks detection of metadata.
-
-# 1.1.4+5
-* Intermediary release while patching up Dart 2 bugs.
-* Stricter Dart 2 use.
-* Remove `AngelMetrics` for good.
-
-# 1.1.4+4
-* Fix a bug that caused a race condition in hooked services.
-
-# 1.1.4+3
-* Don't create a Stopwatch in production.
-* Fix a bug where `handleAngelHttpException` created a race condition.
-* `ResponseContext.serialize` now returns a `bool`.
-
-# 1.1.4+2
-* Fix a bug that prevented proper rendering of views.
-* Fixed a hidden bug that prevents error handling when a
-stack trace is `null`.
-* Fixed a bug that prevented proper handling of `content-encoding`.
-
-# 1.1.4+1
-* Ensure correct error handling when `useZone` is `false`.
- 
-# 1.1.4
-* Remove all usages of `async`/`await` in the core library.
-* `AngelConfigurer` now accepts `FutureOr`.
-* `AngelHttp` now has a `useZone` flag to disable custom zones.
-
-# 1.1.3
-* `AngelHttp` now handles requests in a `Zone`.
-* Use `package:dart2_constant`.
-
-# 1.1.2
-* `MapService` will store `created_at` and `updated_at` as `String`.
-
-# 1.1.1
-* `ResponseContext` no longer automatically closes if `serializer` returns an
-empty string.
-* Added `autoSnakeCaseNames` to `MapService`.
-* Deprecated `Angel.createZoneForRequest`.
-* Deprecated all `Angel` methods that directly touch an `HttpServer` or `HttpRequest`.
-* Created the `AngelHttp` class.
-* Removed explicit dependence on `dart:io` for `Angel`, `RequestContext`, `ResponseContext`.
-* Created `lib/http.dart`, which exports HTTP-specific functionality.
-* `AnonymousService` now takes `FutureOr`.
-* `Service.toId` no longer only takes a `String`, and is generically-typed.
-
-# 1.1.0+3
-* Modified `ResponseContext#isOpen` to also return `false` if streaming is being used.
-
-# 1.1.0+2
-* Modified `handleAngelHttpException` to only run rescue code
-if the response is still open. Prevents application crashes.
-
-# 1.1.0+1
-* Modified `_matchesId` in `MapService` to support custom ID fields.
-
-# 1.1.0
-* The default `errorHandler` now only sends HTML if the user explicitly accepts it.
-
-# 1.1.0-alpha+9
-* Fixed a bug that prevented `isProduction` from ever returning `true`.
-    * This enabled caching, which greatly improved performance.
-* Requests no longer have independent zones, which greatly improved performance.
-* `FormatException`, when caught, is automatically transformed in a `400` error response.
-* Added `extension` to `RequestContext`.
-* Added `strict` to `RequestContext#accepts`.
-* Added a `toString` override for the `Providers` class.
-* Returned to `RegExp` for stripping stray slashes.
-* The request path is now only parsed once.
-* Optimized the parsing of the `ACCEPT_ENCODING` header.
-
-# 1.1.0-alpha+8
-* Added an `autoIdAndDateFields` flag to `MapService`. Finally.
-
-# 1.1.0-alpha+7
-* Made `handlerCache` public.
-* Added `AngelMetrics`.
-
-# 1.1.0-alpha+6
-* Added `@Parameter()` annotations, with support for pattern matching.
-
-# 1.1.0-alpha+5
-* Closed [#166](https://github.com/angel-dart/framework/issues/166), killing any hanging `Stopwatch` instances when streaming.
-* Removed `AngelPlugin` and `AngelMiddleware`, as well as the `@proxy` annotations from `Angel` and `RequestContext`.
-* Officially deprecated `properties` in `Angel`.
-* Fixed a bug where cached routes would not heed the request method. [#173](https://github.com/angel-dart/framework/issues/173)
-* Reworked error handling logic; now, errors will not automatically default to sending JSON.
-* Removed the `onController` stream from `Angel`.
-* Controllers now longer use `call`, which has now been renamed to `configureServer`.
-
-# 1.1.0-alpha+4
-* Made `injections` in `RequestContext` private.
-* Renamed `properties` in `AngelBase` to `configuration`.
-
-# 1.1.0-alpha+3
-* Fixed a bug where `encoders` would cause a malformed response to be sent.
-* Fixed a bug where `encoders` would not always use the correct encoder.
-
-# 1.1.0-alpha
-* Removed `AngelFatalError`, and subsequently `fatalErrorStream`.
-* Removed all `@deprecated` members.
-* Removed `@Hooked`, `beforeProcessed`, and `afterProcessed`.
\ No newline at end of file
+* Moved `TypedService` into `package:angel_typed_service`.
\ No newline at end of file

From 010b878b6beba7bdaed301d722fcdfe136d17f74 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:45:34 -0400
Subject: [PATCH 242/414] Remove Jael example

---
 example/templating.dart | 24 ------------------------
 pubspec.yaml            |  1 -
 2 files changed, 25 deletions(-)
 delete mode 100644 example/templating.dart

diff --git a/example/templating.dart b/example/templating.dart
deleted file mode 100644
index 118013c7..00000000
--- a/example/templating.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'dart:io';
-import 'package:angel_container/mirrors.dart';
-import 'package:angel_framework/angel_framework.dart';
-import 'package:angel_jael/angel_jael.dart';
-import 'package:file/local.dart';
-import 'package:logging/logging.dart';
-import 'package:path/path.dart' as p;
-
-main() async {
-  var app = new Angel(reflector: MirrorsReflector())
-    ..lazyParseBodies = true
-    ..logger = (new Logger('angel')..onRecord.listen(print))
-    ..encoders.addAll({'gzip': gzip.encoder});
-  var fs = const LocalFileSystem();
-  var viewsDirPath = p.join(p.dirname(p.fromUri(Platform.script)), 'views');
-  await app.configure(jael(fs.directory(viewsDirPath)));
-
-  app.get('/', (ResponseContext res) => res.render('index'));
-
-  var http = new AngelHttp(app);
-  var server = await http.startServer('127.0.0.1', 3000);
-  var url = 'http://${server.address.address}:${server.port}';
-  print('Listening at $url');
-}
diff --git a/pubspec.yaml b/pubspec.yaml
index 3ba66a2c..786f0602 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,7 +25,6 @@ dependencies:
   stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
-  #angel_jael: ^1.0.0
   file: ^5.0.0
   http: ^0.11.3
   io: ^0.3.0

From 4b768df7f2fc980789eb6d0b6c9f1e17a7201e44 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:45:55 -0400
Subject: [PATCH 243/414] Depend on package:file

---
 .idea/workspace.xml | 165 +++++++++++++++++++-------------------------
 pubspec.yaml        |   6 +-
 2 files changed, 73 insertions(+), 98 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 61301373..c9b9949e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,33 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Strip out TypedService">
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/handle_error.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/templating.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/templating.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/view.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/accepts_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/accepts_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/extension_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/extension_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/view_generator_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" afterDir="false" />
-    </list>
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -49,15 +23,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5114">
-              <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -79,6 +44,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="64">
+              <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -96,6 +70,18 @@
           <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="176">
+                <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -108,7 +94,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="64">
@@ -141,15 +127,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="16">
-              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -285,12 +262,10 @@
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
@@ -298,6 +273,8 @@
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -716,28 +693,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="4117000" />
-    </task>
-    <task id="LOCAL-00069" summary="Created pkg:framework/http.dart">
-      <created>1517982261106</created>
-      <option name="number" value="00069" />
-      <option name="presentableId" value="LOCAL-00069" />
-      <option name="project" value="LOCAL" />
-      <updated>1517982261107</updated>
-    </task>
-    <task id="LOCAL-00070" summary="AnonymousService now takes FutureOr">
-      <created>1517982419998</created>
-      <option name="number" value="00070" />
-      <option name="presentableId" value="LOCAL-00070" />
-      <option name="project" value="LOCAL" />
-      <updated>1517982419999</updated>
-    </task>
-    <task id="LOCAL-00071" summary="`Service.toId` no longer only takes a `String`">
-      <created>1517982512124</created>
-      <option name="number" value="00071" />
-      <option name="presentableId" value="LOCAL-00071" />
-      <option name="project" value="LOCAL" />
-      <updated>1517982512124</updated>
+      <workItem from="1534547885788" duration="4416000" />
     </task>
     <task id="LOCAL-00072" summary="IDEA">
       <created>1517982682803</created>
@@ -1061,7 +1017,28 @@
       <option name="project" value="LOCAL" />
       <updated>1534732668246</updated>
     </task>
-    <option name="localTasksCounter" value="118" />
+    <task id="LOCAL-00118" summary="Make reflector a named parameter">
+      <created>1534732811445</created>
+      <option name="number" value="00118" />
+      <option name="presentableId" value="LOCAL-00118" />
+      <option name="project" value="LOCAL" />
+      <updated>1534732811445</updated>
+    </task>
+    <task id="LOCAL-00119" summary="Force dep on Dart &gt;=2.0.0-dev">
+      <created>1534732848038</created>
+      <option name="number" value="00119" />
+      <option name="presentableId" value="LOCAL-00119" />
+      <option name="project" value="LOCAL" />
+      <updated>1534732848038</updated>
+    </task>
+    <task id="LOCAL-00120" summary="CHANGELOG now only reflects on 2.0.0-alpha+">
+      <created>1534732927698</created>
+      <option name="number" value="00120" />
+      <option name="presentableId" value="LOCAL-00120" />
+      <option name="project" value="LOCAL" />
+      <updated>1534732927698</updated>
+    </task>
+    <option name="localTasksCounter" value="121" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1097,7 +1074,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="166416000" />
+    <option name="totallyTimeSpent" value="166715000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1117,7 +1094,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1160,9 +1137,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Provide custom IsInstanceOf for testing" />
-    <MESSAGE value="Tracked down the rogue &quot;null&quot; print" />
-    <MESSAGE value="CHANGELOG, bump to 1.1.4+8" />
     <MESSAGE value="Patch services_test for strong mode" />
     <MESSAGE value="More &lt;String, String&gt; patches in tests" />
     <MESSAGE value="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774" />
@@ -1185,7 +1159,10 @@
     <MESSAGE value="Remove lib/hooks.dart" />
     <MESSAGE value="Remove lib/common.dart" />
     <MESSAGE value="Strip out TypedService" />
-    <option name="LAST_COMMIT_MESSAGE" value="Strip out TypedService" />
+    <MESSAGE value="Make reflector a named parameter" />
+    <MESSAGE value="Force dep on Dart &gt;=2.0.0-dev" />
+    <MESSAGE value="CHANGELOG now only reflects on 2.0.0-alpha+" />
+    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG now only reflects on 2.0.0-alpha+" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1414,13 +1391,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="53">
-          <caret line="5" column="12" lean-forward="true" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1489,16 +1459,6 @@
     <entry file="file://$PROJECT_DIR$/lib/common.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="176">
-            <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1576,6 +1536,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="176">
+            <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/pubspec.yaml b/pubspec.yaml
index 786f0602..d792ce96 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,6 +14,7 @@ dependencies:
   charcode: ^1.0.0
   combinator: ">=1.0.0-beta <2.0.0"
   dart2_constant: ^1.0.0
+  file: ^5.0.0
   http_parser: ^3.0.0
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
@@ -25,10 +26,7 @@ dependencies:
   stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:
-  file: ^5.0.0
   http: ^0.11.3
   io: ^0.3.0
   mock_request: ^1.0.0
-  test: ^1.0.0
-dependency_overrides:
-  file: ^5.0.0
\ No newline at end of file
+  test: ^1.0.0
\ No newline at end of file

From 7c7727a94cf0fef48e13764214313703618b66d3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:46:48 -0400
Subject: [PATCH 244/414] Upgrade combinator dependency

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index d792ce96..4e9c198e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   angel_route: ^2.0.0
   body_parser: ^1.0.0-dev
   charcode: ^1.0.0
-  combinator: ">=1.0.0-beta <2.0.0"
+  combinator: ^1.0.0
   dart2_constant: ^1.0.0
   file: ^5.0.0
   http_parser: ^3.0.0

From 362eef18490622d316f30ac09e70b040c4b62a29 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:47:22 -0400
Subject: [PATCH 245/414] Upgrade body_parser dependency

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 4e9c198e..42bd17cc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0
   angel_route: ^2.0.0
-  body_parser: ^1.0.0-dev
+  body_parser: ^1.0.0
   charcode: ^1.0.0
   combinator: ^1.0.0
   dart2_constant: ^1.0.0

From 1fcb57d53b1e99fb4f528a803d15ff7c0786fb10 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:50:36 -0400
Subject: [PATCH 246/414] Update description

---
 pubspec.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 42bd17cc..9a7b05b4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,11 @@
 name: angel_framework
 version: 2.0.0-alpha
-description: A high-powered HTTP server with DI, routing and more.
+description: >
+  A high-powered HTTP server with DI, routing and more.
+  When combined with the other packages in the Angel ecosystem, this
+  package can be used to make robust application servers for API's,
+  traditional server-side applications, and much more, along with
+  a rich client API.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
@@ -21,7 +26,7 @@ dependencies:
   merge_map: ^1.0.0
   meta: ^1.0.0
   mime: ^0.9.3
-  path: ">=1.0.0 <2.0.0"
+  path: ^1.0.0
   pool: ^1.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0

From 79818cf00189067cd0243b1b3f41a35438be2126 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:55:54 -0400
Subject: [PATCH 247/414] Completely removed the `AngelBase` class

---
 CHANGELOG.md                 |  3 ++-
 lib/src/core/angel_base.dart | 50 ------------------------------------
 lib/src/core/routable.dart   |  2 +-
 lib/src/core/server.dart     | 47 ++++++++++++++++++++++++++++-----
 lib/src/core/service.dart    |  4 +--
 5 files changed, 46 insertions(+), 60 deletions(-)
 delete mode 100644 lib/src/core/angel_base.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 287c5f52..b4402878 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,4 +9,5 @@
 * Remove dependency on `package:dart2_constant`.
 * Remove `contentType` argument in `ResponseContext.serialize`.
 * Moved `lib/hooks.dart` into `package:angel_hooks`.
-* Moved `TypedService` into `package:angel_typed_service`.
\ No newline at end of file
+* Moved `TypedService` into `package:angel_typed_service`.
+* Completely removed the `AngelBase` class.
\ No newline at end of file
diff --git a/lib/src/core/angel_base.dart b/lib/src/core/angel_base.dart
deleted file mode 100644
index a1d0cc37..00000000
--- a/lib/src/core/angel_base.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-library angel_framework.http.angel_base;
-
-import 'dart:async';
-
-import 'package:angel_container/angel_container.dart';
-
-import 'routable.dart';
-
-/// A function that asynchronously generates a view from the given path and data.
-typedef FutureOr<String> ViewGenerator(String path,
-    [Map<String, dynamic> data]);
-
-/// Base class for Angel servers. Do not bother extending this.
-class AngelBase extends Routable {
-  static ViewGenerator noViewEngineConfigured =
-      (String view, [Map data]) => 'No view engine has been configured yet.';
-
-  Container _container;
-
-  AngelBase(Reflector reflector) {
-    _container = new Container(reflector);
-  }
-
-  final Map configuration = {};
-
-  /// When set to true, the request body will not be parsed
-  /// automatically. You can call `req.parse()` manually,
-  /// or use `lazyBody()`.
-  bool lazyParseBodies = false;
-
-  /// When set to `true`, the original body bytes will be stored
-  /// on requests. `false` by default.
-  bool storeOriginalBuffer = false;
-
-  /// A [Container] used to inject dependencies.
-  Container get container => _container;
-
-  /// A function that renders views.
-  ///
-  /// Called by [ResponseContext]@`render`.
-  ViewGenerator viewGenerator = noViewEngineConfigured;
-
-  /// Closes this instance, rendering it **COMPLETELY DEFUNCT**.
-  Future close() {
-    super.close();
-    _container = null;
-    viewGenerator = noViewEngineConfigured;
-    return new Future.value();
-  }
-}
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index f39ae109..ec9c1fcf 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -129,7 +129,7 @@ class Routable extends Router {
 
     final handlers = [];
 
-    if (_router is AngelBase) {
+    if (_router is Angel) {
       handlers.add((RequestContext req, ResponseContext res) {
         req.app = _router as Angel;
         res.app = _router as Angel;
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 40fd18ac..5caa5413 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -15,7 +15,6 @@ import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
 
 import '../http/http.dart';
-import 'angel_base.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -32,8 +31,15 @@ typedef Future<HttpServer> ServerGenerator(address, int port);
 /// A function that configures an [Angel] server in some way.
 typedef FutureOr AngelConfigurer(Angel app);
 
+/// A function that asynchronously generates a view from the given path and data.
+typedef FutureOr<String> ViewGenerator(String path,
+    [Map<String, dynamic> data]);
+
 /// A powerful real-time/REST/MVC server class.
-class Angel extends AngelBase {
+class Angel extends Routable {
+  static ViewGenerator noViewEngineConfigured =
+      (String view, [Map data]) => 'No view engine has been configured yet.';
+
   final List<Angel> _children = [];
   final Map<String, Tuple3<List, Map, ParseResult<Map<String, dynamic>>>>
       handlerCache = new HashMap();
@@ -118,6 +124,33 @@ class Angel extends AngelBase {
   /// All global dependencies injected into the application.
   Map get injections => _injections;
 
+  Container _container;
+
+  /// A [Map] of application-specific data that can be accessed by any
+  /// piece of code that can see this [Angel] instance.
+  ///
+  /// Packages like `package:angel_configuration` populate this map
+  /// for you.
+  final Map configuration = {};
+
+  /// When set to true, the request body will not be parsed
+  /// automatically. You can call `req.parse()` manually,
+  /// or use `lazyBody()`.
+  bool lazyParseBodies = false;
+
+  /// When set to `true`, the original body bytes will be stored
+  /// on requests. `false` by default.
+  bool storeOriginalBuffer = false;
+
+  /// A [Container] used to inject dependencies.
+  Container get container => _container;
+
+  /// A function that renders views.
+  ///
+  /// Called by [ResponseContext]@`render`.
+  ViewGenerator viewGenerator = noViewEngineConfigured;
+
+  /// //
   /// Use [configuration] instead.
   @deprecated
   Map get properties {
@@ -196,7 +229,7 @@ class Angel extends AngelBase {
   /// Loads some base dependencies into the service container.
   void bootstrapContainer() {
     if (runtimeType != Angel) container.singleton(this, as: Angel);
-    container.singleton(this, as: AngelBase);
+    container.singleton(this, as: Angel);
     container.singleton(this, as: Routable);
     container.singleton(this, as: Router);
     container.singleton(this);
@@ -204,13 +237,15 @@ class Angel extends AngelBase {
 
   /// Shuts down the server, and closes any open [StreamController]s.
   ///
-  /// The server will be **COMPLETE DEFUNCT** after this operation!
+  /// The server will be **COMPLETELY DEFUNCT** after this operation!
   Future close() {
     Future.forEach(services.values, (Service service) {
       service.close();
     });
 
     super.close();
+    _container = null;
+    viewGenerator = noViewEngineConfigured;
     _preContained.clear();
     handlerCache.clear();
     _injections.clear();
@@ -484,8 +519,8 @@ class Angel extends AngelBase {
     return super.use(path, routable, namespace);
   }
 
-  /// Default constructor. ;)
-  Angel({@required Reflector reflector}) : super(reflector) {
+  Angel({@required Reflector reflector}) {
+    _container = new Container(reflector);
     bootstrapContainer();
     // ignore: deprecated_member_use
     createZoneForRequest = defaultZoneCreator;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 659ee639..521e5bb7 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -4,12 +4,12 @@ import 'dart:async';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
 import '../util.dart';
-import 'angel_base.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
+import 'server.dart';
 
 /// Indicates how the service was accessed.
 ///
@@ -59,7 +59,7 @@ class Service extends Routable {
   List get bootstrappers => [];
 
   /// The [Angel] app powering this service.
-  AngelBase app;
+  Angel app;
 
   /// Closes this service, including any database connections or stream controllers.
   void close() {}

From 99f9569695edea68bdea082f47b0f614d9188c1d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 22:56:20 -0400
Subject: [PATCH 248/414] Completely removed the `AngelBase` class

---
 lib/src/core/core.dart     | 1 -
 lib/src/core/routable.dart | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index 999b2a6c..ebda0587 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -1,4 +1,3 @@
-export 'angel_base.dart';
 export 'anonymous_service.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index ec9c1fcf..7cee202a 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -3,7 +3,6 @@ library angel_framework.http.routable;
 import 'dart:async';
 import 'package:angel_route/angel_route.dart';
 import '../util.dart';
-import 'angel_base.dart';
 import 'hooked_service.dart';
 import 'metadata.dart';
 import 'request_context.dart';

From 41e70787bc18fc4eebfd9e77566b70f27a416f11 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:06:29 -0400
Subject: [PATCH 249/414] Remove all usage of dart2_constant

---
 .idea/workspace.xml                | 562 +++++++++++++++--------------
 example/json.dart                  |   2 +-
 lib/src/core/injection.dart        |   2 +-
 lib/src/core/response_context.dart |   3 +-
 lib/src/core/routable.dart         |   2 +-
 lib/src/core/service.dart          |   8 +-
 lib/src/http/angel_http.dart       |   3 +-
 test/controller_test.dart          |   8 +-
 test/di_test.dart                  |   2 +-
 test/encoders_buffer_test.dart     |   4 +-
 test/exception_test.dart           |   2 +-
 test/general_test.dart             |   2 +-
 test/parameter_meta_test.dart      |   2 +-
 test/precontained_test.dart        |   2 +-
 test/primitives_test.dart          |   2 +-
 test/repeat_request_test.dart      |   2 +-
 test/routing_test.dart             |   2 +-
 test/server_test.dart              |   2 +-
 test/services_test.dart            |   2 +-
 test/streaming_test.dart           |   4 +-
 20 files changed, 327 insertions(+), 291 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c9b9949e..7254fb9a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="" />
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Completely removed the `AngelBase` class">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+    </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -23,10 +44,77 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="214">
+              <caret line="551" column="15" selection-start-line="205" selection-start-column="24" selection-end-line="205" selection-end-column="30" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="291">
+              <caret line="321" column="37" lean-forward="true" selection-start-line="321" selection-start-column="37" selection-end-line="321" selection-end-column="37" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="48">
+              <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="928">
+              <caret line="58" column="58" lean-forward="true" selection-start-line="58" selection-start-column="58" selection-end-line="58" selection-end-column="58" />
+              <folding>
+                <element signature="e#40#60#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="core.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#1#33#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#1#31#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-611">
+            <state relative-caret-position="-1338">
               <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
               <folding>
                 <element signature="e#0#22#0" expanded="true" />
@@ -35,98 +123,39 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="all.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/all.dart">
+      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="352">
-              <caret line="22" column="42" selection-start-line="22" selection-start-column="42" selection-end-line="22" selection-end-column="42" />
+            <state relative-caret-position="608">
+              <caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="438">
-              <caret line="105" column="35" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
+            <state relative-caret-position="576">
+              <caret line="36" column="11" lean-forward="true" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
               <folding>
-                <element signature="e#0#46#0" expanded="true" />
+                <element signature="e#39#59#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="typed_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="176">
-                <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
+              <first_editor relative-caret-position="192">
+                <caret line="12" column="42" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="42" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="487" column="47" lean-forward="true" selection-start-line="487" selection-start-column="47" selection-end-line="487" selection-end-column="47" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_base.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="19" column="2" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
-              <folding>
-                <element signature="e#42#62#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="templating.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/templating.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
-              <folding>
-                <element signature="e#0#17#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -139,16 +168,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>cast(&lt;[^&gt;]+&gt;)\(\)</find>
-      <find>\.cast(&lt;[^&gt;]+&gt;)\(\)</find>
-      <find>.cast</find>
-      <find>serviceP</find>
-      <find>_inject</find>
-      <find>Typ</find>
-      <find>TypeMatcher</find>
-      <find>cast(</find>
-      <find>print</find>
-      <find>unmodi</find>
       <find>_lock()</find>
       <find>unmofi</find>
       <find>Map&lt;String,</find>
@@ -169,10 +188,18 @@
       <find>god.deserialize</find>
       <find>reflector</find>
       <find>Angel(M</find>
+      <find>pool</find>
+      <find>super</find>
+      <find>close()</find>
+      <find>close(</find>
+      <find>DEFUNC</find>
+      <find>const</find>
+      <find>dart2_constant/convert.dart</find>
+      <find>dart2_constant/io.dart</find>
+      <find>package:dart:convert</find>
+      <find>package:dart:io</find>
     </findStrings>
     <replaceStrings>
-      <replace>req.path`</replace>
-      <replace>autoSnakeCaseNames == false ? $0 : '$1ated_at'</replace>
       <replace>appa</replace>
       <replace>isClosed</replace>
       <replace>useStream</replace>
@@ -201,6 +228,8 @@
       <replace>json.encode</replace>
       <replace>json.decode</replace>
       <replace>Angel(reflector: M</replace>
+      <replace>dart:convert</replace>
+      <replace>dart:io</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -224,11 +253,9 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/stats/stats.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
@@ -238,7 +265,6 @@
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
@@ -249,21 +275,16 @@
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
@@ -271,10 +292,18 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
       </list>
     </option>
   </component>
@@ -693,56 +722,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="4416000" />
-    </task>
-    <task id="LOCAL-00072" summary="IDEA">
-      <created>1517982682803</created>
-      <option name="number" value="00072" />
-      <option name="presentableId" value="LOCAL-00072" />
-      <option name="project" value="LOCAL" />
-      <updated>1517982682804</updated>
-    </task>
-    <task id="LOCAL-00073" summary="README update">
-      <created>1517982740969</created>
-      <option name="number" value="00073" />
-      <option name="presentableId" value="LOCAL-00073" />
-      <option name="project" value="LOCAL" />
-      <updated>1517982740969</updated>
-    </task>
-    <task id="LOCAL-00074" summary="Pubspec -&gt; v1.1.1">
-      <created>1517982826744</created>
-      <option name="number" value="00074" />
-      <option name="presentableId" value="LOCAL-00074" />
-      <option name="project" value="LOCAL" />
-      <updated>1517982826744</updated>
-    </task>
-    <task id="LOCAL-00075" summary="MapService dates will be strings">
-      <created>1522434816896</created>
-      <option name="number" value="00075" />
-      <option name="presentableId" value="LOCAL-00075" />
-      <option name="project" value="LOCAL" />
-      <updated>1522434816901</updated>
-    </task>
-    <task id="LOCAL-00076" summary="Bring back zones; mysterious hang">
-      <created>1523043790358</created>
-      <option name="number" value="00076" />
-      <option name="presentableId" value="LOCAL-00076" />
-      <option name="project" value="LOCAL" />
-      <updated>1523043790361</updated>
-    </task>
-    <task id="LOCAL-00077" summary="Fixed tests">
-      <created>1523043958692</created>
-      <option name="number" value="00077" />
-      <option name="presentableId" value="LOCAL-00077" />
-      <option name="project" value="LOCAL" />
-      <updated>1523043958692</updated>
-    </task>
-    <task id="LOCAL-00078" summary="CHANGELOG">
-      <created>1523043988632</created>
-      <option name="number" value="00078" />
-      <option name="presentableId" value="LOCAL-00078" />
-      <option name="project" value="LOCAL" />
-      <updated>1523043988632</updated>
+      <workItem from="1534547885788" duration="5692000" />
     </task>
     <task id="LOCAL-00079" summary="Update example">
       <created>1523044574359</created>
@@ -1038,7 +1018,56 @@
       <option name="project" value="LOCAL" />
       <updated>1534732927698</updated>
     </task>
-    <option name="localTasksCounter" value="121" />
+    <task id="LOCAL-00121" summary="Remove Jael example">
+      <created>1534733134792</created>
+      <option name="number" value="00121" />
+      <option name="presentableId" value="LOCAL-00121" />
+      <option name="project" value="LOCAL" />
+      <updated>1534733134792</updated>
+    </task>
+    <task id="LOCAL-00122" summary="Depend on package:file">
+      <created>1534733155846</created>
+      <option name="number" value="00122" />
+      <option name="presentableId" value="LOCAL-00122" />
+      <option name="project" value="LOCAL" />
+      <updated>1534733155846</updated>
+    </task>
+    <task id="LOCAL-00123" summary="Upgrade combinator dependency">
+      <created>1534733208240</created>
+      <option name="number" value="00123" />
+      <option name="presentableId" value="LOCAL-00123" />
+      <option name="project" value="LOCAL" />
+      <updated>1534733208240</updated>
+    </task>
+    <task id="LOCAL-00124" summary="Upgrade body_parser dependency">
+      <created>1534733242302</created>
+      <option name="number" value="00124" />
+      <option name="presentableId" value="LOCAL-00124" />
+      <option name="project" value="LOCAL" />
+      <updated>1534733242302</updated>
+    </task>
+    <task id="LOCAL-00125" summary="Update description">
+      <created>1534733436519</created>
+      <option name="number" value="00125" />
+      <option name="presentableId" value="LOCAL-00125" />
+      <option name="project" value="LOCAL" />
+      <updated>1534733436520</updated>
+    </task>
+    <task id="LOCAL-00126" summary="Completely removed the `AngelBase` class">
+      <created>1534733754509</created>
+      <option name="number" value="00126" />
+      <option name="presentableId" value="LOCAL-00126" />
+      <option name="project" value="LOCAL" />
+      <updated>1534733754509</updated>
+    </task>
+    <task id="LOCAL-00127" summary="Completely removed the `AngelBase` class">
+      <created>1534733780470</created>
+      <option name="number" value="00127" />
+      <option name="presentableId" value="LOCAL-00127" />
+      <option name="project" value="LOCAL" />
+      <updated>1534733780470</updated>
+    </task>
+    <option name="localTasksCounter" value="128" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1074,7 +1103,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="166715000" />
+    <option name="totallyTimeSpent" value="167991000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1112,7 +1141,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1137,12 +1166,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Patch services_test for strong mode" />
-    <MESSAGE value="More &lt;String, String&gt; patches in tests" />
-    <MESSAGE value="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774" />
-    <MESSAGE value="* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of&#10;`as`-casting them to `Map&lt;String, dynamic&gt;`." />
-    <MESSAGE value="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9" />
-    <MESSAGE value="Patch" />
     <MESSAGE value="Bump" />
     <MESSAGE value="Finalizers before sending" />
     <MESSAGE value="Added findOne to `Service`" />
@@ -1162,7 +1185,13 @@
     <MESSAGE value="Make reflector a named parameter" />
     <MESSAGE value="Force dep on Dart &gt;=2.0.0-dev" />
     <MESSAGE value="CHANGELOG now only reflects on 2.0.0-alpha+" />
-    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG now only reflects on 2.0.0-alpha+" />
+    <MESSAGE value="Remove Jael example" />
+    <MESSAGE value="Depend on package:file" />
+    <MESSAGE value="Upgrade combinator dependency" />
+    <MESSAGE value="Upgrade body_parser dependency" />
+    <MESSAGE value="Update description" />
+    <MESSAGE value="Completely removed the `AngelBase` class" />
+    <option name="LAST_COMMIT_MESSAGE" value="Completely removed the `AngelBase` class" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1170,27 +1199,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="39" column="11" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hm.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="6" column="76" selection-start-line="6" selection-start-column="76" selection-end-line="6" selection-end-column="76" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="43">
-          <caret line="141" lean-forward="true" selection-start-line="141" selection-end-line="141" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/io/platform.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="284">
@@ -1247,13 +1255,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="37" column="18" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="400">
@@ -1302,13 +1303,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="12" column="20" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1340,13 +1334,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="417">
-          <caret line="88" column="34" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -1422,23 +1409,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3930">
-          <caret line="171" column="23" selection-start-line="171" selection-start-column="23" selection-end-line="171" selection-end-column="23" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5114">
-          <caret line="13" column="40" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="257">
@@ -1459,9 +1429,6 @@
     <entry file="file://$PROJECT_DIR$/lib/common.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1475,13 +1442,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib/src/mirrors/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-611">
-          <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="96">
+          <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/templating.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="7" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="10" column="12" lean-forward="true" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
         </state>
       </provider>
     </entry>
@@ -1492,42 +1470,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib/src/mirrors/reflector.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/templating.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="19" column="2" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="487" column="47" lean-forward="true" selection-start-line="487" selection-start-column="47" selection-end-line="487" selection-end-column="47" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1536,23 +1480,115 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" />
+        <state relative-caret-position="128">
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="576">
+          <caret line="36" column="11" lean-forward="true" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="176">
-            <caret line="11" column="58" selection-start-line="11" selection-start-column="58" selection-end-line="11" selection-end-column="58" />
+          <first_editor relative-caret-position="192">
+            <caret line="12" column="42" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="42" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#1#33#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1338">
+          <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="608">
+          <caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="928">
+          <caret line="58" column="58" lean-forward="true" selection-start-line="58" selection-start-column="58" selection-end-line="58" selection-end-column="58" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="214">
+          <caret line="551" column="15" selection-start-line="205" selection-start-column="24" selection-end-line="205" selection-end-column="30" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#1#31#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="291">
+          <caret line="321" column="37" lean-forward="true" selection-start-line="321" selection-start-column="37" selection-end-line="321" selection-end-column="37" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/example/json.dart b/example/json.dart
index cc6b3b70..93b65b19 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:isolate';
-import 'package:dart2_constant/convert.dart';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 9c3ebbe2..a70ee45f 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -1,6 +1,6 @@
 part of angel_framework.http.request_context;
 
-const List<Type> _primitiveTypes = const [String, int, num, double, Null];
+const List<Type> _primitiveTypes =  [String, int, num, double, Null];
 
 /// Shortcut for calling [preInject], and then [handleContained].
 ///
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 7bb0eb6c..d9382088 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -1,12 +1,11 @@
 library angel_framework.http.response_context;
 
 import 'dart:async';
-import 'dart:convert' show Converter, Encoding;
+import 'dart:convert';
 import 'dart:convert' as c show json;
 import 'dart:io' show BytesBuilder, Cookie, HttpResponse;
 
 import 'package:angel_route/angel_route.dart';
-import 'package:dart2_constant/convert.dart';
 import 'package:file/file.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:mime/mime.dart';
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 7cee202a..1f0e1aef 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -58,7 +58,7 @@ class Routable extends Router {
 
   /// Additional filters to be run on designated requests.
   @override
-  final Map<String, RequestHandler> requestMiddleware = {};
+  final Map<String, RequestHandler> requestMiddleware = <String, RequestHandler>{};
 
   /// A set of [Service] objects that have been mapped into routes.
   Map<Pattern, Service> get services => _services;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 521e5bb7..90b75409 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -26,13 +26,13 @@ class Providers {
   static const String viaGraphQL = "graphql";
 
   /// Represents a request via REST.
-  static const Providers rest = const Providers(viaRest);
+  static const Providers rest = Providers(viaRest);
 
   /// Represents a request over WebSockets.
-  static const Providers websocket = const Providers(viaWebsocket);
+  static const Providers websocket =  Providers(viaWebsocket);
 
   /// Represents a request parsed from GraphQL.
-  static const Providers graphql = const Providers(viaGraphQL);
+  static const Providers graphql = Providers(viaGraphQL);
 
   @override
   bool operator ==(other) => other is Providers && other.via == via;
@@ -48,7 +48,7 @@ class Providers {
 /// Heavily inspired by FeathersJS. <3
 class Service extends Routable {
   /// A [List] of keys that services should ignore, should they see them in the query.
-  static const List<String> specialQueryKeys = const [
+  static const List<String> specialQueryKeys = <String> [
     r'$limit',
     r'$sort',
     'page',
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index e55bc041..376e4c43 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -11,7 +11,6 @@ import 'dart:io'
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
-import 'package:dart2_constant/io.dart';
 import 'package:pool/pool.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:tuple/tuple.dart';
@@ -237,7 +236,7 @@ class AngelHttp {
       try {
         app.logger?.severe(e, st);
         request.response
-          ..statusCode = HttpStatus.internalServerError
+          ..statusCode = 500
           ..write('500 Internal Server Error')
           ..close();
       } finally {
diff --git a/test/controller_test.dart b/test/controller_test.dart
index ab354335..ba6f450e 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -1,18 +1,20 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
+
 import 'common.dart';
 
-@Expose("/todos", middleware: const ["foo"])
+@Expose("/todos", middleware: ["foo"])
 class TodoController extends Controller {
   List<Todo> todos = [new Todo(text: "Hello", over: "world")];
 
-  @Expose("/:id", middleware: const ["bar"])
+  @Expose("/:id", middleware: ["bar"])
   Future<Todo> fetchTodo(
       String id, RequestContext req, ResponseContext res) async {
     expect(req, isNotNull);
diff --git a/test/di_test.dart b/test/di_test.dart
index 02fa485e..46dd25f6 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 import 'common.dart';
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index aa4f4792..da172cc0 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 import 'dart:io' show BytesBuilder;
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
-import 'package:dart2_constant/io.dart';
+import 'dart:convert';
+import 'dart:io';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/exception_test.dart b/test/exception_test.dart
index 0e23f5b4..3bd6ec5c 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -1,5 +1,5 @@
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:matcher/matcher.dart';
 import 'package:test/test.dart';
 
diff --git a/test/general_test.dart b/test/general_test.dart
index 93b60faf..8874f9f7 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index a5b1e9db..2df52004 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 6f88526e..afb86952 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -1,6 +1,6 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 3e01d56d..a35caa9f 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -1,7 +1,7 @@
+import 'dart:convert';
 import 'dart:io' show stderr;
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index 5ae563c6..0b526394 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 838bbf07..a193d55e 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:io/ansi.dart';
 import 'package:logging/logging.dart';
diff --git a/test/server_test.dart b/test/server_test.dart
index 6126d322..3f6531cb 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:matcher/matcher.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
diff --git a/test/services_test.dart b/test/services_test.dart
index a6759d0c..45c5c585 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,6 +1,6 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
+import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:stack_trace/stack_trace.dart';
 import 'package:test/test.dart';
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index f1b9649a..046788b7 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 import 'dart:io' show stderr;
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:dart2_constant/convert.dart';
-import 'package:dart2_constant/io.dart';
+import 'dart:convert';
+import 'dart:io';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';

From d211804cd859d777d43c6a93979feaa248c48995 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:18:19 -0400
Subject: [PATCH 250/414] Add more to parseId

---
 CHANGELOG.md                       |   3 +-
 lib/src/core/hooked_service.dart   |   1 +
 lib/src/core/response_context.dart |   6 --
 lib/src/core/routable.dart         |   8 --
 lib/src/core/server.dart           | 129 ++---------------------------
 lib/src/core/service.dart          |  32 ++++---
 6 files changed, 30 insertions(+), 149 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4402878..bc9389b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,4 +10,5 @@
 * Remove `contentType` argument in `ResponseContext.serialize`.
 * Moved `lib/hooks.dart` into `package:angel_hooks`.
 * Moved `TypedService` into `package:angel_typed_service`.
-* Completely removed the `AngelBase` class.
\ No newline at end of file
+* Completely removed the `AngelBase` class.
+* Removed all `@deprecated` symbols.
\ No newline at end of file
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 17dc5b31..b123781b 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -553,6 +553,7 @@ class HookedServiceEventDispatcher {
   /// *NOTE*: Callbacks on the returned [Stream] cannot be guaranteed to run before other [listeners].
   /// Use this only if you need a read-only stream of events.
   Stream<HookedServiceEvent> asStream() {
+    // TODO: Close StreamController
     var ctrl = new StreamController<HookedServiceEvent>();
     _ctrl.add(ctrl);
     listen(ctrl.add);
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index d9382088..0314c3da 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -17,12 +17,6 @@ import 'server.dart' show Angel;
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
-/// Serializes response data into a String.
-///
-/// Prefer the String Function(dynamic) syntax.
-@deprecated
-typedef String ResponseSerializer(data);
-
 /// A convenience wrapper around an outgoing HTTP request.
 abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 1f0e1aef..14fc90a2 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -71,14 +71,6 @@ class Routable extends Router {
   /// **NOTE**: This is a broadcast stream.
   Stream<Service> get onService => _onService.stream;
 
-  /// Assigns a middleware to a name for convenience.
-  @override
-  registerMiddleware(String name, middleware) {
-    assert(middleware is RequestMiddleware);
-    // ignore: deprecated_member_use
-    super.registerMiddleware(name, middleware);
-  }
-
   /// Retrieves the service assigned to the given path.
   Service service(Pattern path) =>
       _services[path] ??
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 5caa5413..f7e3d58c 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -6,7 +6,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:angel_container/angel_container.dart';
-import 'package:angel_container/mirrors.dart';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
@@ -22,12 +21,6 @@ import 'service.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
-/// A function that binds an [Angel] server to an Internet address and port.
-///
-/// Prefer the Future<HttpServer> Function(dynamic, int) syntax.
-@deprecated
-typedef Future<HttpServer> ServerGenerator(address, int port);
-
 /// A function that configures an [Angel] server in some way.
 typedef FutureOr AngelConfigurer(Angel app);
 
@@ -54,7 +47,11 @@ class Angel extends Routable {
 
   final Map _injections = {};
 
-  @deprecated
+  /// A function that is called on every request to create a [Zone], A.K.A an asynchronous
+  /// execution context.
+  ///
+  /// The utility of zones in Angel is to safely catch errors without crashing the application;
+  /// this also lets the driver wrap failures in instances of [AngelHttpException].
   Future<ZoneSpecification> Function(
           HttpRequest request, RequestContext req, ResponseContext res)
       createZoneForRequest;
@@ -95,11 +92,6 @@ class Angel extends Routable {
         (Platform.environment['ANGEL_ENV'] == 'production');
   }
 
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  ServerGenerator get serverGenerator =>
-      (_http ??= new AngelHttp(this)).serverGenerator;
-
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
 
@@ -150,22 +142,6 @@ class Angel extends Routable {
   /// Called by [ResponseContext]@`render`.
   ViewGenerator viewGenerator = noViewEngineConfigured;
 
-  /// //
-  /// Use [configuration] instead.
-  @deprecated
-  Map get properties {
-    try {
-      throw new Error();
-    } catch (e, st) {
-      logger?.warning(
-        '`properties` is deprecated, and should not be used.',
-        new UnsupportedError('`properties` is deprecated.'),
-        st,
-      );
-    }
-    return configuration;
-  }
-
   /// The handler currently configured to run on [AngelHttpException]s.
   Function(AngelHttpException e, RequestContext req, ResponseContext res)
       errorHandler =
@@ -190,17 +166,6 @@ class Angel extends Routable {
     res.end();
   };
 
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  HttpServer get httpServer => _http?.httpServer;
-
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  Future<HttpServer> startServer([address, int port]) {
-    _http ??= new AngelHttp(this);
-    return _http.startServer(address, port);
-  }
-
   @override
   Route addRoute(String method, Pattern path, Object handler,
       {List middleware: const []}) {
@@ -301,12 +266,6 @@ class Angel extends Routable {
     this.encoders.addAll(encoders);
   }
 
-  /// Prefer directly setting [serializer].
-  @deprecated
-  void injectSerializer(String serializer(x)) {
-    this.serializer = serializer;
-  }
-
   Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
     if (handler is RequestHandler) {
       var result = handler(req, res);
@@ -349,22 +308,6 @@ class Angel extends Routable {
     });
   }
 
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  Future<RequestContext> createRequestContext(HttpRequest request) {
-    _http ??= new AngelHttp(this);
-    return _http.createRequestContext(request);
-  }
-
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  Future<ResponseContext> createResponseContext(HttpResponse response,
-      [RequestContext correspondingRequest]) {
-    _http ??= new AngelHttp(this);
-
-    return _http.createResponseContext(response, correspondingRequest);
-  }
-
   /// Attempts to find a middleware by the given name within this application.
   findMiddleware(key) {
     if (requestMiddleware.containsKey(key)) return requestMiddleware[key];
@@ -377,23 +320,6 @@ class Angel extends Routable {
     return parent != null ? parent.findProperty(key) : null;
   }
 
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  Future handleAngelHttpException(AngelHttpException e, StackTrace st,
-      RequestContext req, ResponseContext res, HttpRequest request,
-      {bool ignoreFinalizers: false}) {
-    _http ??= new AngelHttp(this);
-    return _http.handleAngelHttpException(e, st, req, res, request,
-        ignoreFinalizers: ignoreFinalizers == true);
-  }
-
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  Future handleRequest(HttpRequest request) {
-    _http ??= new AngelHttp(this);
-    return _http.handleRequest(request);
-  }
-
   /// Runs several optimizations, *if* [isProduction] is `true`.
   ///
   /// * Preprocesses all dependency injection, and eliminates the burden of reflecting handlers
@@ -450,21 +376,6 @@ class Angel extends Routable {
     // return   closureMirror.apply(args).reflectee;
   }
 
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  Future sendResponse(
-      HttpRequest request, RequestContext req, ResponseContext res,
-      {bool ignoreFinalizers: false}) {
-    _http ??= new AngelHttp(this);
-    return _http.sendResponse(request, req, res);
-  }
-
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  void throttle(int maxConcurrentRequests, {Duration timeout}) {
-    _http?.throttle(maxConcurrentRequests, timeout: timeout);
-  }
-
   /// Applies an [AngelConfigurer] to this instance.
   Future configure(AngelConfigurer configurer) {
     return new Future.sync(() => configurer(this));
@@ -540,34 +451,4 @@ class Angel extends Routable {
       ),
     );
   }
-
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  factory Angel.custom(
-      Future<HttpServer> Function(dynamic, int) serverGenerator) {
-    var app = new Angel(reflector: MirrorsReflector());
-    return app.._http = new AngelHttp.custom(app, serverGenerator);
-  }
-
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  factory Angel.fromSecurityContext(SecurityContext context) {
-    var app = new Angel(reflector: MirrorsReflector());
-
-    app._http = new AngelHttp.custom(app, (address, int port) {
-      return HttpServer.bindSecure(address, port, context);
-    });
-
-    return app;
-  }
-
-  /// Use the serving methods in [AngelHttp] instead.
-  @deprecated
-  factory Angel.secure(String certificateChainPath, String serverKeyPath,
-      {String password}) {
-    var app = new Angel(reflector: MirrorsReflector());
-    return app
-      .._http = new AngelHttp.secure(app, certificateChainPath, serverKeyPath,
-          password: password);
-  }
 }
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 90b75409..28dde7c3 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -1,8 +1,10 @@
 library angel_framework.http.service;
 
 import 'dart:async';
+
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
+
 import '../util.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
@@ -29,7 +31,7 @@ class Providers {
   static const Providers rest = Providers(viaRest);
 
   /// Represents a request over WebSockets.
-  static const Providers websocket =  Providers(viaWebsocket);
+  static const Providers websocket = Providers(viaWebsocket);
 
   /// Represents a request parsed from GraphQL.
   static const Providers graphql = Providers(viaGraphQL);
@@ -48,7 +50,7 @@ class Providers {
 /// Heavily inspired by FeathersJS. <3
 class Service extends Routable {
   /// A [List] of keys that services should ignore, should they see them in the query.
-  static const List<String> specialQueryKeys = <String> [
+  static const List<String> specialQueryKeys = <String>[
     r'$limit',
     r'$sort',
     'page',
@@ -121,12 +123,22 @@ class Service extends Routable {
     throw new AngelHttpException.methodNotAllowed();
   }
 
-  /// Transforms an [id] string into one acceptable by a service.
-  toId<T>(T id) {
+  /// Transforms an [id] (whether it is a String, num, etc.) into one acceptable by a service.
+  T parseId<T>(id) {
     if (id == 'null' || id == null)
       return null;
+    else if (T == String)
+      return id.toString() as T;
+    else if (T == int)
+      return int.parse(id.toString()) as T;
+    else if (T == bool)
+      return (id == true || id?.toString() == 'true') as T;
+    else if (T == double)
+      return int.parse(id.toString()) as T;
+    else if (T == num)
+      return num.parse(id.toString()) as T;
     else
-      return id;
+      return id as T;
   }
 
   /// Generates RESTful routes pointing to this class's methods.
@@ -181,7 +193,7 @@ class Service extends Routable {
     get(
         '/:id',
         (RequestContext req, res) => this.read(
-            toId(req.params['id']),
+            parseId(req.params['id']),
             mergeMap([
               {'query': req.query},
               restProvider,
@@ -195,7 +207,7 @@ class Service extends Routable {
     patch(
         '/:id',
         (RequestContext req, res) => req.lazyBody().then((body) => this.modify(
-            toId(req.params['id']),
+            parseId(req.params['id']),
             body,
             mergeMap([
               {'query': req.query},
@@ -211,7 +223,7 @@ class Service extends Routable {
     post(
         '/:id',
         (RequestContext req, res) => req.lazyBody().then((body) => this.update(
-            toId(req.params['id']),
+            parseId(req.params['id']),
             body,
             mergeMap([
               {'query': req.query},
@@ -225,7 +237,7 @@ class Service extends Routable {
     put(
         '/:id',
         (RequestContext req, res) => req.lazyBody().then((body) => this.update(
-            toId(req.params['id']),
+            parseId(req.params['id']),
             body,
             mergeMap([
               {'query': req.query},
@@ -254,7 +266,7 @@ class Service extends Routable {
     delete(
         '/:id',
         (RequestContext req, res) => this.remove(
-            toId(req.params['id']),
+            parseId(req.params['id']),
             mergeMap([
               {'query': req.query},
               restProvider,

From 2a306e1ec3776cdc8f8ef8798a2cc269c1c63d6c Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:20:12 -0400
Subject: [PATCH 251/414] Make parseId static + docs

---
 CHANGELOG.md              | 5 ++++-
 lib/src/core/service.dart | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc9389b7..13b29b40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,4 +11,7 @@
 * Moved `lib/hooks.dart` into `package:angel_hooks`.
 * Moved `TypedService` into `package:angel_typed_service`.
 * Completely removed the `AngelBase` class.
-* Removed all `@deprecated` symbols.
\ No newline at end of file
+* Removed all `@deprecated` symbols.
+* `Service.toId` was renamed to `Service.parseId`; it also now uses its
+single type argument to determine how to parse a value.
+    * In addition, this method was also made `static`.
\ No newline at end of file
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 28dde7c3..f914297c 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -124,7 +124,11 @@ class Service extends Routable {
   }
 
   /// Transforms an [id] (whether it is a String, num, etc.) into one acceptable by a service.
-  T parseId<T>(id) {
+  ///
+  /// The single type argument, [T], is used to determine how to parse the [id].
+  ///
+  /// For example, `parseId<bool>` attempts to parse the value as a [bool].
+  static T parseId<T>(id) {
     if (id == 'null' || id == null)
       return null;
     else if (T == String)

From 91c97c78b9bc63faf3d51adfb37d048192efd4c0 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:27:34 -0400
Subject: [PATCH 252/414] Make RequestContext generic

---
 .idea/workspace.xml               | 304 +++++++++++++-----------------
 lib/src/core/request_context.dart |  20 +-
 2 files changed, 146 insertions(+), 178 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7254fb9a..407673b9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,27 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="Completely removed the `AngelBase` class">
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/exception_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/exception_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/general_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/general_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/services_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/services_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -47,20 +29,17 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="214">
-              <caret line="551" column="15" selection-start-line="205" selection-start-column="24" selection-end-line="205" selection-end-column="30" />
-              <folding>
-                <element signature="e#38#58#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="108">
+              <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="291">
-              <caret line="321" column="37" lean-forward="true" selection-start-line="321" selection-start-column="37" selection-end-line="321" selection-end-column="37" />
+            <state relative-caret-position="419">
+              <caret line="329" column="33" selection-start-line="328" selection-end-line="329" selection-end-column="33" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -89,40 +68,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="core.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="e#1#33#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <folding>
-                <element signature="e#1#31#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1338">
-              <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
-              <folding>
-                <element signature="e#0#22#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -135,8 +80,8 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="576">
-              <caret line="36" column="11" lean-forward="true" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
+            <state relative-caret-position="-2042">
+              <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
               </folding>
@@ -144,14 +89,32 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="192">
-                <caret line="12" column="42" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="42" />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2032">
+              <caret line="127" column="7" selection-start-line="127" selection-start-column="7" selection-end-line="127" selection-end-column="7" />
+              <folding>
+                <element signature="e#47#67#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="390">
+              <caret line="555" column="35" selection-start-line="555" selection-start-column="35" selection-end-line="555" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="anonymous_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="80">
+              <caret line="6" column="36" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
             </state>
           </provider>
         </entry>
@@ -168,8 +131,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>_lock()</find>
-      <find>unmofi</find>
       <find>Map&lt;String,</find>
       <find>as</find>
       <find>redirectTo</find>
@@ -198,6 +159,8 @@
       <find>dart2_constant/io.dart</find>
       <find>package:dart:convert</find>
       <find>package:dart:io</find>
+      <find>deprecated</find>
+      <find>parse</find>
     </findStrings>
     <replaceStrings>
       <replace>appa</replace>
@@ -226,10 +189,10 @@
       <replace>_foldStringDynamic(result)</replace>
       <replace>Angel(MirrorsReflector())</replace>
       <replace>json.encode</replace>
-      <replace>json.decode</replace>
       <replace>Angel(reflector: M</replace>
       <replace>dart:convert</replace>
       <replace>dart:io</replace>
+      <replace>json.decode</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -256,11 +219,9 @@
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
@@ -295,15 +256,17 @@
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
       </list>
     </option>
   </component>
@@ -722,28 +685,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="5692000" />
-    </task>
-    <task id="LOCAL-00079" summary="Update example">
-      <created>1523044574359</created>
-      <option name="number" value="00079" />
-      <option name="presentableId" value="LOCAL-00079" />
-      <option name="project" value="LOCAL" />
-      <updated>1523044574359</updated>
-    </task>
-    <task id="LOCAL-00080" summary="Use dart2_constant">
-      <created>1526436313662</created>
-      <option name="number" value="00080" />
-      <option name="presentableId" value="LOCAL-00080" />
-      <option name="project" value="LOCAL" />
-      <updated>1526436313662</updated>
-    </task>
-    <task id="LOCAL-00081" summary="Use dart2_constant">
-      <created>1526438457813</created>
-      <option name="number" value="00081" />
-      <option name="presentableId" value="LOCAL-00081" />
-      <option name="project" value="LOCAL" />
-      <updated>1526438457813</updated>
+      <workItem from="1534547885788" duration="6784000" />
     </task>
     <task id="LOCAL-00082" summary="Fixed all broken tests">
       <created>1526440469836</created>
@@ -1067,7 +1009,28 @@
       <option name="project" value="LOCAL" />
       <updated>1534733780470</updated>
     </task>
-    <option name="localTasksCounter" value="128" />
+    <task id="LOCAL-00128" summary="Remove all usage of dart2_constant">
+      <created>1534734389546</created>
+      <option name="number" value="00128" />
+      <option name="presentableId" value="LOCAL-00128" />
+      <option name="project" value="LOCAL" />
+      <updated>1534734389546</updated>
+    </task>
+    <task id="LOCAL-00129" summary="Add more to parseId">
+      <created>1534735099537</created>
+      <option name="number" value="00129" />
+      <option name="presentableId" value="LOCAL-00129" />
+      <option name="project" value="LOCAL" />
+      <updated>1534735099537</updated>
+    </task>
+    <task id="LOCAL-00130" summary="Make parseId static + docs">
+      <created>1534735212786</created>
+      <option name="number" value="00130" />
+      <option name="presentableId" value="LOCAL-00130" />
+      <option name="project" value="LOCAL" />
+      <updated>1534735212787</updated>
+    </task>
+    <option name="localTasksCounter" value="131" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1103,7 +1066,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="167991000" />
+    <option name="totallyTimeSpent" value="169083000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1116,14 +1079,13 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="37" y="23" width="1403" height="784" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Tool Output" order="7" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
+      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1141,7 +1103,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.27920645" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1166,9 +1128,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Bump" />
-    <MESSAGE value="Finalizers before sending" />
-    <MESSAGE value="Added findOne to `Service`" />
     <MESSAGE value="Added `Service.findOne` tests" />
     <MESSAGE value="Bump version -&gt; 1.1.5" />
     <MESSAGE value="Patched another cast bug" />
@@ -1191,7 +1150,10 @@
     <MESSAGE value="Upgrade body_parser dependency" />
     <MESSAGE value="Update description" />
     <MESSAGE value="Completely removed the `AngelBase` class" />
-    <option name="LAST_COMMIT_MESSAGE" value="Completely removed the `AngelBase` class" />
+    <MESSAGE value="Remove all usage of dart2_constant" />
+    <MESSAGE value="Add more to parseId" />
+    <MESSAGE value="Make parseId static + docs" />
+    <option name="LAST_COMMIT_MESSAGE" value="Make parseId static + docs" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1199,21 +1161,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.59.0/libexec/lib/io/platform.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="145" lean-forward="true" selection-start-line="145" selection-end-line="145" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1360">
-          <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0-dev.65.0/libexec/lib/async/future.dart" />
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="470">
@@ -1228,13 +1175,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="29" column="57" lean-forward="true" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="288">
@@ -1490,26 +1430,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="576">
-          <caret line="36" column="11" lean-forward="true" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="192">
-            <caret line="12" column="42" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="42" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1543,30 +1463,56 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="928">
-          <caret line="58" column="58" lean-forward="true" selection-start-line="58" selection-start-column="58" selection-end-line="58" selection-end-column="58" />
+        <state relative-caret-position="48">
+          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="419">
+          <caret line="329" column="33" selection-start-line="328" selection-end-line="329" selection-end-column="33" />
           <folding>
-            <element signature="e#40#60#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="551" column="15" selection-start-line="205" selection-start-column="24" selection-end-line="205" selection-end-column="30" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="108">
+          <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/safe_stream_controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
+        <state relative-caret-position="-1402" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="555" column="35" selection-start-line="555" selection-start-column="35" selection-end-line="555" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="6" column="36" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="256">
+            <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
@@ -1579,12 +1525,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="321" column="37" lean-forward="true" selection-start-line="321" selection-start-column="37" selection-end-line="321" selection-end-column="37" />
+        <state relative-caret-position="928">
+          <caret line="58" column="58" lean-forward="true" selection-start-line="58" selection-start-column="58" selection-end-line="58" selection-end-column="58" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2042">
+          <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2032">
+          <caret line="127" column="7" selection-start-line="127" selection-start-column="7" selection-end-line="127" selection-end-column="7" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index daee6ab1..251107d8 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -1,11 +1,14 @@
 library angel_framework.http.request_context;
 
 import 'dart:async';
-import 'dart:io';
+import 'dart:io' show Cookie, HttpHeaders, HttpSession, InternetAddress;
 import 'dart:mirrors';
+
 import 'package:body_parser/body_parser.dart';
+import 'package:http_parser/http_parser.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as p;
+
 import 'metadata.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -13,8 +16,8 @@ import 'server.dart' show Angel;
 
 part 'injection.dart';
 
-/// A convenience wrapper around an incoming HTTP request.
-abstract class RequestContext {
+/// A convenience wrapper around an incoming [RawRequest].
+abstract class RequestContext<RawRequest> {
   String _acceptHeaderCache, _extensionCache;
   bool _acceptsAllCache;
   BodyParseResult _body;
@@ -22,6 +25,9 @@ abstract class RequestContext {
 
   final Map properties = {};
 
+  /// The underlying [RawRequest] provided by the driver.
+  RawRequest get rawRequest;
+
   /// Additional params to be passed to services.
   final Map serviceParams = {};
 
@@ -42,10 +48,6 @@ abstract class RequestContext {
   /// A [Map] of singletons injected via [inject].
   Map get injections => _injections;
 
-  /// This feature does not map to other adapters (i.e. HTTP/2), so it will be removed in a future version.
-  @deprecated
-  HttpRequest get io;
-
   /// The user's IP.
   String get ip => remoteAddress.address;
 
@@ -74,7 +76,7 @@ abstract class RequestContext {
   }
 
   /// The content type of an incoming request.
-  ContentType get contentType;
+  MediaType get contentType;
 
   /// Any and all files sent to the server with this request.
   ///
@@ -184,7 +186,7 @@ abstract class RequestContext {
   /// * A [ContentType], in which case the `Accept` header will be compared against its `mimeType` property.
   /// * Any other Dart value, in which case the `Accept` header will be compared against the result of a `toString()` call.
   bool accepts(contentType, {bool strict: false}) {
-    var contentTypeString = contentType is ContentType
+    var contentTypeString = contentType is MediaType
         ? contentType.mimeType
         : contentType?.toString();
 

From ffbbb75c8c8b4d4e333c067180057860b44cbef7 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:28:27 -0400
Subject: [PATCH 253/414] Make RequestContext generic

---
 .idea/workspace.xml | 75 ++++++++++++++++++++++++++-------------------
 CHANGELOG.md        |  5 ++-
 2 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 407673b9..e36273c9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -77,6 +77,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="304">
+                <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -89,11 +101,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2032">
-              <caret line="127" column="7" selection-start-line="127" selection-start-column="7" selection-end-line="127" selection-end-column="7" />
+            <state relative-caret-position="200">
+              <caret line="70" column="16" lean-forward="true" selection-start-line="70" selection-start-column="16" selection-end-line="70" selection-end-column="16" />
               <folding>
                 <element signature="e#47#67#0" expanded="true" />
               </folding>
@@ -264,9 +276,9 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -685,14 +697,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="6784000" />
-    </task>
-    <task id="LOCAL-00082" summary="Fixed all broken tests">
-      <created>1526440469836</created>
-      <option name="number" value="00082" />
-      <option name="presentableId" value="LOCAL-00082" />
-      <option name="project" value="LOCAL" />
-      <updated>1526440469836</updated>
+      <workItem from="1534547885788" duration="6986000" />
     </task>
     <task id="LOCAL-00083" summary="1.1.3">
       <created>1526440683707</created>
@@ -1030,7 +1035,14 @@
       <option name="project" value="LOCAL" />
       <updated>1534735212787</updated>
     </task>
-    <option name="localTasksCounter" value="131" />
+    <task id="LOCAL-00131" summary="Make RequestContext generic">
+      <created>1534735654118</created>
+      <option name="number" value="00131" />
+      <option name="presentableId" value="LOCAL-00131" />
+      <option name="project" value="LOCAL" />
+      <updated>1534735654118</updated>
+    </task>
+    <option name="localTasksCounter" value="132" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1066,7 +1078,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="169083000" />
+    <option name="totallyTimeSpent" value="169285000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1079,13 +1091,14 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="37" y="23" width="1403" height="784" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Tool Output" order="7" />
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1103,7 +1116,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27920645" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1128,7 +1141,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Added `Service.findOne` tests" />
     <MESSAGE value="Bump version -&gt; 1.1.5" />
     <MESSAGE value="Patched another cast bug" />
     <MESSAGE value="Removed random_string dependency" />
@@ -1153,7 +1165,8 @@
     <MESSAGE value="Remove all usage of dart2_constant" />
     <MESSAGE value="Add more to parseId" />
     <MESSAGE value="Make parseId static + docs" />
-    <option name="LAST_COMMIT_MESSAGE" value="Make parseId static + docs" />
+    <MESSAGE value="Make RequestContext generic" />
+    <option name="LAST_COMMIT_MESSAGE" value="Make RequestContext generic" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1506,16 +1519,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="256">
-            <caret line="16" column="54" selection-start-line="16" selection-start-column="54" selection-end-line="16" selection-end-column="54" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1547,14 +1550,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2032">
-          <caret line="127" column="7" selection-start-line="127" selection-start-column="7" selection-end-line="127" selection-end-column="7" />
+        <state relative-caret-position="200">
+          <caret line="70" column="16" lean-forward="true" selection-start-line="70" selection-start-column="16" selection-end-line="70" selection-end-column="16" />
           <folding>
             <element signature="e#47#67#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="304">
+            <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13b29b40..1ce3e9fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,4 +14,7 @@
 * Removed all `@deprecated` symbols.
 * `Service.toId` was renamed to `Service.parseId`; it also now uses its
 single type argument to determine how to parse a value.
-    * In addition, this method was also made `static`.
\ No newline at end of file
+    * In addition, this method was also made `static`.
+* `RequestContext` and `ResponseContext` are now generic, and take a
+single type argument pointing to the underlying request/response type,
+respectively.
\ No newline at end of file

From 697a1a788f15d5130902e542f12342f98cc1f9d6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:31:59 -0400
Subject: [PATCH 254/414] Completely remove RequestContext.io

---
 CHANGELOG.md                           |  4 ++-
 lib/src/http/http_request_context.dart | 39 +++++++++++++++-----------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ce3e9fa..12c111de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,4 +17,6 @@ single type argument to determine how to parse a value.
     * In addition, this method was also made `static`.
 * `RequestContext` and `ResponseContext` are now generic, and take a
 single type argument pointing to the underlying request/response type,
-respectively.
\ No newline at end of file
+respectively.
+* `RequestContext.io` and `ResponseContext.io` are now permanently
+gone.
\ No newline at end of file
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index 5de674e2..aad06e20 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -1,37 +1,39 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:body_parser/body_parser.dart';
 import 'package:http_parser/http_parser.dart';
+
 import '../core/core.dart';
 
 /// An implementation of [RequestContext] that wraps a [HttpRequest].
-class HttpRequestContextImpl extends RequestContext {
-  ContentType _contentType;
+class HttpRequestContextImpl extends RequestContext<HttpRequest> {
+  MediaType _contentType;
   HttpRequest _io;
   String _override, _path;
 
   @override
-  ContentType get contentType {
+  MediaType get contentType {
     return _contentType;
   }
 
   @override
   List<Cookie> get cookies {
-    return io.cookies;
+    return rawRequest.cookies;
   }
 
   @override
   HttpHeaders get headers {
-    return io.headers;
+    return rawRequest.headers;
   }
 
   @override
   String get hostname {
-    return io.headers.value('host');
+    return rawRequest.headers.value('host');
   }
 
   /// The underlying [HttpRequest] instance underneath this context.
-  HttpRequest get io => _io;
+  HttpRequest get rawRequest => _io;
 
   @override
   String get method {
@@ -40,7 +42,7 @@ class HttpRequestContextImpl extends RequestContext {
 
   @override
   String get originalMethod {
-    return io.method;
+    return rawRequest.method;
   }
 
   @override
@@ -50,22 +52,25 @@ class HttpRequestContextImpl extends RequestContext {
 
   @override
   InternetAddress get remoteAddress {
-    return io.connectionInfo.remoteAddress;
+    return rawRequest.connectionInfo.remoteAddress;
   }
 
   @override
   HttpSession get session {
-    return io.session;
+    return rawRequest.session;
   }
 
   @override
   Uri get uri {
-    return io.uri;
+    return rawRequest.uri;
   }
 
   @override
   bool get xhr {
-    return io.headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
+    return rawRequest.headers
+            .value("X-Requested-With")
+            ?.trim()
+            ?.toLowerCase() ==
         'xmlhttprequest';
   }
 
@@ -82,7 +87,7 @@ class HttpRequestContextImpl extends RequestContext {
               request.method;
 
     ctx.app = app;
-    ctx._contentType = request.headers.contentType;
+    ctx._contentType = MediaType.parse(request.headers.contentType.toString());
     ctx._override = override;
 
     /*
@@ -134,11 +139,11 @@ class HttpRequestContextImpl extends RequestContext {
   @override
   Future<BodyParseResult> parseOnce() {
     return parseBodyFromStream(
-        io,
-        io.headers.contentType != null
-            ? new MediaType.parse(io.headers.contentType.toString())
+        rawRequest,
+        rawRequest.headers.contentType != null
+            ? new MediaType.parse(rawRequest.headers.contentType.toString())
             : null,
-        io.uri,
+        rawRequest.uri,
         storeOriginalBuffer: app.storeOriginalBuffer == true);
   }
 }

From 90409711b4483b9a9ff7874ba8414a530609c867 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:39:37 -0400
Subject: [PATCH 255/414] Completely remove ResponseContext.io

---
 .idea/workspace.xml                     | 242 +++++++++++-------------
 lib/src/core/response_context.dart      |  11 +-
 lib/src/http/http_response_context.dart |  20 +-
 3 files changed, 120 insertions(+), 153 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e36273c9..564643a6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,69 +26,18 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="419">
-              <caret line="329" column="33" selection-start-line="328" selection-end-line="329" selection-end-column="33" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="48">
-              <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="928">
-              <caret line="58" column="58" lean-forward="true" selection-start-line="58" selection-start-column="58" selection-end-line="58" selection-end-column="58" />
+            <state relative-caret-position="-1261">
+              <caret line="306" column="38" selection-start-line="306" selection-start-column="38" selection-end-line="306" selection-end-column="38" />
               <folding>
-                <element signature="e#40#60#0" expanded="true" />
+                <element signature="e#48#68#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="608">
-              <caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="304">
-                <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -104,8 +53,8 @@
       <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="70" column="16" lean-forward="true" selection-start-line="70" selection-start-column="16" selection-end-line="70" selection-end-column="16" />
+            <state relative-caret-position="406">
+              <caret line="158" column="23" lean-forward="true" selection-start-line="158" selection-start-column="23" selection-end-line="158" selection-end-column="23" />
               <folding>
                 <element signature="e#47#67#0" expanded="true" />
               </folding>
@@ -113,6 +62,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="160">
+              <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
@@ -143,8 +104,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Map&lt;String,</find>
-      <find>as</find>
       <find>redirectTo</find>
       <find>finalizers.t</find>
       <find>`Iterable`</find>
@@ -173,9 +132,10 @@
       <find>package:dart:io</find>
       <find>deprecated</find>
       <find>parse</find>
+      <find>io.</find>
+      <find>io</find>
     </findStrings>
     <replaceStrings>
-      <replace>appa</replace>
       <replace>isClosed</replace>
       <replace>useStream</replace>
       <replace>streaming</replace>
@@ -205,6 +165,7 @@
       <replace>dart:convert</replace>
       <replace>dart:io</replace>
       <replace>json.decode</replace>
+      <replace>rawRequest.</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -228,7 +189,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
@@ -271,14 +231,15 @@
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
       </list>
     </option>
   </component>
@@ -697,21 +658,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="6986000" />
-    </task>
-    <task id="LOCAL-00083" summary="1.1.3">
-      <created>1526440683707</created>
-      <option name="number" value="00083" />
-      <option name="presentableId" value="LOCAL-00083" />
-      <option name="project" value="LOCAL" />
-      <updated>1526440683707</updated>
-    </task>
-    <task id="LOCAL-00084" summary="Test against Dart 1.x">
-      <created>1528441794043</created>
-      <option name="number" value="00084" />
-      <option name="presentableId" value="LOCAL-00084" />
-      <option name="project" value="LOCAL" />
-      <updated>1528441794044</updated>
+      <workItem from="1534547885788" duration="7562000" />
     </task>
     <task id="LOCAL-00085" summary="1.1.4+1">
       <created>1528442409476</created>
@@ -1042,7 +989,21 @@
       <option name="project" value="LOCAL" />
       <updated>1534735654118</updated>
     </task>
-    <option name="localTasksCounter" value="132" />
+    <task id="LOCAL-00132" summary="Make RequestContext generic">
+      <created>1534735707304</created>
+      <option name="number" value="00132" />
+      <option name="presentableId" value="LOCAL-00132" />
+      <option name="project" value="LOCAL" />
+      <updated>1534735707304</updated>
+    </task>
+    <task id="LOCAL-00133" summary="Completely remove RequestContext.io">
+      <created>1534735919739</created>
+      <option name="number" value="00133" />
+      <option name="presentableId" value="LOCAL-00133" />
+      <option name="project" value="LOCAL" />
+      <updated>1534735919739</updated>
+    </task>
+    <option name="localTasksCounter" value="134" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1078,7 +1039,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="169285000" />
+    <option name="totallyTimeSpent" value="169861000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1141,7 +1102,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Bump version -&gt; 1.1.5" />
     <MESSAGE value="Patched another cast bug" />
     <MESSAGE value="Removed random_string dependency" />
     <MESSAGE value="Switch to MediaType" />
@@ -1166,7 +1126,8 @@
     <MESSAGE value="Add more to parseId" />
     <MESSAGE value="Make parseId static + docs" />
     <MESSAGE value="Make RequestContext generic" />
-    <option name="LAST_COMMIT_MESSAGE" value="Make RequestContext generic" />
+    <MESSAGE value="Completely remove RequestContext.io" />
+    <option name="LAST_COMMIT_MESSAGE" value="Completely remove RequestContext.io" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1174,13 +1135,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.0/lib/src/path_set.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="470">
-          <caret line="77" column="33" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib/src/core_matchers.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="86">
@@ -1462,13 +1416,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="608">
-          <caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="88">
@@ -1476,30 +1423,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="419">
-          <caret line="329" column="33" selection-start-line="328" selection-end-line="329" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/safe_stream_controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1402" />
@@ -1528,16 +1451,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="928">
-          <caret line="58" column="58" lean-forward="true" selection-start-line="58" selection-start-column="58" selection-end-line="58" selection-end-column="58" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2042">
@@ -1548,12 +1461,29 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="70" column="16" lean-forward="true" selection-start-line="70" selection-start-column="16" selection-end-line="70" selection-end-column="16" />
+        <state relative-caret-position="608">
+          <caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="191">
+          <caret line="69" column="5" lean-forward="true" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
           <folding>
-            <element signature="e#47#67#0" expanded="true" />
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1561,13 +1491,53 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="304">
-            <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+          <first_editor relative-caret-position="336">
+            <caret line="21" column="5" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="158" column="23" lean-forward="true" selection-start-line="158" selection-start-column="23" selection-end-line="158" selection-end-column="23" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="137" column="16" selection-start-line="137" selection-start-column="16" selection-end-line="137" selection-end-column="16" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="435">
+          <caret line="330" column="40" selection-start-line="330" selection-start-column="40" selection-end-line="330" selection-end-column="40" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1261">
+          <caret line="306" column="38" selection-start-line="306" selection-start-column="38" selection-end-line="306" selection-end-column="38" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 0314c3da..fa3d5482 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -3,7 +3,7 @@ library angel_framework.http.response_context;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:convert' as c show json;
-import 'dart:io' show BytesBuilder, Cookie, HttpResponse;
+import 'dart:io' show BytesBuilder, Cookie;
 
 import 'package:angel_route/angel_route.dart';
 import 'package:file/file.dart';
@@ -18,7 +18,7 @@ import 'server.dart' show Angel;
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A convenience wrapper around an outgoing HTTP request.
-abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
+abstract class ResponseContext<RawResponse> implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
   final BytesBuilder _buffer = new _LockableBytesBuilder();
   final Map<String, String> _headers = {'server': 'angel'};
@@ -93,8 +93,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   /// A set of UTF-8 encoded bytes that will be written to the response.
   BytesBuilder get buffer => _buffer;
 
-  /// The underlying [HttpResponse] under this instance.
-  HttpResponse get io;
+  /// The underlying [RawResponse] under this instance.
+  RawResponse get rawResponse;
 
   /// Gets or sets the content type to send back to a client.
   MediaType contentType = new MediaType('text', 'plain');
@@ -305,11 +305,8 @@ abstract class ResponseContext implements StreamSink<List<int>>, StringSink {
   }
 
   /// Streams a file to this response.
-  ///
-  /// You can optionally transform the file stream with a [codec].
   Future streamFile(File file) {
     if (!isOpen) throw closed();
-
     headers['content-type'] = lookupMimeType(file.path);
     return file.openRead().pipe(this);
   }
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index a6f200ba..6cd2ab13 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -4,16 +4,16 @@ import 'dart:io';
 import '../core/core.dart';
 import 'http_request_context.dart';
 
-class HttpResponseContextImpl extends ResponseContext {
+class HttpResponseContextImpl extends ResponseContext<HttpResponse> {
   /// The underlying [HttpResponse] under this instance.
   @override
-  final HttpResponse io;
+  final HttpResponse rawResponse;
   Angel app;
 
   final HttpRequestContextImpl _correspondingRequest;
   bool _isClosed = false, _useStream = false;
 
-  HttpResponseContextImpl(this.io, this.app, [this._correspondingRequest]);
+  HttpResponseContextImpl(this.rawResponse, this.app, [this._correspondingRequest]);
 
   @override
   RequestContext get correspondingRequest {
@@ -32,7 +32,7 @@ class HttpResponseContextImpl extends ResponseContext {
 
   @override
   void addError(Object error, [StackTrace stackTrace]) {
-    io.addError(error, stackTrace);
+    rawResponse.addError(error, stackTrace);
     super.addError(error, stackTrace);
   }
 
@@ -41,10 +41,10 @@ class HttpResponseContextImpl extends ResponseContext {
     if (!_useStream) {
       // If this is the first stream added to this response,
       // then add headers, status code, etc.
-      io
+      rawResponse
         ..statusCode = statusCode
         ..cookies.addAll(cookies);
-      headers.forEach(io.headers.set);
+      headers.forEach(rawResponse.headers.set);
       willCloseItself = _useStream = _isClosed = true;
       releaseCorrespondingRequest();
       return true;
@@ -92,7 +92,7 @@ class HttpResponseContextImpl extends ResponseContext {
 
           if (encoder != null) {
             if (firstStream) {
-              io.headers.set('content-encoding', key);
+              rawResponse.headers.set('content-encoding', key);
             }
 
             output = encoders[key].bind(output);
@@ -102,7 +102,7 @@ class HttpResponseContextImpl extends ResponseContext {
       }
     }
 
-    return io.addStream(output);
+    return rawResponse.addStream(output);
   }
 
   @override
@@ -110,7 +110,7 @@ class HttpResponseContextImpl extends ResponseContext {
     if (_isClosed && !_useStream)
       throw ResponseContext.closed();
     else if (_useStream)
-      io.add(data);
+      rawResponse.add(data);
     else
       buffer.add(data);
   }
@@ -119,7 +119,7 @@ class HttpResponseContextImpl extends ResponseContext {
   Future close() {
     if (_useStream) {
       try {
-        io.close();
+        rawResponse.close();
       } catch (_) {
         // This only seems to occur on `MockHttpRequest`, but
         // this try/catch prevents a crash.

From d3a3d937961889339c5531ca664bf4c4c8cb0577 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:40:59 -0400
Subject: [PATCH 256/414] Rename HTTP request+response impl, drop the "impl"

---
 CHANGELOG.md                            | 4 +++-
 lib/src/http/angel_http.dart            | 8 ++++----
 lib/src/http/http_request_context.dart  | 6 +++---
 lib/src/http/http_response_context.dart | 6 +++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12c111de..75f5b3da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,4 +19,6 @@ single type argument to determine how to parse a value.
 single type argument pointing to the underlying request/response type,
 respectively.
 * `RequestContext.io` and `ResponseContext.io` are now permanently
-gone.
\ No newline at end of file
+gone.
+* `HttpRequestContextImpl` and `HttpResponseContextImpl` were renamed to
+`HttpRequestContext` and `HttpResponseContext`.
\ No newline at end of file
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 376e4c43..dda37b8f 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -340,10 +340,10 @@ class AngelHttp {
     });
   }
 
-  Future<HttpRequestContextImpl> createRequestContext(HttpRequest request) {
+  Future<HttpRequestContext> createRequestContext(HttpRequest request) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
     if (path.length == 0) path = '/';
-    return HttpRequestContextImpl.from(request, app, path).then((req) {
+    return HttpRequestContext.from(request, app, path).then((req) {
       if (_pool != null) req.inject(PoolResource, _pool.request());
       if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
       return req;
@@ -352,8 +352,8 @@ class AngelHttp {
 
   Future<ResponseContext> createResponseContext(HttpResponse response,
           [RequestContext correspondingRequest]) =>
-      new Future<ResponseContext>.value(new HttpResponseContextImpl(
-          response, app, correspondingRequest as HttpRequestContextImpl)
+      new Future<ResponseContext>.value(new HttpResponseContext(
+          response, app, correspondingRequest as HttpRequestContext)
         ..serializer = (app.serializer ?? json.encode)
         ..encoders.addAll(app.encoders ?? {}));
 
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index aad06e20..6e7f28cb 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -7,7 +7,7 @@ import 'package:http_parser/http_parser.dart';
 import '../core/core.dart';
 
 /// An implementation of [RequestContext] that wraps a [HttpRequest].
-class HttpRequestContextImpl extends RequestContext<HttpRequest> {
+class HttpRequestContext extends RequestContext<HttpRequest> {
   MediaType _contentType;
   HttpRequest _io;
   String _override, _path;
@@ -75,9 +75,9 @@ class HttpRequestContextImpl extends RequestContext<HttpRequest> {
   }
 
   /// Magically transforms an [HttpRequest] into a [RequestContext].
-  static Future<HttpRequestContextImpl> from(
+  static Future<HttpRequestContext> from(
       HttpRequest request, Angel app, String path) {
-    HttpRequestContextImpl ctx = new HttpRequestContextImpl();
+    HttpRequestContext ctx = new HttpRequestContext();
 
     String override = request.method;
 
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 6cd2ab13..dc244d31 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -4,16 +4,16 @@ import 'dart:io';
 import '../core/core.dart';
 import 'http_request_context.dart';
 
-class HttpResponseContextImpl extends ResponseContext<HttpResponse> {
+class HttpResponseContext extends ResponseContext<HttpResponse> {
   /// The underlying [HttpResponse] under this instance.
   @override
   final HttpResponse rawResponse;
   Angel app;
 
-  final HttpRequestContextImpl _correspondingRequest;
+  final HttpRequestContext _correspondingRequest;
   bool _isClosed = false, _useStream = false;
 
-  HttpResponseContextImpl(this.rawResponse, this.app, [this._correspondingRequest]);
+  HttpResponseContext(this.rawResponse, this.app, [this._correspondingRequest]);
 
   @override
   RequestContext get correspondingRequest {

From 2cb0797da55abb69cc84992590eaaa90ef16f205 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:46:38 -0400
Subject: [PATCH 257/414] Make lazy parsing the default

---
 CHANGELOG.md                           | 4 +++-
 example/handle_error.dart              | 1 -
 example/json.dart                      | 1 -
 lib/src/core/server.dart               | 6 +++---
 lib/src/http/http_request_context.dart | 2 +-
 performance/hello/main.dart            | 2 +-
 test/parameter_meta_test.dart          | 2 +-
 test/routing_test.dart                 | 2 --
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75f5b3da..17fc0368 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,4 +21,6 @@ respectively.
 * `RequestContext.io` and `ResponseContext.io` are now permanently
 gone.
 * `HttpRequestContextImpl` and `HttpResponseContextImpl` were renamed to
-`HttpRequestContext` and `HttpResponseContext`.
\ No newline at end of file
+`HttpRequestContext` and `HttpResponseContext`.
+* Lazy-parsing request bodies is now the default; `Angel.lazyParseBodies` was replaced
+with `Angel.eagerParseRequestBodies`.
\ No newline at end of file
diff --git a/example/handle_error.dart b/example/handle_error.dart
index 413a8f0c..10af58e0 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -6,7 +6,6 @@ import 'package:logging/logging.dart';
 
 main() async {
   var app = new Angel(reflector: MirrorsReflector())
-    ..lazyParseBodies = true
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
 
diff --git a/example/json.dart b/example/json.dart
index 93b65b19..7b7cd98b 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -40,7 +40,6 @@ serverMain(_) async {
 
   // Performance tuning
   app
-    ..lazyParseBodies = true
     ..serializer = json.encode;
 
   app.errorHandler = (e, req, res) {
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index f7e3d58c..bb4db919 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -125,10 +125,10 @@ class Angel extends Routable {
   /// for you.
   final Map configuration = {};
 
-  /// When set to true, the request body will not be parsed
-  /// automatically. You can call `req.parse()` manually,
+  /// When set to `true` (default: `false`), the request body will be parsed
+  /// automatically; otherwise, you must call [RequestContext].parseBody() manually,
   /// or use `lazyBody()`.
-  bool lazyParseBodies = false;
+  bool eagerParseRequestBodies = false;
 
   /// When set to `true`, the original body bytes will be stored
   /// on requests. `false` by default.
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index 6e7f28cb..9562f764 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -121,7 +121,7 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
     ctx._path = path;
     ctx._io = request;
 
-    if (app.lazyParseBodies != true) {
+    if (app.eagerParseRequestBodies == true) {
       return ctx.parse().then((_) => ctx);
     }
 
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index a238447e..ca1e34f5 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -23,7 +23,7 @@ main() async {
 }
 
 void start(int id) {
-  var app = new Angel(reflector: MirrorsReflector())..lazyParseBodies = true;
+  var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
   app.get('/', (ResponseContext res) => res.write('Hello, world!'));
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 2df52004..399488e4 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -28,7 +28,7 @@ parameterMetaTests() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(reflector: MirrorsReflector())..lazyParseBodies = true;
+    app = new Angel(reflector: MirrorsReflector());
     http = new AngelHttp(app);
 
     app.get('/cookie', (@CookieValue('token') String jwt) {
diff --git a/test/routing_test.dart b/test/routing_test.dart
index a193d55e..1eb506f7 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -32,9 +32,7 @@ main() {
     nested = new Angel(reflector: MirrorsReflector());
     todos = new Angel(reflector: MirrorsReflector());
 
-    // Lazy-parse in production
     [app, nested, todos].forEach((Angel app) {
-      app.lazyParseBodies = app.isProduction;
       app.logger = new Logger('routing_test')
         ..onRecord.listen((rec) {
           if (rec.error != null) {

From 1dec4f3da6e112f26ad41d735803f4a40c3d0199 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 19 Aug 2018 23:51:09 -0400
Subject: [PATCH 258/414] Rename body parsing methods

---
 CHANGELOG.md                           |  5 ++++-
 lib/src/core/request_context.dart      | 18 +++++++++---------
 lib/src/core/server.dart               |  2 +-
 lib/src/core/service.dart              |  8 ++++----
 lib/src/http/http_request_context.dart |  2 +-
 test/routing_test.dart                 |  2 +-
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17fc0368..db310248 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,4 +23,7 @@ gone.
 * `HttpRequestContextImpl` and `HttpResponseContextImpl` were renamed to
 `HttpRequestContext` and `HttpResponseContext`.
 * Lazy-parsing request bodies is now the default; `Angel.lazyParseBodies` was replaced
-with `Angel.eagerParseRequestBodies`.
\ No newline at end of file
+with `Angel.eagerParseRequestBodies`.
+* `Angel.storeOriginalBuffer` -> `Angel.storeRawRequestBuffers`.
+* The methods `lazyBody`, `lazyFiles`, and `lazyOriginalBuffer` on `ResponseContext` were all
+replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
\ No newline at end of file
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 251107d8..dd0930b7 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -67,7 +67,7 @@ abstract class RequestContext<RawRequest> {
   /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
   /// then an error will be thrown.
   ///
-  /// **If you are writing a plug-in, use [lazyBody] instead.**
+  /// **If you are writing a plug-in, use [parseBody] instead.**
   Map get body {
     if (_body == null)
       throw _unparsed('body', 'Body');
@@ -83,7 +83,7 @@ abstract class RequestContext<RawRequest> {
   /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
   /// then an error will be thrown.
   ///
-  /// **If you are writing a plug-in, use [lazyFiles] instead.**
+  /// **If you are writing a plug-in, use [parseUploadedFiles] instead.**
   List<FileUploadInfo> get files {
     if (_body == null)
       throw _unparsed('query', 'Files');
@@ -96,7 +96,7 @@ abstract class RequestContext<RawRequest> {
   /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
   /// then an error will be thrown.
   ///
-  /// **If you are writing a plug-in, use [lazyOriginalBuffer] instead.**
+  /// **If you are writing a plug-in, use [parseRawRequestBuffer] instead.**
   List<int> get originalBuffer {
     if (_body == null)
       throw _unparsed('original buffer', 'OriginalBuffer');
@@ -209,15 +209,15 @@ abstract class RequestContext<RawRequest> {
   bool get acceptsAll => _acceptsAllCache ??= accepts('*/*');
 
   /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the body.
-  Future<Map> lazyBody() => parse().then((b) => b.body);
+  Future<Map> parseBody() => parse().then((b) => b.body);
 
-  /// Retrieves the request files if it has already been parsed, or lazy-parses it before returning the files.
-  Future<List<FileUploadInfo>> lazyFiles() => parse().then((b) => b.files);
+  /// Retrieves a list of all uploaded files if it has already been parsed, or lazy-parses it before returning the files.
+  Future<List<FileUploadInfo>> parseUploadedFiles() => parse().then((b) => b.files);
 
-  /// Retrieves the original request buffer if it has already been parsed, or lazy-parses it before returning the files.
+  /// Retrieves the original request buffer if it has already been parsed, or lazy-parses it before returning the buffer..
   ///
-  /// This will return an empty `List` if you have not enabled `storeOriginalBuffer` on your [app] instance.
-  Future<List<int>> lazyOriginalBuffer() =>
+  /// This will return an empty `List` if you have not enabled `keepRawRequestBuffers` on your [Angel] instance.
+  Future<List<int>> parseRawRequestBuffer() =>
       parse().then((b) => b.originalBuffer);
 
   /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the query.
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index bb4db919..f941b51e 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -132,7 +132,7 @@ class Angel extends Routable {
 
   /// When set to `true`, the original body bytes will be stored
   /// on requests. `false` by default.
-  bool storeOriginalBuffer = false;
+  bool keepRawRequestBuffers = false;
 
   /// A [Container] used to inject dependencies.
   Container get container => _container;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index f914297c..455c891b 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -172,7 +172,7 @@ class Service extends Routable {
 
     Middleware createMiddleware = getAnnotation(service.create, Middleware);
     post('/', (RequestContext req, ResponseContext res) {
-      return req.lazyBody().then((body) {
+      return req.parseBody().then((body) {
         return this
             .create(
                 body,
@@ -210,7 +210,7 @@ class Service extends Routable {
     Middleware modifyMiddleware = getAnnotation(service.modify, Middleware);
     patch(
         '/:id',
-        (RequestContext req, res) => req.lazyBody().then((body) => this.modify(
+        (RequestContext req, res) => req.parseBody().then((body) => this.modify(
             parseId(req.params['id']),
             body,
             mergeMap([
@@ -226,7 +226,7 @@ class Service extends Routable {
     Middleware updateMiddleware = getAnnotation(service.update, Middleware);
     post(
         '/:id',
-        (RequestContext req, res) => req.lazyBody().then((body) => this.update(
+        (RequestContext req, res) => req.parseBody().then((body) => this.update(
             parseId(req.params['id']),
             body,
             mergeMap([
@@ -240,7 +240,7 @@ class Service extends Routable {
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put(
         '/:id',
-        (RequestContext req, res) => req.lazyBody().then((body) => this.update(
+        (RequestContext req, res) => req.parseBody().then((body) => this.update(
             parseId(req.params['id']),
             body,
             mergeMap([
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index 9562f764..d0a1b028 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -144,6 +144,6 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
             ? new MediaType.parse(rawRequest.headers.contentType.toString())
             : null,
         rawRequest.uri,
-        storeOriginalBuffer: app.storeOriginalBuffer == true);
+        storeOriginalBuffer: app.keepRawRequestBuffers == true);
   }
 }
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 1eb506f7..e7b4a281 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -71,7 +71,7 @@ main() {
         middleware: ['interceptor']);
     app.get('/hello', 'world');
     app.get('/name/:first/last/:last', (req, res) => req.params);
-    app.post('/lambda', (RequestContext req, res) => req.lazyBody());
+    app.post('/lambda', (RequestContext req, res) => req.parseBody());
     app.use('/todos/:id', todos);
     app
         .get('/greet/:name',

From c2ee694cc35002ed905ba303c12bfce401dd8fd1 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 00:09:54 -0400
Subject: [PATCH 259/414] Update query parsing

---
 .idea/workspace.xml               | 466 +++++++++++++++---------------
 CHANGELOG.md                      |   3 +-
 lib/src/core/metadata.dart        |   2 +-
 lib/src/core/request_context.dart |  57 +---
 lib/src/core/service.dart         | 134 +++++----
 test/routing_test.dart            |   2 +-
 6 files changed, 324 insertions(+), 340 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 564643a6..92c30624 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/metadata.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/metadata.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,13 +30,67 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1261">
-              <caret line="306" column="38" selection-start-line="306" selection-start-column="38" selection-end-line="306" selection-end-column="38" />
+            <state relative-caret-position="304">
+              <caret line="19" column="38" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
               <folding>
-                <element signature="e#48#68#0" expanded="true" />
+                <element signature="e#0#46#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="192">
+              <caret line="83" column="22" lean-forward="true" selection-start-line="83" selection-start-column="22" selection-end-line="83" selection-end-column="44" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="152">
+              <caret line="93" column="65" selection-start-line="93" selection-start-column="65" selection-end-line="93" selection-end-column="65" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="464">
+                <caret line="29" column="99" selection-start-line="29" selection-start-column="99" selection-end-line="29" selection-end-column="99" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="172" column="28" selection-start-line="172" selection-start-column="28" selection-end-line="172" selection-end-column="28" />
+              <folding>
+                <element signature="e#47#67#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -41,8 +99,8 @@
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2042">
-              <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
+            <state relative-caret-position="140">
+              <caret line="257" column="28" lean-forward="true" selection-start-line="257" selection-start-column="28" selection-end-line="257" selection-end-column="28" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
               </folding>
@@ -50,48 +108,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="406">
-              <caret line="158" column="23" lean-forward="true" selection-start-line="158" selection-start-column="23" selection-end-line="158" selection-end-column="23" />
-              <folding>
-                <element signature="e#47#67#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="555" column="35" selection-start-line="555" selection-start-column="35" selection-end-line="555" selection-end-column="35" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="anonymous_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="6" column="36" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -104,11 +120,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>redirectTo</find>
-      <find>finalizers.t</find>
-      <find>`Iterable`</find>
-      <find>instance</find>
-      <find>==</find>
       <find>as Map&lt;String, dynamic&gt;</find>
       <find>result as Map&lt;String, dynamic&gt;</find>
       <find>random_strin</find>
@@ -132,11 +143,15 @@
       <find>package:dart:io</find>
       <find>deprecated</find>
       <find>parse</find>
-      <find>io.</find>
       <find>io</find>
+      <find>io.</find>
+      <find>lazyP</find>
+      <find>storeO</find>
+      <find>origina</find>
+      <find>originalBuffer</find>
+      <find>lazyQue</find>
     </findStrings>
     <replaceStrings>
-      <replace>isClosed</replace>
       <replace>useStream</replace>
       <replace>streaming</replace>
       <replace>!isOpen</replace>
@@ -166,6 +181,7 @@
       <replace>dart:io</replace>
       <replace>json.decode</replace>
       <replace>rawRequest.</replace>
+      <replace>rawResponse.</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -189,8 +205,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/stats/metric_server.dart" />
-        <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
@@ -201,13 +215,9 @@
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
@@ -215,7 +225,6 @@
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
@@ -225,7 +234,6 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
@@ -233,13 +241,21 @@
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/example/handle_error.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
       </list>
     </option>
   </component>
@@ -658,35 +674,7 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="7562000" />
-    </task>
-    <task id="LOCAL-00085" summary="1.1.4+1">
-      <created>1528442409476</created>
-      <option name="number" value="00085" />
-      <option name="presentableId" value="LOCAL-00085" />
-      <option name="project" value="LOCAL" />
-      <updated>1528442409476</updated>
-    </task>
-    <task id="LOCAL-00086" summary="1.1.4+2">
-      <created>1528670046042</created>
-      <option name="number" value="00086" />
-      <option name="presentableId" value="LOCAL-00086" />
-      <option name="project" value="LOCAL" />
-      <updated>1528670046044</updated>
-    </task>
-    <task id="LOCAL-00087" summary="Fix async bugs">
-      <created>1528672631391</created>
-      <option name="number" value="00087" />
-      <option name="presentableId" value="LOCAL-00087" />
-      <option name="project" value="LOCAL" />
-      <updated>1528672631392</updated>
-    </task>
-    <task id="LOCAL-00088" summary="Fix hooking bug">
-      <created>1529523884120</created>
-      <option name="number" value="00088" />
-      <option name="presentableId" value="LOCAL-00088" />
-      <option name="project" value="LOCAL" />
-      <updated>1529523884121</updated>
+      <workItem from="1534547885788" duration="9329000" />
     </task>
     <task id="LOCAL-00089" summary="+5">
       <created>1529724578292</created>
@@ -1003,7 +991,35 @@
       <option name="project" value="LOCAL" />
       <updated>1534735919739</updated>
     </task>
-    <option name="localTasksCounter" value="134" />
+    <task id="LOCAL-00134" summary="Completely remove ResponseContext.io">
+      <created>1534736377619</created>
+      <option name="number" value="00134" />
+      <option name="presentableId" value="LOCAL-00134" />
+      <option name="project" value="LOCAL" />
+      <updated>1534736377619</updated>
+    </task>
+    <task id="LOCAL-00135" summary="Rename HTTP request+response impl, drop the &quot;impl&quot;">
+      <created>1534736459394</created>
+      <option name="number" value="00135" />
+      <option name="presentableId" value="LOCAL-00135" />
+      <option name="project" value="LOCAL" />
+      <updated>1534736459394</updated>
+    </task>
+    <task id="LOCAL-00136" summary="Make lazy parsing the default">
+      <created>1534736798816</created>
+      <option name="number" value="00136" />
+      <option name="presentableId" value="LOCAL-00136" />
+      <option name="project" value="LOCAL" />
+      <updated>1534736798816</updated>
+    </task>
+    <task id="LOCAL-00137" summary="Rename body parsing methods">
+      <created>1534737069329</created>
+      <option name="number" value="00137" />
+      <option name="presentableId" value="LOCAL-00137" />
+      <option name="project" value="LOCAL" />
+      <updated>1534737069329</updated>
+    </task>
+    <option name="localTasksCounter" value="138" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1039,7 +1055,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="169861000" />
+    <option name="totallyTimeSpent" value="171628000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1059,7 +1075,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
+      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1077,7 +1093,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27920645" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.27920645" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1102,10 +1118,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Patched another cast bug" />
-    <MESSAGE value="Removed random_string dependency" />
-    <MESSAGE value="Switch to MediaType" />
-    <MESSAGE value="Begin 2.0.0-alpha" />
     <MESSAGE value="Change signature of ResponseContext.jsonp" />
     <MESSAGE value="Changed view engine to use `Map&lt;String, dynamic&gt;`" />
     <MESSAGE value="Strip out json god" />
@@ -1127,7 +1139,11 @@
     <MESSAGE value="Make parseId static + docs" />
     <MESSAGE value="Make RequestContext generic" />
     <MESSAGE value="Completely remove RequestContext.io" />
-    <option name="LAST_COMMIT_MESSAGE" value="Completely remove RequestContext.io" />
+    <MESSAGE value="Completely remove ResponseContext.io" />
+    <MESSAGE value="Rename HTTP request+response impl, drop the &quot;impl&quot;" />
+    <MESSAGE value="Make lazy parsing the default" />
+    <MESSAGE value="Rename body parsing methods" />
+    <option name="LAST_COMMIT_MESSAGE" value="Rename body parsing methods" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1135,23 +1151,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3/lib/src/core_matchers.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="116" column="8" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="18" column="52" selection-start-line="18" selection-start-column="52" selection-end-line="18" selection-end-column="52" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="528">
@@ -1169,16 +1168,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="81">
@@ -1196,20 +1185,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1251,16 +1226,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/view.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1295,13 +1260,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
@@ -1380,13 +1338,6 @@
     <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="8" column="28" lean-forward="true" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="128">
@@ -1451,16 +1402,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2042">
-          <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="608">
@@ -1478,46 +1419,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="336">
-            <caret line="21" column="5" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="406">
-          <caret line="158" column="23" lean-forward="true" selection-start-line="158" selection-start-column="23" selection-end-line="158" selection-end-column="23" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="137" column="16" selection-start-line="137" selection-start-column="16" selection-end-line="137" selection-end-column="16" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="435">
@@ -1528,16 +1429,131 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1368">
+          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="656">
+          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="7" column="52" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-5">
+          <caret line="55" column="71" lean-forward="true" selection-start-line="55" selection-start-column="71" selection-end-line="55" selection-end-column="71" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1261">
-          <caret line="306" column="38" selection-start-line="306" selection-start-column="38" selection-end-line="306" selection-end-column="38" />
+        <state relative-caret-position="5223">
+          <caret line="361" column="36" lean-forward="true" selection-start-line="361" selection-start-column="36" selection-end-line="361" selection-end-column="36" />
           <folding>
             <element signature="e#48#68#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="25" column="53" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="30" column="50" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="464">
+            <caret line="29" column="99" selection-start-line="29" selection-start-column="99" selection-end-line="29" selection-end-column="99" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="257" column="28" lean-forward="true" selection-start-line="257" selection-start-column="28" selection-end-line="257" selection-end-column="28" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="172" column="28" selection-start-line="172" selection-start-column="28" selection-end-line="172" selection-end-column="28" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="19" column="38" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="83" column="22" lean-forward="true" selection-start-line="83" selection-start-column="22" selection-end-line="83" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="152">
+          <caret line="93" column="65" selection-start-line="93" selection-start-column="65" selection-end-line="93" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db310248..83a80483 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,4 +26,5 @@ gone.
 with `Angel.eagerParseRequestBodies`.
 * `Angel.storeOriginalBuffer` -> `Angel.storeRawRequestBuffers`.
 * The methods `lazyBody`, `lazyFiles`, and `lazyOriginalBuffer` on `ResponseContext` were all
-replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
\ No newline at end of file
+replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
+* Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`).
\ No newline at end of file
diff --git a/lib/src/core/metadata.dart b/lib/src/core/metadata.dart
index 0fd38063..df549b85 100644
--- a/lib/src/core/metadata.dart
+++ b/lib/src/core/metadata.dart
@@ -91,7 +91,7 @@ class Parameter {
       return req.headers.value(header) ?? defaultValue;
     if (session?.isNotEmpty == true)
       return req.session[session] ?? defaultValue;
-    if (query?.isNotEmpty == true) return req.query[query] ?? defaultValue;
+    if (query?.isNotEmpty == true) return req.uri.queryParameters[query] ?? defaultValue;
     return defaultValue;
   }
 }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index dd0930b7..639ad73b 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -59,70 +59,15 @@ abstract class RequestContext<RawRequest> {
   /// The original HTTP verb sent to the server.
   String get originalMethod;
 
-  StateError _unparsed(String type, String caps) => new StateError(
-      'Cannot get the $type of an unparsed request. Use lazy${caps}() instead.');
-
-  /// All post data submitted to the server.
-  ///
-  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
-  /// then an error will be thrown.
-  ///
-  /// **If you are writing a plug-in, use [parseBody] instead.**
-  Map get body {
-    if (_body == null)
-      throw _unparsed('body', 'Body');
-    else
-      return _body.body;
-  }
-
   /// The content type of an incoming request.
   MediaType get contentType;
 
-  /// Any and all files sent to the server with this request.
-  ///
-  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
-  /// then an error will be thrown.
-  ///
-  /// **If you are writing a plug-in, use [parseUploadedFiles] instead.**
-  List<FileUploadInfo> get files {
-    if (_body == null)
-      throw _unparsed('query', 'Files');
-    else
-      return _body.files;
-  }
-
-  /// The original body bytes sent with this request. May be empty.
-  ///
-  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
-  /// then an error will be thrown.
-  ///
-  /// **If you are writing a plug-in, use [parseRawRequestBuffer] instead.**
-  List<int> get originalBuffer {
-    if (_body == null)
-      throw _unparsed('original buffer', 'OriginalBuffer');
-    else
-      return _body.originalBuffer ?? [];
-  }
-
   /// The URL parameters extracted from the request URI.
   Map params = {};
 
   /// The requested path.
   String get path;
 
-  /// The parsed request query string.
-  ///
-  /// If you are lazy-parsing request bodies, but have not manually [parse]d this one,
-  /// then [uri].query will be returned.
-  ///
-  /// **If you are writing a plug-in, consider using [lazyQuery] instead.**
-  Map get query {
-    if (_body == null)
-      return _provisionalQuery ??= new Map.from(uri.queryParameters);
-    else
-      return _body.query;
-  }
-
   /// The remote address requesting this resource.
   InternetAddress get remoteAddress;
 
@@ -223,7 +168,7 @@ abstract class RequestContext<RawRequest> {
   /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the query.
   ///
   /// If [forceParse] is not `true`, then [uri].query will be returned, and no parsing will be performed.
-  Future<Map<String, dynamic>> lazyQuery({bool forceParse: false}) {
+  Future<Map<String, dynamic>> parseQuery({bool forceParse: false}) {
     if (_body == null && forceParse != true)
       return new Future.value(uri.queryParameters);
     else
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 455c891b..363ed2d1 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -160,11 +160,13 @@ class Service extends Routable {
 
     Middleware indexMiddleware = getAnnotation(service.index, Middleware);
     get('/', (RequestContext req, res) {
-      return this.index(mergeMap([
-        {'query': req.query},
-        restProvider,
-        req.serviceParams
-      ]));
+      return req.parseQuery().then((query) {
+        return this.index(mergeMap([
+          {'query': query},
+          restProvider,
+          req.serviceParams
+        ]));
+      });
     },
         middleware: []
           ..addAll(handlers)
@@ -172,18 +174,20 @@ class Service extends Routable {
 
     Middleware createMiddleware = getAnnotation(service.create, Middleware);
     post('/', (RequestContext req, ResponseContext res) {
-      return req.parseBody().then((body) {
-        return this
-            .create(
-                body,
-                mergeMap([
-                  {'query': req.query},
-                  restProvider,
-                  req.serviceParams
-                ]))
-            .then((r) {
-          res.statusCode = 201;
-          return r;
+      return req.parseQuery().then((query) {
+        return req.parseBody().then((body) {
+          return this
+              .create(
+                  body,
+                  mergeMap([
+                    {'query': query},
+                    restProvider,
+                    req.serviceParams
+                  ]))
+              .then((r) {
+            res.statusCode = 201;
+            return r;
+          });
         });
       });
     },
@@ -194,15 +198,17 @@ class Service extends Routable {
 
     Middleware readMiddleware = getAnnotation(service.read, Middleware);
 
-    get(
-        '/:id',
-        (RequestContext req, res) => this.read(
+    get('/:id', (RequestContext req, res) {
+      return req.parseQuery().then((query) {
+        return this.read(
             parseId(req.params['id']),
             mergeMap([
-              {'query': req.query},
+              {'query': query},
               restProvider,
               req.serviceParams
-            ])),
+            ]));
+      });
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
@@ -210,14 +216,18 @@ class Service extends Routable {
     Middleware modifyMiddleware = getAnnotation(service.modify, Middleware);
     patch(
         '/:id',
-        (RequestContext req, res) => req.parseBody().then((body) => this.modify(
-            parseId(req.params['id']),
-            body,
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ]))),
+        (RequestContext req, res) => req.parseBody().then((body) {
+              return req.parseQuery().then((query) {
+                return this.modify(
+                    parseId(req.params['id']),
+                    body,
+                    mergeMap([
+                      {'query': query},
+                      restProvider,
+                      req.serviceParams
+                    ]));
+              });
+            }),
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -226,56 +236,68 @@ class Service extends Routable {
     Middleware updateMiddleware = getAnnotation(service.update, Middleware);
     post(
         '/:id',
-        (RequestContext req, res) => req.parseBody().then((body) => this.update(
-            parseId(req.params['id']),
-            body,
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ]))),
+        (RequestContext req, res) => req.parseBody().then((body) {
+              return req.parseQuery().then((query) {
+                return this.update(
+                    parseId(req.params['id']),
+                    body,
+                    mergeMap([
+                      {'query': query},
+                      restProvider,
+                      req.serviceParams
+                    ]));
+              });
+            }),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put(
         '/:id',
-        (RequestContext req, res) => req.parseBody().then((body) => this.update(
-            parseId(req.params['id']),
-            body,
-            mergeMap([
-              {'query': req.query},
-              restProvider,
-              req.serviceParams
-            ]))),
+        (RequestContext req, res) => req.parseBody().then((body) {
+              return req.parseQuery().then((query) {
+                return this.update(
+                    parseId(req.params['id']),
+                    body,
+                    mergeMap([
+                      {'query': query},
+                      restProvider,
+                      req.serviceParams
+                    ]));
+              });
+            }),
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(service.remove, Middleware);
-    delete(
-        '/',
-        (RequestContext req, res) => this.remove(
+    delete('/', (RequestContext req, res) {
+      return req.parseQuery().then((query) {
+        return this.remove(
             null,
             mergeMap([
-              {'query': req.query},
+              {'query': query},
               restProvider,
               req.serviceParams
-            ])),
+            ]));
+      });
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
-    delete(
-        '/:id',
-        (RequestContext req, res) => this.remove(
+    delete('/:id', (RequestContext req, res) {
+      return req.parseQuery().then((query) {
+        return this.remove(
             parseId(req.params['id']),
             mergeMap([
-              {'query': req.query},
+              {'query': query},
               restProvider,
               req.serviceParams
-            ])),
+            ]));
+      });
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll(
diff --git a/test/routing_test.dart b/test/routing_test.dart
index e7b4a281..4573fe15 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -81,7 +81,7 @@ main() {
       res.redirectTo('Named routes', {'name': 'tests'});
     });
     app.get('/log', (RequestContext req, res) async {
-      print("Query: ${req.query}");
+      print("Query: ${await req.parseQuery()}");
       return "Logged";
     });
 

From e75d20102c1c2f3363f1a60a0165abd46b962eed Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 00:10:09 -0400
Subject: [PATCH 260/414] Update CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83a80483..d043cc97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,4 +27,5 @@ with `Angel.eagerParseRequestBodies`.
 * `Angel.storeOriginalBuffer` -> `Angel.storeRawRequestBuffers`.
 * The methods `lazyBody`, `lazyFiles`, and `lazyOriginalBuffer` on `ResponseContext` were all
 replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
-* Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`).
\ No newline at end of file
+* Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`),
+as well as `query`.
\ No newline at end of file

From e576fc5b504c89b557e7673e891744b2c08bf793 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 15:42:05 -0400
Subject: [PATCH 261/414] Remove req.injections

---
 .idea/workspace.xml               | 353 ++++++++++--------------------
 CHANGELOG.md                      |   3 +-
 lib/src/core/request_context.dart |  10 +-
 3 files changed, 123 insertions(+), 243 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 92c30624..dd238121 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,7 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/metadata.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/metadata.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -33,8 +30,8 @@
       <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/example/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="304">
-              <caret line="19" column="38" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
+            <state relative-caret-position="176">
+              <caret line="11" selection-start-line="11" selection-end-line="11" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
               </folding>
@@ -46,16 +43,7 @@
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="192">
-              <caret line="83" column="22" lean-forward="true" selection-start-line="83" selection-start-column="22" selection-end-line="83" selection-end-column="44" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="metadata.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="152">
-              <caret line="93" column="65" selection-start-line="93" selection-start-column="65" selection-end-line="93" selection-end-column="65" />
+              <caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -63,7 +51,7 @@
       <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
+            <state relative-caret-position="16">
               <caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
@@ -72,12 +60,12 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="464">
-                <caret line="29" column="99" selection-start-line="29" selection-start-column="99" selection-end-line="29" selection-end-column="99" />
+              <first_editor relative-caret-position="544">
+                <caret line="31" column="60" selection-start-line="31" selection-start-column="60" selection-end-line="31" selection-end-column="60" />
               </first_editor>
               <second_editor />
             </state>
@@ -87,8 +75,8 @@
       <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="172" column="28" selection-start-line="172" selection-start-column="28" selection-end-line="172" selection-end-column="28" />
+            <state relative-caret-position="5">
+              <caret line="49" column="56" selection-start-line="49" selection-start-column="56" selection-end-line="49" selection-end-column="56" />
               <folding>
                 <element signature="e#47#67#0" expanded="true" />
               </folding>
@@ -96,11 +84,20 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1443">
+              <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="140">
-              <caret line="257" column="28" lean-forward="true" selection-start-line="257" selection-start-column="28" selection-end-line="257" selection-end-column="28" />
+            <state relative-caret-position="3216">
+              <caret line="201" column="44" selection-start-line="201" selection-start-column="44" selection-end-line="201" selection-end-column="44" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
               </folding>
@@ -250,12 +247,12 @@
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -269,74 +266,19 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="37" />
+    <option name="x" value="100" />
     <option name="y" value="23" />
-    <option name="width" value="1403" />
+    <option name="width" value="1172" />
     <option name="height" value="784" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
+    <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes>
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
-      <pane id="PackagesPane" />
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <expand>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="example" type="cbb8eebc:String" user="example" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="test" type="cbb8eebc:String" user="test" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="tool" type="cbb8eebc:String" user="tool" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+    <panes />
   </component>
   <component name="PropertiesComponent">
     <property name="GO_FMT" value="false" />
@@ -674,21 +616,8 @@
       <workItem from="1533353660185" duration="262000" />
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
-      <workItem from="1534547885788" duration="9329000" />
-    </task>
-    <task id="LOCAL-00089" summary="+5">
-      <created>1529724578292</created>
-      <option name="number" value="00089" />
-      <option name="presentableId" value="LOCAL-00089" />
-      <option name="project" value="LOCAL" />
-      <updated>1529724578293</updated>
-    </task>
-    <task id="LOCAL-00090" summary="+6">
-      <created>1529726381237</created>
-      <option name="number" value="00090" />
-      <option name="presentableId" value="LOCAL-00090" />
-      <option name="project" value="LOCAL" />
-      <updated>1529726381237</updated>
+      <workItem from="1534547885788" duration="9908000" />
+      <workItem from="1534793956753" duration="160000" />
     </task>
     <task id="LOCAL-00091" summary="+7">
       <created>1530124843110</created>
@@ -1019,7 +948,21 @@
       <option name="project" value="LOCAL" />
       <updated>1534737069329</updated>
     </task>
-    <option name="localTasksCounter" value="138" />
+    <task id="LOCAL-00138" summary="Update query parsing">
+      <created>1534738194991</created>
+      <option name="number" value="00138" />
+      <option name="presentableId" value="LOCAL-00138" />
+      <option name="project" value="LOCAL" />
+      <updated>1534738194991</updated>
+    </task>
+    <task id="LOCAL-00139" summary="Update CHANGELOG">
+      <created>1534738209023</created>
+      <option name="number" value="00139" />
+      <option name="presentableId" value="LOCAL-00139" />
+      <option name="project" value="LOCAL" />
+      <updated>1534738209023</updated>
+    </task>
+    <option name="localTasksCounter" value="140" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1055,7 +998,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="171628000" />
+    <option name="totallyTimeSpent" value="172367000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1067,7 +1010,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="37" y="23" width="1403" height="784" extended-state="0" />
+    <frame x="100" y="23" width="1172" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1075,7 +1018,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1086,15 +1029,13 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
       <window_info content_ui="combo" id="Project" order="0" weight="0.27920645" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1105,7 +1046,9 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
     </layout>
@@ -1118,8 +1061,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Change signature of ResponseContext.jsonp" />
-    <MESSAGE value="Changed view engine to use `Map&lt;String, dynamic&gt;`" />
     <MESSAGE value="Strip out json god" />
     <MESSAGE value="Remove traces of json_god" />
     <MESSAGE value="Remove lib/hooks.dart" />
@@ -1143,7 +1084,9 @@
     <MESSAGE value="Rename HTTP request+response impl, drop the &quot;impl&quot;" />
     <MESSAGE value="Make lazy parsing the default" />
     <MESSAGE value="Rename body parsing methods" />
-    <option name="LAST_COMMIT_MESSAGE" value="Rename body parsing methods" />
+    <MESSAGE value="Update query parsing" />
+    <MESSAGE value="Update CHANGELOG" />
+    <option name="LAST_COMMIT_MESSAGE" value="Update CHANGELOG" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1151,16 +1094,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/anonymous_service_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="400">
@@ -1172,9 +1105,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="81">
           <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1196,9 +1126,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
           <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1220,9 +1147,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
           <caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1230,9 +1154,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
           <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1254,9 +1175,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
           <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1281,9 +1199,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/hooks.dart" />
     <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="16">
@@ -1291,19 +1207,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/common.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/common.dart" />
+    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart" />
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="438">
           <caret line="105" column="35" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1314,13 +1223,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/templating.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="7" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/example/templating.dart" />
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
@@ -1338,32 +1241,14 @@
     <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#1#33#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1338">
           <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1394,13 +1279,7 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#1#31#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1443,9 +1322,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="656">
           <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1460,9 +1336,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-5">
           <caret line="55" column="71" lean-forward="true" selection-start-line="55" selection-start-column="71" selection-end-line="55" selection-end-column="71" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1470,9 +1343,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5223">
           <caret line="361" column="36" lean-forward="true" selection-start-line="361" selection-start-column="36" selection-end-line="361" selection-end-column="36" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1490,19 +1360,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="464">
-            <caret line="29" column="99" selection-start-line="29" selection-start-column="99" selection-end-line="29" selection-end-column="99" />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-138">
+          <caret line="93" column="65" selection-start-line="93" selection-start-column="65" selection-end-line="93" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3216">
+          <caret line="201" column="44" selection-start-line="201" selection-start-column="44" selection-end-line="201" selection-end-column="44" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1443">
+          <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5">
+          <caret line="49" column="56" selection-start-line="49" selection-start-column="56" selection-end-line="49" selection-end-column="56" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
+        <state relative-caret-position="16">
           <caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
@@ -1510,47 +1421,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="257" column="28" lean-forward="true" selection-start-line="257" selection-start-column="28" selection-end-line="257" selection-end-column="28" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="172" column="28" selection-start-line="172" selection-start-column="28" selection-end-line="172" selection-end-column="28" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="19" column="38" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="83" column="22" lean-forward="true" selection-start-line="83" selection-start-column="22" selection-end-line="83" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="93" column="65" selection-start-line="93" selection-start-column="65" selection-end-line="93" selection-end-column="65" />
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="544">
+            <caret line="31" column="60" selection-start-line="31" selection-start-column="60" selection-end-line="31" selection-end-column="60" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d043cc97..30fafee5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,4 +28,5 @@ with `Angel.eagerParseRequestBodies`.
 * The methods `lazyBody`, `lazyFiles`, and `lazyOriginalBuffer` on `ResponseContext` were all
 replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
 * Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`),
-as well as `query`.
\ No newline at end of file
+as well as `query`.
+* Remove `Angel.injections` and `RequestContext.injections`.
\ No newline at end of file
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 639ad73b..38c6dad3 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import 'dart:io' show Cookie, HttpHeaders, HttpSession, InternetAddress;
 import 'dart:mirrors';
 
+import 'package:angel_container/angel_container.dart';
 import 'package:body_parser/body_parser.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:meta/meta.dart';
@@ -43,10 +44,11 @@ abstract class RequestContext<RawRequest> {
   /// The requested hostname.
   String get hostname;
 
-  final Map _injections = {};
-
-  /// A [Map] of singletons injected via [inject].
-  Map get injections => _injections;
+  /// The IoC container that can be used to provide functionality to produce
+  /// objects of a given type.
+  ///
+  /// This is a *child* of the container found in `app`.
+  Container get container;
 
   /// The user's IP.
   String get ip => remoteAddress.address;

From 8739dbe4f7b9e19b65e0e7736a32525fafc51cb9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 15:43:27 -0400
Subject: [PATCH 262/414] Remove Angel.inject

---
 .idea/workspace.xml      | 148 +++++++++++++++++++++++++++------------
 CHANGELOG.md             |   3 +-
 lib/src/core/server.dart |  11 ---
 3 files changed, 105 insertions(+), 57 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dd238121..2b2b93be 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -42,19 +42,19 @@
       <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="192">
-              <caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
+            <state relative-caret-position="352">
+              <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="http_request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="16">
-              <caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
+            <state relative-caret-position="156">
+              <caret line="250" column="3" lean-forward="true" selection-start-line="250" selection-start-column="3" selection-end-line="250" selection-end-column="3" />
               <folding>
-                <element signature="e#0#20#0" expanded="true" />
+                <element signature="e#38#58#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -64,8 +64,8 @@
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="544">
-                <caret line="31" column="60" selection-start-line="31" selection-start-column="60" selection-end-line="31" selection-end-column="60" />
+              <first_editor relative-caret-position="556">
+                <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
               </first_editor>
               <second_editor />
             </state>
@@ -117,7 +117,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>as Map&lt;String, dynamic&gt;</find>
       <find>result as Map&lt;String, dynamic&gt;</find>
       <find>random_strin</find>
       <find>Angel()</find>
@@ -147,6 +146,7 @@
       <find>origina</find>
       <find>originalBuffer</find>
       <find>lazyQue</find>
+      <find>injections</find>
     </findStrings>
     <replaceStrings>
       <replace>useStream</replace>
@@ -246,12 +246,12 @@
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -275,10 +275,65 @@
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="PackagesPane" />
+      <pane id="AndroidView" />
+      <pane id="ProjectPane" />
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <expand>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="example" type="cbb8eebc:String" user="example" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="core" type="cbb8eebc:String" user="core" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="test" type="cbb8eebc:String" user="test" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="tool" type="cbb8eebc:String" user="tool" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="GO_FMT" value="false" />
@@ -617,14 +672,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="160000" />
-    </task>
-    <task id="LOCAL-00091" summary="+7">
-      <created>1530124843110</created>
-      <option name="number" value="00091" />
-      <option name="presentableId" value="LOCAL-00091" />
-      <option name="project" value="LOCAL" />
-      <updated>1530124843111</updated>
+      <workItem from="1534793956753" duration="220000" />
     </task>
     <task id="LOCAL-00092" summary="Provide custom IsInstanceOf for testing">
       <created>1531146512450</created>
@@ -962,7 +1010,14 @@
       <option name="project" value="LOCAL" />
       <updated>1534738209023</updated>
     </task>
-    <option name="localTasksCounter" value="140" />
+    <task id="LOCAL-00140" summary="Remove req.injections">
+      <created>1534794125343</created>
+      <option name="number" value="00140" />
+      <option name="presentableId" value="LOCAL-00140" />
+      <option name="project" value="LOCAL" />
+      <updated>1534794125343</updated>
+    </task>
+    <option name="localTasksCounter" value="141" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -998,7 +1053,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="172367000" />
+    <option name="totallyTimeSpent" value="172427000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1035,7 +1090,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27920645" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.27876106" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1061,7 +1116,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Strip out json god" />
     <MESSAGE value="Remove traces of json_god" />
     <MESSAGE value="Remove lib/hooks.dart" />
     <MESSAGE value="Remove lib/common.dart" />
@@ -1086,7 +1140,8 @@
     <MESSAGE value="Rename body parsing methods" />
     <MESSAGE value="Update query parsing" />
     <MESSAGE value="Update CHANGELOG" />
-    <option name="LAST_COMMIT_MESSAGE" value="Update CHANGELOG" />
+    <MESSAGE value="Remove req.injections" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove req.injections" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1332,13 +1387,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5">
-          <caret line="55" column="71" lean-forward="true" selection-start-line="55" selection-start-column="71" selection-end-line="55" selection-end-column="71" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5223">
@@ -1367,13 +1415,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3216">
@@ -1413,19 +1454,36 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
+        <state relative-caret-position="183">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="156">
+          <caret line="250" column="3" lean-forward="true" selection-start-line="250" selection-start-column="3" selection-end-line="250" selection-end-column="3" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="544">
-            <caret line="31" column="60" selection-start-line="31" selection-start-column="60" selection-end-line="31" selection-end-column="60" />
+          <first_editor relative-caret-position="556">
+            <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
           </first_editor>
           <second_editor />
         </state>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30fafee5..b0f23878 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,4 +29,5 @@ with `Angel.eagerParseRequestBodies`.
 replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
 * Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`),
 as well as `query`.
-* Remove `Angel.injections` and `RequestContext.injections`.
\ No newline at end of file
+* Removed `Angel.injections` and `RequestContext.injections`.
+* Removed `Angel.inject`.
\ No newline at end of file
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index f941b51e..466ac2a2 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -45,8 +45,6 @@ class Angel extends Routable {
   /// A global Map of converters that can transform responses bodies.
   final Map<String, Converter<List<int>, List<int>>> encoders = {};
 
-  final Map _injections = {};
-
   /// A function that is called on every request to create a [Zone], A.K.A an asynchronous
   /// execution context.
   ///
@@ -113,9 +111,6 @@ class Angel extends Routable {
   /// These will only not run if a response's `willCloseItself` is set to `true`.
   final List<RequestHandler> responseFinalizers = [];
 
-  /// All global dependencies injected into the application.
-  Map get injections => _injections;
-
   Container _container;
 
   /// A [Map] of application-specific data that can be accessed by any
@@ -213,7 +208,6 @@ class Angel extends Routable {
     viewGenerator = noViewEngineConfigured;
     _preContained.clear();
     handlerCache.clear();
-    _injections.clear();
     encoders.clear();
     //_serializer = json.encode;
     _children.clear();
@@ -256,11 +250,6 @@ class Angel extends Routable {
     }
   }
 
-  /// Shortcut for adding a middleware to inject a key/value pair on every request.
-  void inject(key, value) {
-    _injections[key] = value;
-  }
-
   /// Shortcuts for adding converters to transform the response buffer/stream of any request.
   void injectEncoders(Map<String, Converter<List<int>, List<int>>> encoders) {
     this.encoders.addAll(encoders);

From b95f6b26e20e125e31ec664e9223dda5070529a2 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 15:46:12 -0400
Subject: [PATCH 263/414] Remove dep on package:pool

---
 CHANGELOG.md                 |  3 ++-
 lib/src/http/angel_http.dart | 21 +--------------------
 pubspec.yaml                 |  1 -
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0f23878..f1157295 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,4 +30,5 @@ replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, re
 * Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`),
 as well as `query`.
 * Removed `Angel.injections` and `RequestContext.injections`.
-* Removed `Angel.inject`.
\ No newline at end of file
+* Removed `Angel.inject`.
+* Removed a dependency on `package:pool`, which also meant removing `AngelHttp.throttle`.
\ No newline at end of file
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index dda37b8f..c4a750fc 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -11,7 +11,6 @@ import 'dart:io'
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
-import 'package:pool/pool.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:tuple/tuple.dart';
 import 'http_request_context.dart';
@@ -29,8 +28,6 @@ class AngelHttp {
   Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
   StreamSubscription<HttpRequest> _sub;
 
-  Pool _pool;
-
   AngelHttp(this.app, {this.useZone: true});
 
   /// The function used to bind this instance to an HTTP server.
@@ -323,10 +320,6 @@ class AngelHttp {
         ..add(outputBuffer);
 
       return request.response.close().then((_) {
-        if (req.injections.containsKey(PoolResource)) {
-          req.injections[PoolResource].release();
-        }
-
         if (!app.isProduction && app.logger != null) {
           var sw = req.grab<Stopwatch>(Stopwatch);
 
@@ -343,11 +336,7 @@ class AngelHttp {
   Future<HttpRequestContext> createRequestContext(HttpRequest request) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
     if (path.length == 0) path = '/';
-    return HttpRequestContext.from(request, app, path).then((req) {
-      if (_pool != null) req.inject(PoolResource, _pool.request());
-      if (app.injections.isNotEmpty) app.injections.forEach(req.inject);
-      return req;
-    });
+    return HttpRequestContext.from(request, app, path);
   }
 
   Future<ResponseContext> createResponseContext(HttpResponse response,
@@ -356,12 +345,4 @@ class AngelHttp {
           response, app, correspondingRequest as HttpRequestContext)
         ..serializer = (app.serializer ?? json.encode)
         ..encoders.addAll(app.encoders ?? {}));
-
-  /// Limits the maximum number of requests to be handled concurrently by this instance.
-  ///
-  /// You can optionally provide a [timeout] to limit the amount of time a request can be
-  /// handled before.
-  void throttle(int maxConcurrentRequests, {Duration timeout}) {
-    _pool = new Pool(maxConcurrentRequests, timeout: timeout);
-  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 9a7b05b4..d0446987 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,7 +27,6 @@ dependencies:
   meta: ^1.0.0
   mime: ^0.9.3
   path: ^1.0.0
-  pool: ^1.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0
 dev_dependencies:

From a814e3d1a70ac208276e6637d30b154da5d00417 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 15:50:29 -0400
Subject: [PATCH 264/414] waterfall now only accepts RequestHandler

---
 CHANGELOG.md               |  4 +++-
 lib/src/core/routable.dart | 18 +++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1157295..cb9d4309 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,4 +31,6 @@ replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, re
 as well as `query`.
 * Removed `Angel.injections` and `RequestContext.injections`.
 * Removed `Angel.inject`.
-* Removed a dependency on `package:pool`, which also meant removing `AngelHttp.throttle`.
\ No newline at end of file
+* Removed a dependency on `package:pool`, which also meant removing `AngelHttp.throttle`.
+* Remove the `RequestMiddleware` typedef; from now on, one should use `ResponseContext.end`
+exclusively to close responses.
\ No newline at end of file
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 14fc90a2..2fa9fac2 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -1,7 +1,9 @@
 library angel_framework.http.routable;
 
 import 'dart:async';
+
 import 'package:angel_route/angel_route.dart';
+
 import '../util.dart';
 import 'hooked_service.dart';
 import 'metadata.dart';
@@ -12,32 +14,29 @@ import 'service.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
-/// A function that intercepts a request and determines whether handling of it should continue.
-typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
-
 /// A function that receives an incoming [RequestContext] and responds to it.
 typedef FutureOr RequestHandler(RequestContext req, ResponseContext res);
 
 /// Sequentially runs a list of [handlers] of middleware, and returns early if any does not
 /// return `true`. Works well with [Router].chain.
-RequestMiddleware waterfall(List handlers) {
+RequestHandler waterfall(Iterable<RequestHandler> handlers) {
   return (req, res) {
-    Future<bool> Function() runPipeline;
+    Future Function() runPipeline;
 
     for (var handler in handlers) {
       if (handler == null) break;
 
       if (runPipeline == null)
-        runPipeline = () => req.app.executeHandler(handler, req, res);
+        runPipeline = () => Future.sync(() => handler(req, res));
       else {
         var current = runPipeline;
-        runPipeline = () => current().then((result) => !result
+        runPipeline = () => current().then((result) => !res.isOpen
             ? new Future.value(result)
             : req.app.executeHandler(handler, req, res));
       }
     }
 
-    runPipeline ??= () => new Future.value(true);
+    runPipeline ??= () => new Future.value();
     return runPipeline();
   };
 }
@@ -58,7 +57,8 @@ class Routable extends Router {
 
   /// Additional filters to be run on designated requests.
   @override
-  final Map<String, RequestHandler> requestMiddleware = <String, RequestHandler>{};
+  final Map<String, RequestHandler> requestMiddleware =
+      <String, RequestHandler>{};
 
   /// A set of [Service] objects that have been mapped into routes.
   Map<Pattern, Service> get services => _services;

From cfc5991fffa3f749b8d4df0d712e6de5ea68d8f6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 15:52:44 -0400
Subject: [PATCH 265/414] Remove req.inject

---
 CHANGELOG.md                      |  5 +++--
 lib/src/core/request_context.dart | 11 -----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb9d4309..84bdedc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@ replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, re
 * Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`),
 as well as `query`.
 * Removed `Angel.injections` and `RequestContext.injections`.
-* Removed `Angel.inject`.
+* Removed `Angel.inject` and `RequestContext.inject`.
 * Removed a dependency on `package:pool`, which also meant removing `AngelHttp.throttle`.
 * Remove the `RequestMiddleware` typedef; from now on, one should use `ResponseContext.end`
-exclusively to close responses.
\ No newline at end of file
+exclusively to close responses.
+* `waterfall` will now only accept `RequestHandler`.
\ No newline at end of file
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 38c6dad3..32e8e2af 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -112,17 +112,6 @@ abstract class RequestContext<RawRequest> {
     }
   }
 
-  /// Shorthand to add to [_injections].
-  void inject(type, value) {
-    if (!app.isProduction && type is Type) {
-      if (!reflect(value).type.isAssignableTo(reflectType(type)))
-        throw new ArgumentError(
-            'Cannot inject $value (${value.runtimeType}) as an instance of $type.');
-    }
-
-    _injections[type] = value;
-  }
-
   /// Returns `true` if the client's `Accept` header indicates that the given [contentType] is considered a valid response.
   ///
   /// You cannot provide a `null` [contentType].

From 3e62d1d31fb2d39074e30df3523eb4a7d99b4c24 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 15:55:44 -0400
Subject: [PATCH 266/414] Implement HttpReqCtx.container

---
 .idea/libraries/Dart_Packages.xml      |   8 +-
 .idea/workspace.xml                    | 286 ++++++++++---------------
 lib/src/http/http_request_context.dart |   8 +-
 pubspec.yaml                           |   2 +-
 4 files changed, 131 insertions(+), 173 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 37425f8a..ec70caa9 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
         <entry key="angel_container">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib" />
             </list>
           </value>
         </entry>
@@ -33,7 +33,7 @@
         <entry key="angel_route">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib" />
             </list>
           </value>
         </entry>
@@ -454,10 +454,10 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.5.0/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/body_parser-1.1.1/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b2b93be..30b0eae6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,32 +27,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="11" selection-start-line="11" selection-end-line="11" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="352">
-              <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="156">
-              <caret line="250" column="3" lean-forward="true" selection-start-line="250" selection-start-column="3" selection-end-line="250" selection-end-column="3" />
+            <state relative-caret-position="262">
+              <caret line="82" column="47" lean-forward="true" selection-start-line="82" selection-start-column="47" selection-end-line="82" selection-end-column="47" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -60,35 +39,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="556">
-                <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5">
-              <caret line="49" column="56" selection-start-line="49" selection-start-column="56" selection-end-line="49" selection-end-column="56" />
-              <folding>
-                <element signature="e#47#67#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1443">
-              <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
+            <state relative-caret-position="-7">
+              <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
             </state>
           </provider>
         </entry>
@@ -231,13 +186,10 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
@@ -245,14 +197,17 @@
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
       </list>
     </option>
   </component>
@@ -266,9 +221,9 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="100" />
+    <option name="x" value="36" />
     <option name="y" value="23" />
-    <option name="width" value="1172" />
+    <option name="width" value="1342" />
     <option name="height" value="784" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -672,35 +627,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="220000" />
-    </task>
-    <task id="LOCAL-00092" summary="Provide custom IsInstanceOf for testing">
-      <created>1531146512450</created>
-      <option name="number" value="00092" />
-      <option name="presentableId" value="LOCAL-00092" />
-      <option name="project" value="LOCAL" />
-      <updated>1531146512451</updated>
-    </task>
-    <task id="LOCAL-00093" summary="Tracked down the rogue &quot;null&quot; print">
-      <created>1531147206687</created>
-      <option name="number" value="00093" />
-      <option name="presentableId" value="LOCAL-00093" />
-      <option name="project" value="LOCAL" />
-      <updated>1531147206687</updated>
-    </task>
-    <task id="LOCAL-00094" summary="CHANGELOG, bump to 1.1.4+8">
-      <created>1531147434255</created>
-      <option name="number" value="00094" />
-      <option name="presentableId" value="LOCAL-00094" />
-      <option name="project" value="LOCAL" />
-      <updated>1531147434255</updated>
-    </task>
-    <task id="LOCAL-00095" summary="Patch services_test for strong mode">
-      <created>1531147799220</created>
-      <option name="number" value="00095" />
-      <option name="presentableId" value="LOCAL-00095" />
-      <option name="project" value="LOCAL" />
-      <updated>1531147799220</updated>
+      <workItem from="1534793956753" duration="977000" />
     </task>
     <task id="LOCAL-00096" summary="More &lt;String, String&gt; patches in tests">
       <created>1531148090824</created>
@@ -1017,7 +944,35 @@
       <option name="project" value="LOCAL" />
       <updated>1534794125343</updated>
     </task>
-    <option name="localTasksCounter" value="141" />
+    <task id="LOCAL-00141" summary="Remove Angel.inject">
+      <created>1534794207777</created>
+      <option name="number" value="00141" />
+      <option name="presentableId" value="LOCAL-00141" />
+      <option name="project" value="LOCAL" />
+      <updated>1534794207778</updated>
+    </task>
+    <task id="LOCAL-00142" summary="Remove dep on package:pool">
+      <created>1534794372882</created>
+      <option name="number" value="00142" />
+      <option name="presentableId" value="LOCAL-00142" />
+      <option name="project" value="LOCAL" />
+      <updated>1534794372882</updated>
+    </task>
+    <task id="LOCAL-00143" summary="waterfall now only accepts RequestHandler">
+      <created>1534794629985</created>
+      <option name="number" value="00143" />
+      <option name="presentableId" value="LOCAL-00143" />
+      <option name="project" value="LOCAL" />
+      <updated>1534794629985</updated>
+    </task>
+    <task id="LOCAL-00144" summary="Remove req.inject">
+      <created>1534794764995</created>
+      <option name="number" value="00144" />
+      <option name="presentableId" value="LOCAL-00144" />
+      <option name="project" value="LOCAL" />
+      <updated>1534794764995</updated>
+    </task>
+    <option name="localTasksCounter" value="145" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1053,7 +1008,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="172427000" />
+    <option name="totallyTimeSpent" value="173184000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1065,7 +1020,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="100" y="23" width="1172" height="784" extended-state="0" />
+    <frame x="36" y="23" width="1342" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1084,13 +1039,14 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27876106" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27846155" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1103,7 +1059,6 @@
       <window_info id="DB Browser" order="2" weight="0.32998413" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
     </layout>
@@ -1116,10 +1071,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Remove traces of json_god" />
-    <MESSAGE value="Remove lib/hooks.dart" />
-    <MESSAGE value="Remove lib/common.dart" />
-    <MESSAGE value="Strip out TypedService" />
     <MESSAGE value="Make reflector a named parameter" />
     <MESSAGE value="Force dep on Dart &gt;=2.0.0-dev" />
     <MESSAGE value="CHANGELOG now only reflects on 2.0.0-alpha+" />
@@ -1141,7 +1092,11 @@
     <MESSAGE value="Update query parsing" />
     <MESSAGE value="Update CHANGELOG" />
     <MESSAGE value="Remove req.injections" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove req.injections" />
+    <MESSAGE value="Remove Angel.inject" />
+    <MESSAGE value="Remove dep on package:pool" />
+    <MESSAGE value="waterfall now only accepts RequestHandler" />
+    <MESSAGE value="Remove req.inject" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove req.inject" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1170,13 +1125,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="14" column="40" lean-forward="true" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
@@ -1279,13 +1227,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/example/templating.dart" />
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="10" column="12" lean-forward="true" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/all.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="352">
@@ -1343,26 +1284,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="69" column="5" lean-forward="true" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
-          <caret line="330" column="40" selection-start-line="330" selection-start-column="40" selection-end-line="330" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1368">
@@ -1425,70 +1346,101 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="88" column="56" selection-start-line="88" selection-start-column="56" selection-end-line="88" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="51" column="42" lean-forward="true" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/example/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
+        <state relative-caret-position="304">
+          <caret line="19" column="38" lean-forward="true" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
           <folding>
             <element signature="e#0#46#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1443">
-          <caret line="31" column="19" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5">
-          <caret line="49" column="56" selection-start-line="49" selection-start-column="56" selection-end-line="49" selection-end-column="56" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+        <state relative-caret-position="534">
+          <caret line="346" column="47" selection-start-line="346" selection-start-column="47" selection-end-line="346" selection-end-column="47" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="30" column="17" lean-forward="true" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
+        <state relative-caret-position="163">
+          <caret line="148" lean-forward="true" selection-start-line="148" selection-end-line="148" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="156">
-          <caret line="250" column="3" lean-forward="true" selection-start-line="250" selection-start-column="3" selection-end-line="250" selection-end-column="3" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-7">
+          <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="69">
+          <caret line="7" column="20" lean-forward="true" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="352">
+          <caret line="30" column="17" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="556">
-            <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
+          <first_editor relative-caret-position="124">
+            <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="262">
+          <caret line="136" column="11" lean-forward="true" selection-start-line="136" selection-start-column="11" selection-end-line="136" selection-end-column="11" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="262">
+          <caret line="82" column="47" lean-forward="true" selection-start-line="82" selection-start-column="47" selection-end-line="82" selection-end-column="47" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index d0a1b028..2e71dd26 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:angel_container/angel_container.dart';
 import 'package:body_parser/body_parser.dart';
 import 'package:http_parser/http_parser.dart';
 
@@ -8,10 +9,14 @@ import '../core/core.dart';
 
 /// An implementation of [RequestContext] that wraps a [HttpRequest].
 class HttpRequestContext extends RequestContext<HttpRequest> {
+  Container _container;
   MediaType _contentType;
   HttpRequest _io;
   String _override, _path;
 
+  @override
+  Container get container => _container;
+
   @override
   MediaType get contentType {
     return _contentType;
@@ -77,7 +82,8 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
   /// Magically transforms an [HttpRequest] into a [RequestContext].
   static Future<HttpRequestContext> from(
       HttpRequest request, Angel app, String path) {
-    HttpRequestContext ctx = new HttpRequestContext();
+    HttpRequestContext ctx = new HttpRequestContext()
+      .._container = app.container.createChild();
 
     String override = request.method;
 
diff --git a/pubspec.yaml b/pubspec.yaml
index d0446987..ca44a078 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   angel_container: ^1.0.0-alpha
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0
-  angel_route: ^2.0.0
+  angel_route: ^3.0.0
   body_parser: ^1.0.0
   charcode: ^1.0.0
   combinator: ^1.0.0

From b9127251a6f52d52efa8db821e41804e510b981c Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 16:00:18 -0400
Subject: [PATCH 267/414] Remove usage of removed symbols

---
 .idea/workspace.xml        | 135 +++++++++++++++++++++++--------------
 lib/src/core/routable.dart |  18 +----
 lib/src/core/server.dart   |  17 ++---
 3 files changed, 98 insertions(+), 72 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 30b0eae6..d56708ee 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_request_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,11 +27,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="262">
-              <caret line="82" column="47" lean-forward="true" selection-start-line="82" selection-start-column="47" selection-end-line="82" selection-end-column="47" />
+            <state relative-caret-position="-1384">
+              <caret line="189" column="31" lean-forward="true" selection-start-line="189" selection-start-column="31" selection-end-line="189" selection-end-column="31" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -39,11 +39,41 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="312">
+              <caret line="129" column="40" lean-forward="true" selection-start-line="129" selection-start-column="40" selection-end-line="129" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="container.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib/src/container.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="406">
+              <caret line="96" column="33" lean-forward="true" selection-start-line="96" selection-start-column="33" selection-end-line="96" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-7">
-              <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
+            <state relative-caret-position="108">
+              <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
+              <folding>
+                <element signature="e#40#60#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="178">
+              <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -72,7 +102,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>result as Map&lt;String, dynamic&gt;</find>
       <find>random_strin</find>
       <find>Angel()</find>
       <find>change</find>
@@ -102,6 +131,7 @@
       <find>originalBuffer</find>
       <find>lazyQue</find>
       <find>injections</find>
+      <find>singleton(</find>
     </findStrings>
     <replaceStrings>
       <replace>useStream</replace>
@@ -201,13 +231,13 @@
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
       </list>
     </option>
   </component>
@@ -627,14 +657,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="977000" />
-    </task>
-    <task id="LOCAL-00096" summary="More &lt;String, String&gt; patches in tests">
-      <created>1531148090824</created>
-      <option name="number" value="00096" />
-      <option name="presentableId" value="LOCAL-00096" />
-      <option name="project" value="LOCAL" />
-      <updated>1531148090824</updated>
+      <workItem from="1534793956753" duration="1252000" />
     </task>
     <task id="LOCAL-00097" summary="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774">
       <created>1531148520815</created>
@@ -972,7 +995,14 @@
       <option name="project" value="LOCAL" />
       <updated>1534794764995</updated>
     </task>
-    <option name="localTasksCounter" value="145" />
+    <task id="LOCAL-00145" summary="Implement HttpReqCtx.container">
+      <created>1534794944288</created>
+      <option name="number" value="00145" />
+      <option name="presentableId" value="LOCAL-00145" />
+      <option name="project" value="LOCAL" />
+      <updated>1534794944288</updated>
+    </task>
+    <option name="localTasksCounter" value="146" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1008,7 +1038,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="173184000" />
+    <option name="totallyTimeSpent" value="173459000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1046,7 +1076,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27846155" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.27846155" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1071,7 +1101,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Make reflector a named parameter" />
     <MESSAGE value="Force dep on Dart &gt;=2.0.0-dev" />
     <MESSAGE value="CHANGELOG now only reflects on 2.0.0-alpha+" />
     <MESSAGE value="Remove Jael example" />
@@ -1096,7 +1125,8 @@
     <MESSAGE value="Remove dep on package:pool" />
     <MESSAGE value="waterfall now only accepts RequestHandler" />
     <MESSAGE value="Remove req.inject" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove req.inject" />
+    <MESSAGE value="Implement HttpReqCtx.container" />
+    <option name="LAST_COMMIT_MESSAGE" value="Implement HttpReqCtx.container" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1104,13 +1134,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="81">
@@ -1274,9 +1297,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="608">
@@ -1390,13 +1410,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-7">
-          <caret line="9" column="30" selection-start-line="9" selection-start-column="30" selection-end-line="9" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
@@ -1404,13 +1417,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="30" column="17" selection-start-line="30" selection-start-column="17" selection-end-line="30" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1431,16 +1437,47 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib/src/container.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="406">
+          <caret line="96" column="33" lean-forward="true" selection-start-line="96" selection-start-column="33" selection-end-line="96" selection-end-column="33" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="82" column="47" lean-forward="true" selection-start-line="82" selection-start-column="47" selection-end-line="82" selection-end-column="47" />
+        <state relative-caret-position="-1384">
+          <caret line="189" column="31" lean-forward="true" selection-start-line="189" selection-start-column="31" selection-end-line="189" selection-end-column="31" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="312">
+          <caret line="129" column="40" lean-forward="true" selection-start-line="129" selection-start-column="40" selection-end-line="129" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 2fa9fac2..9944e38f 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -51,15 +51,9 @@ class Routable extends Router {
   void close() {
     _services.clear();
     configuration.clear();
-    requestMiddleware.clear();
     _onService.close();
   }
 
-  /// Additional filters to be run on designated requests.
-  @override
-  final Map<String, RequestHandler> requestMiddleware =
-      <String, RequestHandler>{};
-
   /// A set of [Service] objects that have been mapped into routes.
   Map<Pattern, Service> get services => _services;
 
@@ -77,8 +71,8 @@ class Routable extends Router {
       _services[path.toString().replaceAll(_straySlashes, '')];
 
   @override
-  Route addRoute(String method, Pattern path, Object handler,
-      {List middleware: const []}) {
+  Route addRoute(String method, String path, Object handler,
+      {Iterable middleware: const []}) {
     final List handlers = [];
     // Merge @Middleware declaration, if any
     Middleware middlewareDeclaration = getAnnotation(handler, Middleware);
@@ -131,18 +125,12 @@ class Routable extends Router {
     // Let's copy middleware, heeding the optional middleware namespace.
     String middlewarePrefix = namespace != null ? "$namespace." : "";
 
-    Map copiedMiddleware = new Map.from(router.requestMiddleware);
-    for (String middlewareName in copiedMiddleware.keys) {
-      requestMiddleware.putIfAbsent("$middlewarePrefix$middlewareName",
-          () => copiedMiddleware[middlewareName] as RequestHandler);
-    }
-
     // Also copy properties...
     if (router is Routable) {
       Map copiedProperties = new Map.from(router.configuration);
       for (String propertyName in copiedProperties.keys) {
         configuration.putIfAbsent("$middlewarePrefix$propertyName",
-            () => copiedMiddleware[propertyName]);
+            () => copiedProperties[propertyName]);
       }
     }
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 466ac2a2..6e219a4d 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -175,24 +175,25 @@ class Angel extends Routable {
   }
 
   @override
-  mount(Pattern path, Router router, {bool hooked: true, String namespace}) {
+  mount(Pattern path, Router router) {
     if (_flattened != null) {
       logger?.warning(
           'WARNING: You added mounted a child router ($path) on the router, after it had been optimized.');
       logger?.warning(
           'This route will be ignored, and no requests will ever reach it.');
     }
-    return super.mount(path.toString(), router,
-        hooked: hooked != false, namespace: namespace);
+    return super.mount(path.toString(), router);
   }
 
   /// Loads some base dependencies into the service container.
   void bootstrapContainer() {
-    if (runtimeType != Angel) container.singleton(this, as: Angel);
-    container.singleton(this, as: Angel);
-    container.singleton(this, as: Routable);
-    container.singleton(this, as: Router);
-    container.singleton(this);
+    if (runtimeType != Angel) {
+      container.registerSingleton(this);
+    }
+
+    container.registerSingleton<Angel>(this);
+    container.registerSingleton<Routable>(this);
+    container.registerSingleton<Router>(this);
   }
 
   /// Shuts down the server, and closes any open [StreamController]s.

From 3c37747f07a57bd28bbe4f1a369dd830fa54ba5b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 16:21:06 -0400
Subject: [PATCH 268/414] Force all handlers to (req, res) { ... }

---
 CHANGELOG.md                     |  7 ++++-
 example/json.dart                | 13 ++++-----
 example/view.dart                |  2 +-
 lib/src/core/hooked_service.dart |  3 ++-
 lib/src/core/metadata.dart       | 13 +++++----
 lib/src/core/routable.dart       | 15 ++++++-----
 lib/src/core/server.dart         |  4 +--
 lib/src/core/service.dart        |  9 ++++---
 lib/src/http/controller.dart     |  4 +--
 test/general_test.dart           |  4 +--
 test/routing_test.dart           | 45 ++++++++++++++++----------------
 test/streaming_test.dart         | 16 +++++++-----
 12 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84bdedc7..4b961440 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,4 +34,9 @@ as well as `query`.
 * Removed a dependency on `package:pool`, which also meant removing `AngelHttp.throttle`.
 * Remove the `RequestMiddleware` typedef; from now on, one should use `ResponseContext.end`
 exclusively to close responses.
-* `waterfall` will now only accept `RequestHandler`.
\ No newline at end of file
+* `waterfall` will now only accept `RequestHandler`.
+* `Routable`, and all of its subclasses, now extend `Router<RequestHandler>`, and therefore only
+take routes in the form of `FutureOr myFunc(RequestContext, ResponseContext res)`.
+* `@Middleware` now takes an `Iterable` of `RequestHandler`s.
+* `@Expose.path` now *must* be a `String`, not just any `Pattern`.
+* `@Expose.middleware` now takes `Iterable<RequestHandler>`, instead of just `List`.
\ No newline at end of file
diff --git a/example/json.dart b/example/json.dart
index 7b7cd98b..2d608c34 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -32,15 +32,16 @@ serverMain(_) async {
   var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp.custom(app, startShared); // Run a cluster
 
-  app.get('/', {
-    "foo": "bar",
-    "one": [2, "three"],
-    "bar": {"baz": "quux"}
+  app.get('/', (req, res) {
+    res.serialize({
+      "foo": "bar",
+      "one": [2, "three"],
+      "bar": {"baz": "quux"}
+    });
   });
 
   // Performance tuning
-  app
-    ..serializer = json.encode;
+  app..serializer = json.encode;
 
   app.errorHandler = (e, req, res) {
     print(e.message ?? e.error ?? e);
diff --git a/example/view.dart b/example/view.dart
index 6f8cddd7..b117993f 100644
--- a/example/view.dart
+++ b/example/view.dart
@@ -8,7 +8,7 @@ main() async {
       'View generator invoked with name $name and data: $data';
 
   // Index route. Returns JSON.
-  app.get('/', (ResponseContext res) => res.render('index', {'foo': 'bar'}));
+  app.get('/', (req, res) => res.render('index', {'foo': 'bar'}));
 
   var http = new AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index b123781b..f9bfd987 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import '../util.dart';
 import 'request_context.dart';
 import 'response_context.dart';
+import 'routable.dart';
 import 'metadata.dart';
 import 'service.dart';
 
@@ -119,7 +120,7 @@ class HookedService extends Service {
     applyListeners(inner.remove, afterRemoved, true);
   }
 
-  List get bootstrappers => new List.from(super.bootstrappers)
+  List<RequestHandler> get bootstrappers => new List<RequestHandler>.from(super.bootstrappers)
     ..add((RequestContext req, ResponseContext res) {
       req.serviceParams
         ..['__requestctx'] = req
diff --git a/lib/src/core/metadata.dart b/lib/src/core/metadata.dart
index df549b85..5e1f0f00 100644
--- a/lib/src/core/metadata.dart
+++ b/lib/src/core/metadata.dart
@@ -1,12 +1,14 @@
 library angel_framework.http.metadata;
 
-import 'hooked_service.dart' show HookedServiceEventListener;
 import 'package:angel_http_exception/angel_http_exception.dart';
+
+import 'hooked_service.dart' show HookedServiceEventListener;
 import 'request_context.dart';
+import 'routable.dart';
 
 /// Annotation to map middleware onto a handler.
 class Middleware {
-  final List handlers;
+  final Iterable<RequestHandler> handlers;
 
   const Middleware(this.handlers);
 }
@@ -22,8 +24,8 @@ class Hooks {
 /// Exposes a [Controller] to the Internet.
 class Expose {
   final String method;
-  final Pattern path;
-  final List middleware;
+  final String path;
+  final Iterable<RequestHandler> middleware;
   final String as;
   final List<String> allowNull;
 
@@ -91,7 +93,8 @@ class Parameter {
       return req.headers.value(header) ?? defaultValue;
     if (session?.isNotEmpty == true)
       return req.session[session] ?? defaultValue;
-    if (query?.isNotEmpty == true) return req.uri.queryParameters[query] ?? defaultValue;
+    if (query?.isNotEmpty == true)
+      return req.uri.queryParameters[query] ?? defaultValue;
     return defaultValue;
   }
 }
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 9944e38f..b34fe06d 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -42,7 +42,7 @@ RequestHandler waterfall(Iterable<RequestHandler> handlers) {
 }
 
 /// A routable server that can handle dynamic requests.
-class Routable extends Router {
+class Routable extends Router<RequestHandler> {
   final Map<Pattern, Service> _services = {};
   final Map configuration = {};
 
@@ -71,16 +71,17 @@ class Routable extends Router {
       _services[path.toString().replaceAll(_straySlashes, '')];
 
   @override
-  Route addRoute(String method, String path, Object handler,
-      {Iterable middleware: const []}) {
-    final List handlers = [];
+  Route<RequestHandler> addRoute(
+      String method, String path, RequestHandler handler,
+      {Iterable<RequestHandler> middleware: const <RequestHandler>[]}) {
+    final handlers = <RequestHandler>[];
     // Merge @Middleware declaration, if any
     Middleware middlewareDeclaration = getAnnotation(handler, Middleware);
     if (middlewareDeclaration != null) {
       handlers.addAll(middlewareDeclaration.handlers);
     }
 
-    final List handlerSequence = [];
+    final handlerSequence = <RequestHandler>[];
     handlerSequence.addAll(middleware ?? []);
     handlerSequence.addAll(handlers);
 
@@ -94,8 +95,8 @@ class Routable extends Router {
   /// an [Angel] instance.
   ///
   /// Returns either a [Route] or a [Service] (if one was mounted).
-  use(path, [Router router, String namespace = null]) {
-    Router _router = router;
+  use(path, [Router<RequestHandler> router, String namespace = null]) {
+    Router<RequestHandler> _router = router;
     Service service;
 
     // If we need to hook this service, do it here. It has to be first, or
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 6e219a4d..0428d222 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -162,8 +162,8 @@ class Angel extends Routable {
   };
 
   @override
-  Route addRoute(String method, Pattern path, Object handler,
-      {List middleware: const []}) {
+  Route addRoute(String method, String path, Object handler,
+      {Iterable middleware: const []}) {
     if (_flattened != null) {
       logger?.warning(
           'WARNING: You added a route ($method $path) to the router, after it had been optimized.');
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 363ed2d1..64e8d942 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -58,7 +58,7 @@ class Service extends Routable {
   ];
 
   /// Handlers that must run to ensure this service's functionality.
-  List get bootstrappers => [];
+  List<RequestHandler> get bootstrappers => [];
 
   /// The [Angel] app powering this service.
   Angel app;
@@ -150,8 +150,9 @@ class Service extends Routable {
     _addRoutesInner(service ?? this, bootstrappers);
   }
 
-  void _addRoutesInner(Service service, List handlers) {
-    Map restProvider = {'provider': Providers.rest};
+  void _addRoutesInner(Service service, Iterable<RequestHandler> handlerss) {
+    var restProvider = {'provider': Providers.rest};
+    var handlers = new List<RequestHandler>.from(handlerss);
 
     // Add global middleware if declared on the instance itself
     Middleware before = getAnnotation(service, Middleware);
@@ -168,7 +169,7 @@ class Service extends Routable {
         ]));
       });
     },
-        middleware: []
+        middleware: <RequestHandler>[]
           ..addAll(handlers)
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index f4e8005b..1b81102e 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -60,7 +60,7 @@ class Controller {
   }
 
   void Function(Symbol, MethodMirror) _routeBuilder(
-      InstanceMirror instanceMirror, Routable routable, List handlers) {
+      InstanceMirror instanceMirror, Routable routable, Iterable<RequestHandler> handlers) {
     return (Symbol methodName, MethodMirror method) {
       if (method.isRegularMethod &&
           methodName != #toString &&
@@ -76,7 +76,7 @@ class Controller {
 
         var reflectedMethod =
             instanceMirror.getField(methodName).reflectee as Function;
-        var middleware = []..addAll(handlers)..addAll(exposeDecl.middleware);
+        var middleware = <RequestHandler>[]..addAll(handlers)..addAll(exposeDecl.middleware);
         String name = exposeDecl.as?.isNotEmpty == true
             ? exposeDecl.as
             : MirrorSystem.getName(methodName);
diff --git a/test/general_test.dart b/test/general_test.dart
index 8874f9f7..1692064b 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -13,8 +13,8 @@ main() {
 
   setUp(() async {
     app = new Angel(reflector: MirrorsReflector())
-      ..post('/foo', () => {'hello': 'world'})
-      ..all('*', () => throw new AngelHttpException.notFound());
+      ..post('/foo', (req, res) => res.serialize({'hello': 'world'}))
+      ..all('*', (req, res) => throw new AngelHttpException.notFound());
     client = new http.Client();
 
     server = await new AngelHttp(app).startServer();
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 4573fe15..c79cc763 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -1,25 +1,37 @@
+import 'dart:convert';
 import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:io/ansi.dart';
 import 'package:logging/logging.dart';
 import 'package:test/test.dart';
+
 import 'common.dart';
 
-@Middleware(const ['interceptor'])
+@Middleware([interceptor])
 testMiddlewareMetadata(RequestContext req, ResponseContext res) async {
   return "This should not be shown.";
 }
 
-@Middleware(const ['intercept_service'])
+@Middleware([interceptService])
 class QueryService extends Service {
   @override
-  @Middleware(const ['interceptor'])
+  @Middleware([interceptor])
   read(id, [Map params]) async => params;
 }
 
+void interceptor(RequestContext req, ResponseContext res) {
+  res
+    ..write('Middleware')
+    ..end();
+}
+
+void interceptService(RequestContext req, ResponseContext res) {
+  res.write("Service with ");
+}
+
 main() {
   Angel app;
   Angel nested;
@@ -44,16 +56,6 @@ main() {
         });
     });
 
-    app.requestMiddleware
-      ..['interceptor'] = (req, res) async {
-        res.write('Middleware');
-        return false;
-      }
-      ..['intercept_service'] = (RequestContext req, res) async {
-        res.write("Service with ");
-        return true;
-      };
-
     todos.get('/action/:action', (req, res) => res.json(req.params));
 
     Route ted;
@@ -67,8 +69,7 @@ main() {
 
     app.use('/nes', nested);
     app.get('/meta', testMiddlewareMetadata);
-    app.get('/intercepted', 'This should not be shown',
-        middleware: ['interceptor']);
+    app.get('/intercepted', 'This should not be shown', middleware: ['interceptor']);
     app.get('/hello', 'world');
     app.get('/name/:first/last/:last', (req, res) => req.params);
     app.post('/lambda', (RequestContext req, res) => req.parseBody());
@@ -90,16 +91,14 @@ main() {
 
     app.use('/query', new QueryService());
 
-    RequestMiddleware write(String message) {
-      return (req, res) async {
+    RequestHandler write(String message) {
+      return (req, res) {
         res.write(message);
-        return true;
       };
     }
 
-    app
-        .chain(write('a'))
-        .chain([write('b'), write('c')]).get('/chained', () => false);
+    app.chain([write('a')]).chain([write('b'), write('c')]).get(
+        '/chained', () => false);
 
     app.use('MJ');
 
@@ -179,7 +178,7 @@ main() {
   });
 
   test('Can name routes', () {
-    Route foo = app.get('/framework/:id', [])..name = 'frm';
+    Route foo = app.get('/framework/:id', null)..name = 'frm';
     print('Foo: $foo');
     String uri = foo.makeUri({'id': 'angel'});
     print(uri);
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 046788b7..c45bf663 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -1,12 +1,14 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io' show stderr;
+import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
-import 'dart:io';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
+
 import 'encoders_buffer_test.dart' show encodingTests;
 
 main() {
@@ -30,18 +32,18 @@ main() {
       },
     );
 
-    app.get('/hello', (ResponseContext res) {
+    app.get('/hello', (req,  res) {
       new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]).pipe(res);
     });
 
-    app.get('/write', (res) async {
+    app.get('/write', (req, res) async {
       await res.addStream(
           new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
       res.write('bye');
       await res.close();
     });
 
-    app.get('/multiple', (res) async {
+    app.get('/multiple', (req, res) async {
       await res.addStream(
           new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
       await res
@@ -49,7 +51,7 @@ main() {
       await res.close();
     });
 
-    app.get('/overwrite', (ResponseContext res) async {
+    app.get('/overwrite', (req, res) async {
       res.statusCode = 32;
       await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
@@ -63,7 +65,7 @@ main() {
       }
     });
 
-    app.get('/error', (res) => res.addError(new StateError('wtf')));
+    app.get('/error', (req, res) => res.addError(new StateError('wtf')));
 
     app.errorHandler = (e, req, res) async {
       stderr..writeln(e.error)..writeln(e.stackTrace);

From bf9e297a924a7a76f49c31ec0e9241408592fe85 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 16:43:38 -0400
Subject: [PATCH 269/414] Move all existing handlers to (req, res) or IoC-based

---
 .idea/workspace.xml               | 594 +++++++++++++++++-------------
 CHANGELOG.md                      |   5 +-
 example/main.dart                 |  20 +-
 lib/src/core/injection.dart       |   2 +-
 lib/src/core/request_context.dart |   2 +-
 lib/src/core/server.dart          |  19 +-
 lib/src/core/service.dart         |  20 +-
 lib/src/http/controller.dart      |  20 +-
 performance/hello/main.dart       |   2 +-
 test/controller_test.dart         |  26 +-
 test/di_test.dart                 |  14 +-
 test/encoders_buffer_test.dart    |   2 +-
 test/parameter_meta_test.dart     |  33 +-
 test/precontained_test.dart       |   5 +-
 test/primitives_test.dart         |  12 +-
 test/repeat_request_test.dart     |   6 +-
 test/routing_test.dart            |  11 +-
 test/serialize_test.dart          |   4 +-
 test/server_test.dart             |  19 +-
 19 files changed, 453 insertions(+), 363 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d56708ee..f64ab1bf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,22 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,8 +44,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1384">
-              <caret line="189" column="31" lean-forward="true" selection-start-line="189" selection-start-column="31" selection-end-line="189" selection-end-column="31" />
+            <state relative-caret-position="222">
+              <caret line="408" column="27" selection-start-line="408" selection-start-column="27" selection-end-line="408" selection-end-column="27" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -39,50 +53,47 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="312">
-              <caret line="129" column="40" lean-forward="true" selection-start-line="129" selection-start-column="40" selection-end-line="129" selection-end-column="40" />
+            <state relative-caret-position="-1528">
+              <caret line="64" column="51" lean-forward="true" selection-start-line="64" selection-start-column="51" selection-end-line="64" selection-end-column="51" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="container.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib/src/container.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="406">
-              <caret line="96" column="33" lean-forward="true" selection-start-line="96" selection-start-column="33" selection-end-line="96" selection-end-column="33" />
+            <state relative-caret-position="294">
+              <caret line="28" column="21" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
-              <folding>
-                <element signature="e#40#60#0" expanded="true" />
-              </folding>
+            <state>
+              <caret column="42" selection-start-column="42" selection-end-column="42" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="178">
-              <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+            <state relative-caret-position="-667">
+              <caret line="48" column="8" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3216">
-              <caret line="201" column="44" selection-start-line="201" selection-start-column="44" selection-end-line="201" selection-end-column="44" />
+            <state relative-caret-position="187">
+              <caret line="290" column="23" selection-start-line="290" selection-start-column="23" selection-end-line="290" selection-end-column="23" />
               <folding>
                 <element signature="e#39#59#0" expanded="true" />
               </folding>
@@ -90,6 +101,48 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="165">
+              <caret line="75" column="45" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="163">
+              <caret line="67" column="49" selection-start-line="67" selection-start-column="49" selection-end-line="67" selection-end-column="49" />
+              <folding>
+                <element signature="e#47#67#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="view.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/view.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="128">
+              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+              <folding>
+                <element signature="e#0#46#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-3259">
+              <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -102,9 +155,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>random_strin</find>
-      <find>Angel()</find>
-      <find>change</find>
       <find>render</find>
       <find>god.serialize</find>
       <find>dart:mirrors</find>
@@ -132,10 +182,11 @@
       <find>lazyQue</find>
       <find>injections</find>
       <find>singleton(</find>
+      <find>preI</find>
+      <find>);</find>
+      <find>RequestContext req</find>
     </findStrings>
     <replaceStrings>
-      <replace>useStream</replace>
-      <replace>streaming</replace>
       <replace>!isOpen</replace>
       <replace>'server'</replace>
       <replace>FutureOr</replace>
@@ -164,6 +215,8 @@
       <replace>json.decode</replace>
       <replace>rawRequest.</replace>
       <replace>rawResponse.</replace>
+      <replace>));</replace>
+      <replace>req</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -187,29 +240,19 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/test/exception_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
-        <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
-        <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
-        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
@@ -218,26 +261,36 @@
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
-        <option value="$PROJECT_DIR$/test/controller_test.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/test/general_test.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
+        <option value="$PROJECT_DIR$/example/view.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/di_test.dart" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
+        <option value="$PROJECT_DIR$/test/controller_test.dart" />
+        <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
       </list>
     </option>
   </component>
@@ -657,21 +710,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="1252000" />
-    </task>
-    <task id="LOCAL-00097" summary="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774">
-      <created>1531148520815</created>
-      <option name="number" value="00097" />
-      <option name="presentableId" value="LOCAL-00097" />
-      <option name="project" value="LOCAL" />
-      <updated>1531148520815</updated>
-    </task>
-    <task id="LOCAL-00098" summary="Skip parameter meta tests on newer VM's where it's blocked on: https://github.com/dart-lang/sdk/issues/33774">
-      <created>1531148881567</created>
-      <option name="number" value="00098" />
-      <option name="presentableId" value="LOCAL-00098" />
-      <option name="project" value="LOCAL" />
-      <updated>1531148881568</updated>
+      <workItem from="1534793956753" duration="3713000" />
     </task>
     <task id="LOCAL-00099" summary="* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of&#10;`as`-casting them to `Map&lt;String, dynamic&gt;`.">
       <created>1531149542907</created>
@@ -1002,7 +1041,21 @@
       <option name="project" value="LOCAL" />
       <updated>1534794944288</updated>
     </task>
-    <option name="localTasksCounter" value="146" />
+    <task id="LOCAL-00146" summary="Remove usage of removed symbols">
+      <created>1534795218407</created>
+      <option name="number" value="00146" />
+      <option name="presentableId" value="LOCAL-00146" />
+      <option name="project" value="LOCAL" />
+      <updated>1534795218407</updated>
+    </task>
+    <task id="LOCAL-00147" summary="Force all handlers to (req, res) { ... }">
+      <created>1534796466854</created>
+      <option name="number" value="00147" />
+      <option name="presentableId" value="LOCAL-00147" />
+      <option name="project" value="LOCAL" />
+      <updated>1534796466854</updated>
+    </task>
+    <option name="localTasksCounter" value="148" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1038,7 +1091,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="173459000" />
+    <option name="totallyTimeSpent" value="175920000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1058,7 +1111,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
+      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1077,6 +1130,7 @@
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
       <window_info content_ui="combo" id="Project" order="0" weight="0.27846155" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1087,7 +1141,6 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
@@ -1101,8 +1154,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Force dep on Dart &gt;=2.0.0-dev" />
-    <MESSAGE value="CHANGELOG now only reflects on 2.0.0-alpha+" />
     <MESSAGE value="Remove Jael example" />
     <MESSAGE value="Depend on package:file" />
     <MESSAGE value="Upgrade combinator dependency" />
@@ -1126,7 +1177,9 @@
     <MESSAGE value="waterfall now only accepts RequestHandler" />
     <MESSAGE value="Remove req.inject" />
     <MESSAGE value="Implement HttpReqCtx.container" />
-    <option name="LAST_COMMIT_MESSAGE" value="Implement HttpReqCtx.container" />
+    <MESSAGE value="Remove usage of removed symbols" />
+    <MESSAGE value="Force all handlers to (req, res) { ... }" />
+    <option name="LAST_COMMIT_MESSAGE" value="Force all handlers to (req, res) { ... }" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1134,41 +1187,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="8" column="24" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -1176,13 +1194,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/view.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="235">
@@ -1190,13 +1201,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="15" column="42" selection-start-line="15" selection-start-column="42" selection-end-line="15" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1211,28 +1215,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="17" column="12" lean-forward="true" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="39" lean-forward="true" selection-start-line="39" selection-end-line="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/hooks.dart" />
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16">
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/common.dart" />
     <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart" />
     <entry file="file://$PROJECT_DIR$/test/services_test.dart">
@@ -1283,13 +1266,6 @@
         <state relative-caret-position="-1402" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="555" column="35" selection-start-line="555" selection-start-column="35" selection-end-line="555" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -1297,13 +1273,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="608">
-          <caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1368">
@@ -1314,13 +1283,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="656">
-          <caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
@@ -1335,81 +1297,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="25" column="53" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="30" column="50" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-138">
-          <caret line="93" column="65" selection-start-line="93" selection-start-column="65" selection-end-line="93" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3216">
-          <caret line="201" column="44" selection-start-line="201" selection-start-column="44" selection-end-line="201" selection-end-column="44" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="88" column="56" selection-start-line="88" selection-start-column="56" selection-end-line="88" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="51" column="42" lean-forward="true" selection-start-line="51" selection-start-column="42" selection-end-line="51" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="19" column="38" lean-forward="true" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="534">
-          <caret line="346" column="47" selection-start-line="346" selection-start-column="47" selection-end-line="346" selection-end-column="47" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
-          <caret line="148" lean-forward="true" selection-start-line="148" selection-end-line="148" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
@@ -1417,16 +1304,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="124">
-            <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="262">
@@ -1444,37 +1321,222 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1384">
-          <caret line="189" column="31" lean-forward="true" selection-start-line="189" selection-start-column="31" selection-end-line="189" selection-end-column="31" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
+        <state relative-caret-position="-394">
+          <caret line="98" column="26" selection-start-line="98" selection-start-column="26" selection-end-line="98" selection-end-column="26" />
           <folding>
             <element signature="e#40#60#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="203">
+          <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/core/list.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="149">
+          <caret line="53" column="15" selection-start-line="53" selection-start-column="15" selection-end-line="53" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="15" column="69" selection-start-line="15" selection-start-column="69" selection-end-line="15" selection-end-column="69" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="78" column="85" selection-start-line="78" selection-start-column="85" selection-end-line="78" selection-end-column="85" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="149">
+          <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
+          <folding>
+            <element signature="e#40#104#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1348">
+          <caret line="127" column="14" selection-start-line="127" selection-start-column="14" selection-end-line="127" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3259">
+          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="163">
+          <caret line="67" column="49" selection-start-line="67" selection-start-column="49" selection-end-line="67" selection-end-column="49" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="556">
+            <caret line="44" column="84" selection-start-line="44" selection-start-column="84" selection-end-line="44" selection-end-column="84" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-268">
+          <caret line="30" column="29" lean-forward="true" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="33" column="29" selection-start-line="33" selection-start-column="29" selection-end-line="33" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+        <state relative-caret-position="256">
+          <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-667">
+          <caret line="48" column="8" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="20" column="51" lean-forward="true" selection-start-line="20" selection-start-column="51" selection-end-line="20" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="28" column="28" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="42" selection-start-column="42" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="75" column="45" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="24" column="40" lean-forward="true" selection-start-line="24" selection-start-column="40" selection-end-line="24" selection-end-column="40" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
-          <caret line="129" column="40" lean-forward="true" selection-start-line="129" selection-start-column="40" selection-end-line="129" selection-end-column="40" />
+        <state relative-caret-position="-1528">
+          <caret line="64" column="51" lean-forward="true" selection-start-line="64" selection-start-column="51" selection-end-line="64" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="28" column="21" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="222">
+          <caret line="408" column="27" selection-start-line="408" selection-start-column="27" selection-end-line="408" selection-end-column="27" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="290" column="23" selection-start-line="290" selection-start-column="23" selection-end-line="290" selection-end-column="23" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b961440..8df5a275 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,4 +39,7 @@ exclusively to close responses.
 take routes in the form of `FutureOr myFunc(RequestContext, ResponseContext res)`.
 * `@Middleware` now takes an `Iterable` of `RequestHandler`s.
 * `@Expose.path` now *must* be a `String`, not just any `Pattern`.
-* `@Expose.middleware` now takes `Iterable<RequestHandler>`, instead of just `List`.
\ No newline at end of file
+* `@Expose.middleware` now takes `Iterable<RequestHandler>`, instead of just `List`.
+* `createDynamicHandler` was renamed to `ioc`, and is now used to run IoC-aware handlers in a
+type-safe manner.
+* `RequestContext.params` is now a `Map<String, dynamic>`, rather than just a `Map`.
\ No newline at end of file
diff --git a/example/main.dart b/example/main.dart
index e1437137..dc7ef909 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -5,16 +5,28 @@ main() async {
   var app = new Angel(reflector: MirrorsReflector());
 
   // Index route. Returns JSON.
-  app.get('/', () => 'Welcome to Angel!');
+  app.get('/', (req, res) => res.write('Welcome to Angel!'));
 
   // Accepts a URL like /greet/foo or /greet/bob.
-  app.get('/greet/:name', (String name) => 'Hello, $name!');
+  app.get(
+    '/greet/:name',
+    (req, res) {
+      var name = req.params['name'];
+      res.write('Hello, $name!');
+    },
+  );
 
   // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
-  app.get('/greet', (@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥');
+  app.get(
+    '/greet',
+    ioc((@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥'),
+  );
 
   // Handle any other query value of `name`.
-  app.get('/greet', (@Query('name') String name) => 'Hello, $name!');
+  app.get(
+    '/greet',
+    ioc((@Query('name') String name) => 'Hello, $name!'),
+  );
 
   // Simple fallback to throw a 404 on unknown paths.
   app.use((RequestContext req) async {
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index a70ee45f..b6228a27 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -5,7 +5,7 @@ const List<Type> _primitiveTypes =  [String, int, num, double, Null];
 /// Shortcut for calling [preInject], and then [handleContained].
 ///
 /// Use this to instantly create a request handler for a DI-enabled method.
-RequestHandler createDynamicHandler(Function handler,
+RequestHandler ioc(Function handler,
     {Iterable<String> optional: const []}) {
   var injection = preInject(handler);
   injection.optional.addAll(optional ?? []);
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 32e8e2af..a8c4530c 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -65,7 +65,7 @@ abstract class RequestContext<RawRequest> {
   MediaType get contentType;
 
   /// The URL parameters extracted from the request URI.
-  Map params = {};
+  Map<String, dynamic> params = <String, dynamic>{};
 
   /// The requested path.
   String get path;
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 0428d222..88d42e65 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -162,8 +162,9 @@ class Angel extends Routable {
   };
 
   @override
-  Route addRoute(String method, String path, Object handler,
-      {Iterable middleware: const []}) {
+  Route<RequestHandler> addRoute(
+      String method, String path, RequestHandler handler,
+      {Iterable<RequestHandler> middleware: const <RequestHandler>[]}) {
     if (_flattened != null) {
       logger?.warning(
           'WARNING: You added a route ($method $path) to the router, after it had been optimized.');
@@ -175,7 +176,7 @@ class Angel extends Routable {
   }
 
   @override
-  mount(Pattern path, Router router) {
+  mount(String path, Router<RequestHandler> router) {
     if (_flattened != null) {
       logger?.warning(
           'WARNING: You added mounted a child router ($path) on the router, after it had been optimized.');
@@ -275,11 +276,6 @@ class Angel extends Routable {
       return getHandlerResult(handler.toList(), req, res);
     }
 
-    var middleware = (req.app ?? this).findMiddleware(handler);
-    if (middleware != null) {
-      return getHandlerResult(middleware, req, res);
-    }
-
     return new Future.value(handler);
   }
 
@@ -298,12 +294,6 @@ class Angel extends Routable {
     });
   }
 
-  /// Attempts to find a middleware by the given name within this application.
-  findMiddleware(key) {
-    if (requestMiddleware.containsKey(key)) return requestMiddleware[key];
-    return parent != null ? parent.findMiddleware(key) : null;
-  }
-
   /// Attempts to find a property by the given name within this application.
   findProperty(key) {
     if (configuration.containsKey(key)) return configuration[key];
@@ -327,7 +317,6 @@ class Angel extends Routable {
       }
 
       void _walk(Router router) {
-        router.requestMiddleware.forEach((k, v) => _add(v));
         router.middleware.forEach(_add);
         router.routes.forEach((r) {
           r.handlers.forEach(_add);
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 64e8d942..dfb3d8e9 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -160,7 +160,7 @@ class Service extends Routable {
     if (before != null) handlers.addAll(before.handlers);
 
     Middleware indexMiddleware = getAnnotation(service.index, Middleware);
-    get('/', (RequestContext req, res) {
+    get('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.index(mergeMap([
           {'query': query},
@@ -174,7 +174,7 @@ class Service extends Routable {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware = getAnnotation(service.create, Middleware);
-    post('/', (RequestContext req, ResponseContext res) {
+    post('/', (req, ResponseContext res) {
       return req.parseQuery().then((query) {
         return req.parseBody().then((body) {
           return this
@@ -199,7 +199,7 @@ class Service extends Routable {
 
     Middleware readMiddleware = getAnnotation(service.read, Middleware);
 
-    get('/:id', (RequestContext req, res) {
+    get('/:id', (req, res) {
       return req.parseQuery().then((query) {
         return this.read(
             parseId(req.params['id']),
@@ -217,7 +217,7 @@ class Service extends Routable {
     Middleware modifyMiddleware = getAnnotation(service.modify, Middleware);
     patch(
         '/:id',
-        (RequestContext req, res) => req.parseBody().then((body) {
+        (req, res) => req.parseBody().then((body) {
               return req.parseQuery().then((query) {
                 return this.modify(
                     parseId(req.params['id']),
@@ -237,7 +237,7 @@ class Service extends Routable {
     Middleware updateMiddleware = getAnnotation(service.update, Middleware);
     post(
         '/:id',
-        (RequestContext req, res) => req.parseBody().then((body) {
+        (req, res) => req.parseBody().then((body) {
               return req.parseQuery().then((query) {
                 return this.update(
                     parseId(req.params['id']),
@@ -255,7 +255,7 @@ class Service extends Routable {
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put(
         '/:id',
-        (RequestContext req, res) => req.parseBody().then((body) {
+        (req, res) => req.parseBody().then((body) {
               return req.parseQuery().then((query) {
                 return this.update(
                     parseId(req.params['id']),
@@ -273,7 +273,7 @@ class Service extends Routable {
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware = getAnnotation(service.remove, Middleware);
-    delete('/', (RequestContext req, res) {
+    delete('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.remove(
             null,
@@ -288,7 +288,7 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
-    delete('/:id', (RequestContext req, res) {
+    delete('/:id', (req, res) {
       return req.parseQuery().then((query) {
         return this.remove(
             parseId(req.params['id']),
@@ -305,8 +305,8 @@ class Service extends Routable {
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
 
     // REST compliance
-    put('/', () => throw new AngelHttpException.notFound());
-    patch('/', () => throw new AngelHttpException.notFound());
+    put('/', (req, res) => throw new AngelHttpException.notFound());
+    patch('/', (req, res) => throw new AngelHttpException.notFound());
   }
 
   /// Invoked when this service is wrapped within a [HookedService].
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 1b81102e..d910cb9a 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -2,8 +2,10 @@ library angel_framework.http.controller;
 
 import 'dart:async';
 import 'dart:mirrors';
+
 import 'package:angel_route/angel_route.dart';
 import 'package:meta/meta.dart';
+
 import '../core/core.dart';
 
 /// Supports grouping routes with shared functionality.
@@ -19,7 +21,7 @@ class Controller {
   final bool injectSingleton;
 
   /// Middleware to run before all handlers in this class.
-  List middleware = [];
+  List<RequestHandler> middleware = [];
 
   /// A mapping of route paths to routes, produced from the [Expose] annotations on this class.
   Map<String, Route> routeMappings = {};
@@ -30,7 +32,9 @@ class Controller {
   Future configureServer(Angel app) {
     _app = app;
 
-    if (injectSingleton != false) _app.container.singleton(this);
+    if (injectSingleton != false) {
+      _app.container.registerSingleton(this, as: runtimeType);
+    }
 
     // Load global expose decl
     ClassMirror classMirror = reflectClass(this.runtimeType);
@@ -52,7 +56,9 @@ class Controller {
 
     // Pre-reflect methods
     InstanceMirror instanceMirror = reflect(this);
-    final handlers = []..addAll(exposeDecl.middleware)..addAll(middleware);
+    final handlers = <RequestHandler>[]
+      ..addAll(exposeDecl.middleware)
+      ..addAll(middleware);
     final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
     classMirror.instanceMembers.forEach(routeBuilder);
     configureRoutes(routable);
@@ -60,7 +66,9 @@ class Controller {
   }
 
   void Function(Symbol, MethodMirror) _routeBuilder(
-      InstanceMirror instanceMirror, Routable routable, Iterable<RequestHandler> handlers) {
+      InstanceMirror instanceMirror,
+      Routable routable,
+      Iterable<RequestHandler> handlers) {
     return (Symbol methodName, MethodMirror method) {
       if (method.isRegularMethod &&
           methodName != #toString &&
@@ -76,7 +84,9 @@ class Controller {
 
         var reflectedMethod =
             instanceMirror.getField(methodName).reflectee as Function;
-        var middleware = <RequestHandler>[]..addAll(handlers)..addAll(exposeDecl.middleware);
+        var middleware = <RequestHandler>[]
+          ..addAll(handlers)
+          ..addAll(exposeDecl.middleware);
         String name = exposeDecl.as?.isNotEmpty == true
             ? exposeDecl.as
             : MirrorSystem.getName(methodName);
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index ca1e34f5..717cc548 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -26,7 +26,7 @@ void start(int id) {
   var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
-  app.get('/', (ResponseContext res) => res.write('Hello, world!'));
+  app.get('/', (req, res) => res.write('Hello, world!'));
 
   var oldHandler = app.errorHandler;
   app.errorHandler = (e, req, res) {
diff --git a/test/controller_test.dart b/test/controller_test.dart
index ba6f450e..35604b07 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -1,20 +1,20 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
 import 'common.dart';
 
-@Expose("/todos", middleware: ["foo"])
+@Expose("/todos", middleware: [foo])
 class TodoController extends Controller {
   List<Todo> todos = [new Todo(text: "Hello", over: "world")];
 
-  @Expose("/:id", middleware: ["bar"])
+  @Expose("/:id", middleware: [bar])
   Future<Todo> fetchTodo(
       String id, RequestContext req, ResponseContext res) async {
     expect(req, isNotNull);
@@ -37,6 +37,14 @@ class NamedController extends Controller {
   optional() => 2;
 }
 
+void foo(RequestContext req, ResponseContext res) {
+  res.write("Hello, ");
+}
+
+void bar(RequestContext req, ResponseContext res) {
+  res.write("world!");
+}
+
 main() {
   Angel app;
   TodoController ctrl;
@@ -46,17 +54,9 @@ main() {
 
   setUp(() async {
     app = new Angel(reflector: MirrorsReflector());
-    app.requestMiddleware["foo"] = (req, res) async {
-      res.write("Hello, ");
-      return true;
-    };
-    app.requestMiddleware["bar"] = (req, res) async {
-      res.write("world!");
-      return true;
-    };
     app.get(
         "/redirect",
-        (req, ResponseContext res) async =>
+        (req, res) async =>
             res.redirectToAction("TodoController@foo", {"foo": "world"}));
     await app.configure((ctrl = new TodoController()).configureServer);
 
@@ -91,7 +91,7 @@ main() {
     var app = new Angel(reflector: MirrorsReflector());
     app.get(
         '/foo',
-        createDynamicHandler(({String bar}) {
+        ioc(({String bar}) {
           return 2;
         }, optional: ['bar']));
     var rq = new MockHttpRequest('GET', new Uri(path: 'foo'));
diff --git a/test/di_test.dart b/test/di_test.dart
index 46dd25f6..53bd5493 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,9 +1,11 @@
+import 'dart:convert';
 import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
+
 import 'common.dart';
 
 final String TEXT = "make your bed";
@@ -20,11 +22,13 @@ main() {
     client = new http.Client();
 
     // Inject some todos
-    app.container.singleton(new Todo(text: TEXT, over: OVER));
+    app.container.registerSingleton(new Todo(text: TEXT, over: OVER));
 
-    app.get("/errands", (Todo singleton) => singleton);
-    app.get("/errands3",
-        ({Errand singleton, Todo foo, RequestContext req}) => singleton.text);
+    app.get("/errands", ioc((Todo singleton) => singleton));
+    app.get(
+        "/errands3",
+        ioc(({Errand singleton, Todo foo, RequestContext req}) =>
+            singleton.text));
     await app.configure(new SingletonController().configureServer);
     await app.configure(new ErrandController().configureServer);
 
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index da172cc0..05d7070e 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -26,7 +26,7 @@ main() {
       },
     );
 
-    app.get('/hello', (res) {
+    app.get('/hello', (req, res) {
       res.write('Hello, world!');
     });
   });
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 399488e4..2a767f56 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
-import 'dart:io';
-import 'package:angel_container/mirrors.dart';
 import 'dart:convert';
+import 'dart:io';
+
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -31,33 +32,33 @@ parameterMetaTests() {
     app = new Angel(reflector: MirrorsReflector());
     http = new AngelHttp(app);
 
-    app.get('/cookie', (@CookieValue('token') String jwt) {
+    app.get('/cookie', ioc((@CookieValue('token') String jwt) {
       return jwt;
-    });
+    }));
 
-    app.get('/header', (@Header('x-foo') String header) {
+    app.get('/header', ioc((@Header('x-foo') String header) {
       return header;
-    });
+    }));
 
-    app.get('/query', (@Query('q') String query) {
+    app.get('/query', ioc((@Query('q') String query) {
       return query;
-    });
+    }));
 
-    app.get('/session', (@Session('foo') String foo) {
+    app.get('/session', ioc((@Session('foo') String foo) {
       return foo;
-    });
+    }));
 
-    app.get('/match', (@Query('mode', match: 'pos') String mode) {
+    app.get('/match', ioc((@Query('mode', match: 'pos') String mode) {
       return 'YES $mode';
-    });
+    }));
 
-    app.get('/match', (@Query('mode', match: 'neg') String mode) {
+    app.get('/match', ioc((@Query('mode', match: 'neg') String mode) {
       return 'NO $mode';
-    });
+    }));
 
-    app.get('/match', (@Query('mode') String mode) {
+    app.get('/match', ioc((@Query('mode') String mode) {
       return 'DEFAULT $mode';
-    });
+    }));
 
     /*app.logger = new Logger('parameter_meta_test')
       ..onRecord.listen((rec) {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index afb86952..3488ab8d 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -1,6 +1,7 @@
+import 'dart:convert';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -8,7 +9,7 @@ main() {
   test('preinjects functions', () async {
     var app = new Angel(reflector: MirrorsReflector())
       ..configuration['foo'] = 'bar'
-      ..get('/foo', echoAppFoo);
+      ..get('/foo', ioc(echoAppFoo));
     app.optimizeForProduction(force: true);
     print(app.preContained);
     expect(app.preContained, contains(echoAppFoo));
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index a35caa9f..25a7ffde 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'dart:io' show stderr;
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:mock_request/mock_request.dart';
@@ -10,22 +11,23 @@ main() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(reflector: MirrorsReflector())..inject('global', 305); // Pitbull!
+    app = new Angel(reflector: MirrorsReflector())
+      ..inject('global', 305); // Pitbull!
     http = new AngelHttp(app);
 
-    app.get('/string/:string', (String string) => string);
+    app.get('/string/:string', ioc((String string) => string));
 
     app.get(
         '/num/parsed/:num',
         waterfall([
-          (RequestContext req) {
+          (req, res) {
             req.params['n'] = num.parse(req.params['num'].toString());
             return true;
           },
-          (num n) => n,
+          ioc((num n) => n),
         ]));
 
-    app.get('/num/global', (num global) => global);
+    app.get('/num/global', ioc((num global) => global));
 
     app.errorHandler = (e, req, res) {
       stderr..writeln(e.error)..writeln(e.stackTrace);
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index 0b526394..94d1e8a9 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
+import 'dart:convert';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -11,7 +12,8 @@ main() {
   }
 
   test('can request the same url twice', () async {
-    var app = new Angel(reflector: MirrorsReflector())..get('/test/:id', (id) => 'Hello $id');
+    var app = new Angel(reflector: MirrorsReflector())
+      ..get('/test/:id', ioc((id) => 'Hello $id'));
     var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
     await Future.wait([rq1, rq2, rq3].map(new AngelHttp(app).handleRequest));
     var body1 = await rq1.response.transform(utf8.decoder).join(),
diff --git a/test/routing_test.dart b/test/routing_test.dart
index c79cc763..59104d26 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -69,8 +69,9 @@ main() {
 
     app.use('/nes', nested);
     app.get('/meta', testMiddlewareMetadata);
-    app.get('/intercepted', 'This should not be shown', middleware: ['interceptor']);
-    app.get('/hello', 'world');
+    app.get('/intercepted', (req, res) => 'This should not be shown',
+        middleware: [interceptor]);
+    app.get('/hello', (req, res) => 'world');
     app.get('/name/:first/last/:last', (req, res) => req.params);
     app.post('/lambda', (RequestContext req, res) => req.parseBody());
     app.use('/todos/:id', todos);
@@ -86,8 +87,8 @@ main() {
       return "Logged";
     });
 
-    app.get('/method', () => 'Only GET');
-    app.post('/method', () => 'Only POST');
+    app.get('/method', (req, res) => 'Only GET');
+    app.post('/method', (req, res) => 'Only POST');
 
     app.use('/query', new QueryService());
 
@@ -98,7 +99,7 @@ main() {
     }
 
     app.chain([write('a')]).chain([write('b'), write('c')]).get(
-        '/chained', () => false);
+        '/chained', (req, res) => false);
 
     app.use('MJ');
 
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index 6a601011..c8776e4d 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -14,8 +14,8 @@ main() {
 
   setUp(() async {
     app = new Angel(reflector: MirrorsReflector())
-      ..get('/foo', () => {'hello': 'world'})
-      ..get('/bar', (req, ResponseContext res) async {
+      ..get('/foo', ioc(() => {'hello': 'world'}))
+      ..get('/bar', (req, res) async {
         res.contentType = new MediaType('text', 'html');
         await res.serialize({'hello': 'world'});
       });
diff --git a/test/server_test.dart b/test/server_test.dart
index 3f6531cb..a3d81493 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -1,8 +1,9 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
 import 'package:matcher/matcher.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
@@ -12,7 +13,8 @@ final Uri $foo = Uri.parse('http://localhost:3000/foo');
 /// Additional tests to improve coverage of server.dart
 main() {
   group('scoping', () {
-    var parent = new Angel(reflector: MirrorsReflector())..configuration['two'] = 2;
+    var parent = new Angel(reflector: MirrorsReflector())
+      ..configuration['two'] = 2;
     var child = new Angel(reflector: MirrorsReflector());
     parent.use('/child', child);
 
@@ -70,10 +72,11 @@ main() {
   });
 
   test('warning when adding routes to flattened router', () {
-    var app = new Angel(reflector: MirrorsReflector())..optimizeForProduction(force: true);
+    var app = new Angel(reflector: MirrorsReflector())
+      ..optimizeForProduction(force: true);
     app.dumpTree();
-    app.get('/', () => 2);
-    app.mount('/foo', new Router()..get('/', 3));
+    app.get('/', (req, res) => 2);
+    app.mount('/foo', new Router()..get('/', (req, res) => 3));
   });
 
   test('services close on close call', () async {
@@ -88,7 +91,7 @@ main() {
   test('global injection added to injection map', () async {
     var app = new Angel(reflector: MirrorsReflector())..inject('a', 'b');
     var http = new AngelHttp(app);
-    app.get('/', (String a) => a);
+    app.get('/', ioc((String a) => a));
     var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
@@ -153,8 +156,8 @@ main() {
 
     setUp(() async {
       app = new Angel(reflector: MirrorsReflector());
-      app.get('/wtf', () => throw new AngelHttpException.forbidden());
-      app.get('/wtf2', () => throw new AngelHttpException.forbidden());
+      app.get('/wtf', (req, res) => throw new AngelHttpException.forbidden());
+      app.get('/wtf2', (req, res) => throw new AngelHttpException.forbidden());
       http = new AngelHttp(app);
       await http.startServer('127.0.0.1', 0);
 

From 81745ebef524ad4f5ecfef40f3815adb9e90d906 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 16:53:30 -0400
Subject: [PATCH 270/414] Removed debug property

---
 CHANGELOG.md                       |  5 ++++-
 lib/src/core/injection.dart        | 18 ++++-------------
 lib/src/core/request_context.dart  | 32 ++----------------------------
 lib/src/core/response_context.dart | 13 +++++-------
 lib/src/core/server.dart           |  3 ++-
 lib/src/core/service.dart          |  1 -
 lib/src/http/angel_http.dart       | 30 ++++++++++++++++++----------
 lib/src/http/controller.dart       |  4 +---
 test/primitives_test.dart          |  2 +-
 test/server_test.dart              |  3 ++-
 10 files changed, 41 insertions(+), 70 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8df5a275..58c1361d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,4 +42,7 @@ take routes in the form of `FutureOr myFunc(RequestContext, ResponseContext res)
 * `@Expose.middleware` now takes `Iterable<RequestHandler>`, instead of just `List`.
 * `createDynamicHandler` was renamed to `ioc`, and is now used to run IoC-aware handlers in a
 type-safe manner.
-* `RequestContext.params` is now a `Map<String, dynamic>`, rather than just a `Map`.
\ No newline at end of file
+* `RequestContext.params` is now a `Map<String, dynamic>`, rather than just a `Map`.
+* Removed `RequestContext.grab`.
+* Removed `RequestContext.properties`.
+* Removed the defunct `debug` property where it still existed.
\ No newline at end of file
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index b6228a27..e87c485c 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -1,12 +1,11 @@
 part of angel_framework.http.request_context;
 
-const List<Type> _primitiveTypes =  [String, int, num, double, Null];
+const List<Type> _primitiveTypes = [String, int, num, double, Null];
 
 /// Shortcut for calling [preInject], and then [handleContained].
 ///
 /// Use this to instantly create a request handler for a DI-enabled method.
-RequestHandler ioc(Function handler,
-    {Iterable<String> optional: const []}) {
+RequestHandler ioc(Function handler, {Iterable<String> optional: const []}) {
   var injection = preInject(handler);
   injection.optional.addAll(optional ?? []);
   return handleContained(handler, injection);
@@ -29,11 +28,7 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
   } else if (requirement is String) {
     if (req.params.containsKey(requirement)) {
       return req.params[requirement];
-    } else if (req._injections.containsKey(requirement))
-      return req._injections[requirement];
-    else if (req.properties.containsKey(requirement))
-      return req.properties[requirement];
-    else if ((propFromApp = req.app.findProperty(requirement)) != null)
+    } else if ((propFromApp = req.app.findProperty(requirement)) != null)
       return propFromApp;
     else if (injection.optional.contains(requirement))
       return null;
@@ -48,18 +43,13 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     String key = requirement.first;
     Type type = requirement.last;
     if (req.params.containsKey(key) ||
-        req._injections.containsKey(key) ||
-        req.properties.containsKey(key) ||
         req.app.configuration.containsKey(key) ||
         _primitiveTypes.contains(type)) {
       return resolveInjection(key, injection, req, res, throwOnUnresolved);
     } else
       return resolveInjection(type, injection, req, res, throwOnUnresolved);
   } else if (requirement is Type && requirement != dynamic) {
-    if (req._injections.containsKey(requirement))
-      return req._injections[requirement];
-    else
-      return req.app.container.make(requirement);
+    return req.app.container.make(requirement);
   } else if (throwOnUnresolved) {
     throw new ArgumentError(
         '$requirement cannot be injected into a request handler.');
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index a8c4530c..da47bef1 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -24,8 +24,6 @@ abstract class RequestContext<RawRequest> {
   BodyParseResult _body;
   Map _provisionalQuery;
 
-  final Map properties = {};
-
   /// The underlying [RawRequest] provided by the driver.
   RawRequest get rawRequest;
 
@@ -87,31 +85,6 @@ abstract class RequestContext<RawRequest> {
   /// Includes the leading `.`, if there is one.
   String get extension => _extensionCache ??= p.extension(uri.path);
 
-  /// Grabs an object by key or type from [params], [_injections], or
-  /// [app].container. Use this to perform dependency injection
-  /// within a service hook.
-  T grab<T>(key) {
-    if (params.containsKey(key))
-      return params[key] as T;
-    else if (_injections.containsKey(key))
-      return _injections[key] as T;
-    else if (properties.containsKey(key))
-      return properties[key] as T;
-    else {
-      var prop = app?.findProperty(key);
-      if (prop != null)
-        return prop as T;
-      else if (key is Type) {
-        try {
-          return app.container.make(key) as T;
-        } catch (e) {
-          return null;
-        }
-      } else
-        return null;
-    }
-  }
-
   /// Returns `true` if the client's `Accept` header indicates that the given [contentType] is considered a valid response.
   ///
   /// You cannot provide a `null` [contentType].
@@ -148,7 +121,8 @@ abstract class RequestContext<RawRequest> {
   Future<Map> parseBody() => parse().then((b) => b.body);
 
   /// Retrieves a list of all uploaded files if it has already been parsed, or lazy-parses it before returning the files.
-  Future<List<FileUploadInfo>> parseUploadedFiles() => parse().then((b) => b.files);
+  Future<List<FileUploadInfo>> parseUploadedFiles() =>
+      parse().then((b) => b.files);
 
   /// Retrieves the original request buffer if it has already been parsed, or lazy-parses it before returning the buffer..
   ///
@@ -185,8 +159,6 @@ abstract class RequestContext<RawRequest> {
     _acceptsAllCache = null;
     _acceptHeaderCache = null;
     _provisionalQuery?.clear();
-    properties.clear();
-    _injections.clear();
     serviceParams.clear();
     params.clear();
     return new Future.value();
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index fa3d5482..e1877cde 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -9,7 +9,6 @@ import 'package:angel_route/angel_route.dart';
 import 'package:file/file.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:mime/mime.dart';
-import 'package:pool/pool.dart';
 
 import '../http/http.dart';
 import 'request_context.dart';
@@ -18,7 +17,8 @@ import 'server.dart' show Angel;
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A convenience wrapper around an outgoing HTTP request.
-abstract class ResponseContext<RawResponse> implements StreamSink<List<int>>, StringSink {
+abstract class ResponseContext<RawResponse>
+    implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
   final BytesBuilder _buffer = new _LockableBytesBuilder();
   final Map<String, String> _headers = {'server': 'angel'};
@@ -313,12 +313,9 @@ abstract class ResponseContext<RawResponse> implements StreamSink<List<int>>, St
 
   /// Releases critical resources from the [correspondingRequest].
   void releaseCorrespondingRequest() {
-    if (correspondingRequest?.injections?.containsKey(Stopwatch) == true) {
-      (correspondingRequest.injections[Stopwatch] as Stopwatch).stop();
-    }
-
-    if (correspondingRequest?.injections?.containsKey(PoolResource) == true) {
-      (correspondingRequest.injections[PoolResource] as PoolResource).release();
+    if (!correspondingRequest.app.isProduction &&
+        correspondingRequest.app.logger != null) {
+      correspondingRequest.container.make<Stopwatch>().stop();
     }
   }
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 88d42e65..115a1c60 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -34,7 +34,8 @@ class Angel extends Routable {
       (String view, [Map data]) => 'No view engine has been configured yet.';
 
   final List<Angel> _children = [];
-  final Map<String, Tuple3<List, Map, ParseResult<Map<String, dynamic>>>>
+  final Map<String,
+          Tuple3<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>>>
       handlerCache = new HashMap();
 
   Router _flattened;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index dfb3d8e9..cdba7ecc 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -8,7 +8,6 @@ import 'package:merge_map/merge_map.dart';
 import '../util.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
-import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'server.dart';
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index c4a750fc..d3055c31 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -8,14 +8,16 @@ import 'dart:io'
         HttpServer,
         Platform,
         SecurityContext;
+
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:tuple/tuple.dart';
+
+import '../core/core.dart';
 import 'http_request_context.dart';
 import 'http_response_context.dart';
-import '../core/core.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
@@ -60,7 +62,7 @@ class AngelHttp {
   /// the server.
   factory AngelHttp.secure(
       Angel app, String certificateChainPath, String serverKeyPath,
-      {bool debug: false, String password, bool useZone: true}) {
+      { String password, bool useZone: true}) {
     var certificateChain =
         Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
@@ -107,14 +109,16 @@ class AngelHttp {
           var path = req.path;
           if (path == '/') path = '';
 
-          Tuple3<List, Map, ParseResult<Map<String, dynamic>>> resolveTuple() {
+          Tuple3<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>>
+              resolveTuple() {
             Router r = app.optimizedRouter;
             var resolved =
                 r.resolveAbsolute(path, method: req.method, strip: false);
 
             return new Tuple3(
               new MiddlewarePipeline(resolved).handlers,
-              resolved.fold<Map>({}, (out, r) => out..addAll(r.allParams)),
+              resolved.fold<Map<String, dynamic>>(
+                  <String, dynamic>{}, (out, r) => out..addAll(r.allParams)),
               resolved.isEmpty ? null : resolved.first.parseResult,
             );
           }
@@ -125,10 +129,15 @@ class AngelHttp {
               : resolveTuple();
 
           req.params.addAll(tuple.item2);
-          req.inject(ParseResult, tuple.item3);
 
-          if (!app.isProduction && app.logger != null)
-            req.inject(Stopwatch, new Stopwatch()..start());
+          req.container.registerSingleton<ParseResult<Map<String, dynamic>>>(
+              tuple.item3);
+          req.container.registerSingleton<ParseResult>(tuple.item3);
+
+          if (!app.isProduction && app.logger != null) {
+            req.container
+                .registerSingleton<Stopwatch>(new Stopwatch()..start());
+          }
 
           var pipeline = tuple.item1;
 
@@ -215,8 +224,9 @@ class AngelHttp {
           );
 
           var zone = Zone.current.fork(specification: zoneSpec);
-          req.inject(Zone, zone);
-          req.inject(ZoneSpecification, zoneSpec);
+          req.container.registerSingleton<Zone>(zone);
+          req.container.registerSingleton<ZoneSpecification>(zoneSpec);
+
           return zone.run(handle).whenComplete(() {
             res.dispose();
           });
@@ -321,7 +331,7 @@ class AngelHttp {
 
       return request.response.close().then((_) {
         if (!app.isProduction && app.logger != null) {
-          var sw = req.grab<Stopwatch>(Stopwatch);
+          var sw = req.container.make<Stopwatch>();
 
           if (sw.isRunning) {
             sw?.stop();
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index d910cb9a..cd01d135 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -15,8 +15,6 @@ class Controller {
   /// The [Angel] application powering this controller.
   Angel get app => _app;
 
-  final bool debug;
-
   /// If `true` (default), this class will inject itself as a singleton into the [app]'s container when bootstrapped.
   final bool injectSingleton;
 
@@ -26,7 +24,7 @@ class Controller {
   /// A mapping of route paths to routes, produced from the [Expose] annotations on this class.
   Map<String, Route> routeMappings = {};
 
-  Controller({this.debug: false, this.injectSingleton: true});
+  Controller({this.injectSingleton: true});
 
   @mustCallSuper
   Future configureServer(Angel app) {
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 25a7ffde..66df81ab 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -12,7 +12,7 @@ main() {
 
   setUp(() {
     app = new Angel(reflector: MirrorsReflector())
-      ..inject('global', 305); // Pitbull!
+      ..configuration['global'] = 305; // Pitbull!
     http = new AngelHttp(app);
 
     app.get('/string/:string', ioc((String string) => string));
diff --git a/test/server_test.dart b/test/server_test.dart
index a3d81493..44d9015f 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -89,7 +89,8 @@ main() {
   });
 
   test('global injection added to injection map', () async {
-    var app = new Angel(reflector: MirrorsReflector())..inject('a', 'b');
+    var app = new Angel(reflector: MirrorsReflector())
+      ..configuration['a'] = 'b';
     var http = new AngelHttp(app);
     app.get('/', ioc((String a) => a));
     var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();

From 306549dd53a694fd26536665992dd3ad4cb92079 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 16:58:37 -0400
Subject: [PATCH 271/414] Starts up, but is broken

---
 .idea/workspace.xml                    | 378 ++++++++++++-------------
 lib/src/core/hooked_service.dart       |   2 +-
 lib/src/core/routable.dart             |   8 +-
 lib/src/core/server.dart               |   9 +-
 lib/src/http/http_request_context.dart |   4 +-
 5 files changed, 196 insertions(+), 205 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f64ab1bf..0a2c9abe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,23 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/performance/hello/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/performance/hello/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/controller_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/controller_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/di_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/di_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/primitives_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/primitives_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/repeat_request_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/repeat_request_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -41,11 +25,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="222">
-              <caret line="408" column="27" selection-start-line="408" selection-start-column="27" selection-end-line="408" selection-end-column="27" />
+            <state relative-caret-position="275">
+              <caret line="363" column="45" selection-start-line="363" selection-start-column="45" selection-end-line="363" selection-end-column="45" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -53,20 +37,47 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1528">
-              <caret line="64" column="51" lean-forward="true" selection-start-line="64" selection-start-column="51" selection-end-line="64" selection-end-column="51" />
+            <state relative-caret-position="166">
+              <caret line="64" column="7" selection-start-line="64" selection-start-column="7" selection-end-line="64" selection-end-column="7" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="294">
-              <caret line="28" column="21" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
+            <state relative-caret-position="165">
+              <caret line="317" column="62" selection-start-line="317" selection-start-column="62" selection-end-line="317" selection-end-column="62" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1153">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="329">
+                <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -74,29 +85,35 @@
       <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="42" selection-start-column="42" selection-end-column="42" />
+            <state relative-caret-position="293">
+              <caret line="44" column="38" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parameter_meta_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-667">
-              <caret line="48" column="8" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
+            <state relative-caret-position="128">
+              <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="64">
+              <caret line="9" column="54" lean-forward="true" selection-start-line="9" selection-start-column="54" selection-end-line="9" selection-end-column="54" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="187">
-              <caret line="290" column="23" selection-start-line="290" selection-start-column="23" selection-end-line="290" selection-end-column="23" />
-              <folding>
-                <element signature="e#39#59#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="125">
+              <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -104,41 +121,8 @@
       <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="75" column="45" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="163">
-              <caret line="67" column="49" selection-start-line="67" selection-start-column="49" selection-end-line="67" selection-end-column="49" />
-              <folding>
-                <element signature="e#47#67#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="view.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/view.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3259">
-              <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+            <state relative-caret-position="204">
+              <caret line="92" column="31" selection-start-line="92" selection-start-column="31" selection-end-line="92" selection-end-column="31" />
             </state>
           </provider>
         </entry>
@@ -155,9 +139,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>render</find>
-      <find>god.serialize</find>
-      <find>dart:mirrors</find>
       <find>god.deserialize</find>
       <find>reflector</find>
       <find>Angel(M</find>
@@ -180,14 +161,16 @@
       <find>origina</find>
       <find>originalBuffer</find>
       <find>lazyQue</find>
-      <find>injections</find>
       <find>singleton(</find>
       <find>preI</find>
       <find>);</find>
       <find>RequestContext req</find>
+      <find>req.inject</find>
+      <find>injections</find>
+      <find>injecti</find>
+      <find>debug</find>
     </findStrings>
     <replaceStrings>
-      <replace>!isOpen</replace>
       <replace>'server'</replace>
       <replace>FutureOr</replace>
       <replace>var body = await getBody(rs);</replace>
@@ -217,6 +200,7 @@
       <replace>rawResponse.</replace>
       <replace>));</replace>
       <replace>req</replace>
+      <replace>req.container</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -248,7 +232,6 @@
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
@@ -261,36 +244,37 @@
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
       </list>
     </option>
   </component>
@@ -415,7 +399,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.handle_error.dart">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -710,21 +694,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="3713000" />
-    </task>
-    <task id="LOCAL-00099" summary="* Patch `ResponseContext.redirectTo` to `fold` parameters, instead of&#10;`as`-casting them to `Map&lt;String, dynamic&gt;`.">
-      <created>1531149542907</created>
-      <option name="number" value="00099" />
-      <option name="presentableId" value="LOCAL-00099" />
-      <option name="project" value="LOCAL" />
-      <updated>1531149542907</updated>
-    </task>
-    <task id="LOCAL-00100" summary="* Apply `fold` in `redirectToAction`; bump version -&gt; 1.1.4+9">
-      <created>1531149879228</created>
-      <option name="number" value="00100" />
-      <option name="presentableId" value="LOCAL-00100" />
-      <option name="project" value="LOCAL" />
-      <updated>1531149879229</updated>
+      <workItem from="1534793956753" duration="4502000" />
     </task>
     <task id="LOCAL-00101" summary="Patch">
       <created>1531151957605</created>
@@ -1055,7 +1025,21 @@
       <option name="project" value="LOCAL" />
       <updated>1534796466854</updated>
     </task>
-    <option name="localTasksCounter" value="148" />
+    <task id="LOCAL-00148" summary="Move all existing handlers to (req, res) or IoC-based">
+      <created>1534797818435</created>
+      <option name="number" value="00148" />
+      <option name="presentableId" value="LOCAL-00148" />
+      <option name="project" value="LOCAL" />
+      <updated>1534797818435</updated>
+    </task>
+    <task id="LOCAL-00149" summary="Removed debug property">
+      <created>1534798410411</created>
+      <option name="number" value="00149" />
+      <option name="presentableId" value="LOCAL-00149" />
+      <option name="project" value="LOCAL" />
+      <updated>1534798410411</updated>
+    </task>
+    <option name="localTasksCounter" value="150" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1091,7 +1075,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="175920000" />
+    <option name="totallyTimeSpent" value="176709000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1111,7 +1095,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1154,8 +1138,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Remove Jael example" />
-    <MESSAGE value="Depend on package:file" />
     <MESSAGE value="Upgrade combinator dependency" />
     <MESSAGE value="Upgrade body_parser dependency" />
     <MESSAGE value="Update description" />
@@ -1179,7 +1161,9 @@
     <MESSAGE value="Implement HttpReqCtx.container" />
     <MESSAGE value="Remove usage of removed symbols" />
     <MESSAGE value="Force all handlers to (req, res) { ... }" />
-    <option name="LAST_COMMIT_MESSAGE" value="Force all handlers to (req, res) { ... }" />
+    <MESSAGE value="Move all existing handlers to (req, res) or IoC-based" />
+    <MESSAGE value="Removed debug property" />
+    <option name="LAST_COMMIT_MESSAGE" value="Removed debug property" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1187,13 +1171,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="235">
@@ -1290,13 +1267,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5223">
-          <caret line="361" column="36" lean-forward="true" selection-start-line="361" selection-start-column="36" selection-end-line="361" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
@@ -1355,13 +1325,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="405">
-          <caret line="78" column="85" selection-start-line="78" selection-start-column="85" selection-end-line="78" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="149">
@@ -1372,16 +1335,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1348">
-          <caret line="127" column="14" selection-start-line="127" selection-start-column="14" selection-end-line="127" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/view.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="128">
@@ -1399,26 +1352,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="163">
-          <caret line="67" column="49" selection-start-line="67" selection-start-column="49" selection-end-line="67" selection-end-column="49" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="556">
-            <caret line="44" column="84" selection-start-line="44" selection-start-column="84" selection-end-line="44" selection-end-column="84" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1443,13 +1376,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="22" column="22" lean-forward="true" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-667">
@@ -1471,20 +1397,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="42" selection-start-column="42" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="128">
@@ -1492,13 +1404,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="75" column="45" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="224">
@@ -1520,22 +1425,101 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="408" column="27" selection-start-line="408" selection-start-column="27" selection-end-line="408" selection-end-column="27" />
+        <state relative-caret-position="64">
+          <caret line="9" column="54" lean-forward="true" selection-start-line="9" selection-start-column="54" selection-end-line="9" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.2/lib/src/tuple.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="59" column="11" selection-start-line="59" selection-start-column="11" selection-end-line="59" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="317" column="62" selection-start-line="317" selection-start-column="62" selection-end-line="317" selection-end-column="62" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#48#68#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="92" column="31" selection-start-line="92" selection-start-column="31" selection-end-line="92" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="290" column="23" selection-start-line="290" selection-start-column="23" selection-end-line="290" selection-end-column="23" />
+        <state relative-caret-position="125">
+          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="293">
+          <caret line="44" column="38" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="160" column="31" lean-forward="true" selection-start-line="160" selection-start-column="31" selection-end-line="160" selection-end-column="31" />
           <folding>
-            <element signature="e#39#59#0" expanded="true" />
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="329">
+            <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="166">
+          <caret line="64" column="7" selection-start-line="64" selection-start-column="7" selection-end-line="64" selection-end-column="7" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1153">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="363" column="45" selection-start-line="363" selection-start-column="45" selection-end-line="363" selection-end-column="45" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index f9bfd987..0bca22d0 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -1,4 +1,4 @@
-library angel_framework.http;
+library angel_framework.core.hooked_service;
 
 import 'dart:async';
 import '../util.dart';
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index b34fe06d..0f1f18c2 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -94,10 +94,10 @@ class Routable extends Router<RequestHandler> {
   /// The [router] may only omitted when called via
   /// an [Angel] instance.
   ///
-  /// Returns either a [Route] or a [Service] (if one was mounted).
-  use(path, [Router<RequestHandler> router, String namespace = null]) {
+  /// Returns a [HookedService] (if one was mounted).
+  HookedService use(path, [Router<RequestHandler> router, String namespace = null]) {
     Router<RequestHandler> _router = router;
-    Service service;
+    HookedService service;
 
     // If we need to hook this service, do it here. It has to be first, or
     // else all routes will point to the old service.
@@ -153,6 +153,6 @@ class Routable extends Router<RequestHandler> {
       if (_onService.hasListener) _onService.add(service);
     }
 
-    return service ?? mounted;
+    return service;
   }
 }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 115a1c60..8ec22f32 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -14,6 +14,7 @@ import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
 
 import '../http/http.dart';
+import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
@@ -361,6 +362,11 @@ class Angel extends Routable {
     return new Future.sync(() => configurer(this));
   }
 
+  /// Shorthand for calling `all('*', handler)`.
+  Route<RequestHandler> fallback(RequestHandler handler) {
+    return all('*', handler);
+  }
+
   /// Mounts the child on this router. If [routable] is `null`,
   /// then this method will add a handler as a global middleware instead.
   ///
@@ -372,8 +378,7 @@ class Angel extends Routable {
   /// NOTE: The above will not be properly copied if [path] is
   /// a [RegExp].
   @override
-  use(path, [Router routable, String namespace = null]) {
-    if (routable == null) return all('*', path);
+  HookedService use(path, [Router<RequestHandler> routable, String namespace = null]) {
 
     var head = path.toString().replaceAll(_straySlashes, '');
 
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index 2e71dd26..c9f210f2 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -93,7 +93,9 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
               request.method;
 
     ctx.app = app;
-    ctx._contentType = MediaType.parse(request.headers.contentType.toString());
+    ctx._contentType = request.headers.contentType == null
+        ? null
+        : MediaType.parse(request.headers.contentType.toString());
     ctx._override = override;
 
     /*

From ecb15293a9dc61d580f7f564ad1999963a2c7f83 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 20:53:44 -0400
Subject: [PATCH 272/414] Routable.use only accepts a Service

---
 CHANGELOG.md               |  3 +-
 example/main.dart          |  2 +-
 lib/src/core/routable.dart | 79 +++++++-------------------------------
 lib/src/core/server.dart   | 48 ++---------------------
 4 files changed, 20 insertions(+), 112 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58c1361d..76c6a367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,4 +45,5 @@ type-safe manner.
 * `RequestContext.params` is now a `Map<String, dynamic>`, rather than just a `Map`.
 * Removed `RequestContext.grab`.
 * Removed `RequestContext.properties`.
-* Removed the defunct `debug` property where it still existed.
\ No newline at end of file
+* Removed the defunct `debug` property where it still existed.
+* `Routable.use` now only accepts a `Service`.
\ No newline at end of file
diff --git a/example/main.dart b/example/main.dart
index dc7ef909..27dbd80b 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -29,7 +29,7 @@ main() async {
   );
 
   // Simple fallback to throw a 404 on unknown paths.
-  app.use((RequestContext req) async {
+  app.fallback((req, res) {
     throw new AngelHttpException.notFound(
       message: 'Unknown path: "${req.uri.path}"',
     );
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 0f1f18c2..b809c873 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -9,7 +9,6 @@ import 'hooked_service.dart';
 import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
-import 'server.dart';
 import 'service.dart';
 
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
@@ -89,70 +88,20 @@ class Routable extends Router<RequestHandler> {
         middleware: handlerSequence);
   }
 
-  /// Mounts the given [router] on this instance.
+  /// Mounts a [service] at the given [path].
   ///
-  /// The [router] may only omitted when called via
-  /// an [Angel] instance.
-  ///
-  /// Returns a [HookedService] (if one was mounted).
-  HookedService use(path, [Router<RequestHandler> router, String namespace = null]) {
-    Router<RequestHandler> _router = router;
-    HookedService service;
-
-    // If we need to hook this service, do it here. It has to be first, or
-    // else all routes will point to the old service.
-    if (router is Service) {
-      _router = service = new HookedService(router);
-      _services[path
-          .toString()
-          .trim()
-          .replaceAll(new RegExp(r'(^/+)|(/+$)'), '')] = service;
-      service.addRoutes();
-
-      if (_router is HookedService && _router != router)
-        router.onHooked(_router);
-    }
-
-    final handlers = [];
-
-    if (_router is Angel) {
-      handlers.add((RequestContext req, ResponseContext res) {
-        req.app = _router as Angel;
-        res.app = _router as Angel;
-        return true;
-      });
-    }
-
-    // Let's copy middleware, heeding the optional middleware namespace.
-    String middlewarePrefix = namespace != null ? "$namespace." : "";
-
-    // Also copy properties...
-    if (router is Routable) {
-      Map copiedProperties = new Map.from(router.configuration);
-      for (String propertyName in copiedProperties.keys) {
-        configuration.putIfAbsent("$middlewarePrefix$propertyName",
-            () => copiedProperties[propertyName]);
-      }
-    }
-
-    // _router.dumpTree(header: 'Mounting on "$path":');
-    // root.child(path, debug: debug, handlers: handlers).addChild(router.root);
-    var mounted = mount(path.toString(), _router);
-
-    if (_router is Routable) {
-      // Copy services, too. :)
-      for (Pattern servicePath in _router._services.keys) {
-        String newServicePath =
-            path.toString().trim().replaceAll(new RegExp(r'(^/+)|(/+$)'), '') +
-                '/$servicePath';
-        _services[newServicePath] = _router._services[servicePath];
-      }
-    }
-
-    if (service != null) {
-      if (_onService.hasListener) _onService.add(service);
-    }
-
-    return service;
+  /// Returns a [HookedService] that can be used to hook into
+  /// events dispatched by this service.
+  HookedService use(String path, Service service) {
+    var hooked = new HookedService(service);
+    _services[path
+        .toString()
+        .trim()
+        .replaceAll(new RegExp(r'(^/+)|(/+$)'), '')] = hooked;
+    hooked.addRoutes();
+    mount(path.toString(), hooked);
+    service.onHooked(hooked);
+    _onService.add(hooked);
+    return hooked;
   }
 }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 8ec22f32..34c909f1 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -367,52 +367,10 @@ class Angel extends Routable {
     return all('*', handler);
   }
 
-  /// Mounts the child on this router. If [routable] is `null`,
-  /// then this method will add a handler as a global middleware instead.
-  ///
-  /// If the router is an [Angel] instance, all controllers
-  /// will be copied, as well as services and response finalizers.
-  ///
-  /// [before] and [after] will be preserved.
-  ///
-  /// NOTE: The above will not be properly copied if [path] is
-  /// a [RegExp].
   @override
-  HookedService use(path, [Router<RequestHandler> routable, String namespace = null]) {
-
-    var head = path.toString().replaceAll(_straySlashes, '');
-
-    if (routable is Angel) {
-      _children.add(routable.._parent = this);
-      _preContained.addAll(routable._preContained);
-
-      if (routable.responseFinalizers.isNotEmpty) {
-        responseFinalizers.add((req, res) {
-          if (req.path.replaceAll(_straySlashes, '').startsWith(head)) {
-            for (var finalizer in routable.responseFinalizers)
-              finalizer(req, res);
-          }
-
-          return new Future.value(true);
-        });
-      }
-
-      routable._controllers.forEach((k, v) {
-        var tail = k.toString().replaceAll(_straySlashes, '');
-        _controllers['$head/$tail'.replaceAll(_straySlashes, '')] = v;
-      });
-
-      routable.services.forEach((k, v) {
-        var tail = k.toString().replaceAll(_straySlashes, '');
-        services['$head/$tail'.replaceAll(_straySlashes, '')] = v;
-      });
-    }
-
-    if (routable is Service) {
-      routable.app = this;
-    }
-
-    return super.use(path, routable, namespace);
+  HookedService use(String path, Service service) {
+    service.app = this;
+    return super.use(path, service)..app = this;
   }
 
   Angel({@required Reflector reflector}) {

From 340b08da1b9b372566cad92d7b3498c4dd3a88b1 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 21:05:05 -0400
Subject: [PATCH 273/414] Add flags to Angel constructor

---
 .idea/workspace.xml          | 422 +++++++++++++++++++----------------
 CHANGELOG.md                 |   7 +-
 example/handle_error.dart    |   2 +-
 example/main.dart            |   4 +-
 lib/src/core/server.dart     |  39 +---
 lib/src/http/controller.dart |   2 +-
 test/routing_test.dart       |   6 +-
 test/server_test.dart        |   2 +-
 8 files changed, 251 insertions(+), 233 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0a2c9abe..c290ba05 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/handle_error.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -25,13 +32,13 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="275">
-              <caret line="363" column="45" selection-start-line="363" selection-start-column="45" selection-end-line="363" selection-end-column="45" />
+            <state relative-caret-position="54">
+              <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
               <folding>
-                <element signature="e#38#58#0" expanded="true" />
+                <element signature="e#0#46#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -40,8 +47,8 @@
       <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="166">
-              <caret line="64" column="7" selection-start-line="64" selection-start-column="7" selection-end-line="64" selection-end-column="7" />
+            <state relative-caret-position="-140">
+              <caret line="163" column="31" lean-forward="true" selection-start-line="163" selection-start-column="31" selection-end-line="163" selection-end-column="31" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -49,80 +56,80 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="317" column="62" selection-start-line="317" selection-start-column="62" selection-end-line="317" selection-end-column="62" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="149">
+              <caret line="103" column="31" selection-start-line="103" selection-start-column="31" selection-end-line="103" selection-end-column="31" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1153">
-              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="329">
-                <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
+              <first_editor relative-caret-position="540">
+                <caret line="53" column="75" selection-start-line="53" selection-start-column="75" selection-end-line="53" selection-end-column="75" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="293">
-              <caret line="44" column="38" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="primitives_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="9" column="54" lean-forward="true" selection-start-line="9" selection-start-column="54" selection-end-line="9" selection-end-column="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="125">
-              <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/server_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="92" column="31" selection-start-line="92" selection-start-column="31" selection-end-line="92" selection-end-column="31" />
+            <state relative-caret-position="160">
+              <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="406">
+              <caret line="370" column="38" selection-start-line="370" selection-start-column="38" selection-end-line="370" selection-end-column="38" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="future_impl.dart" pinned="false" current-in-tab="false">
+        <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="129">
+              <caret line="128" column="17" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="zone.dart" pinned="false" current-in-tab="false">
+        <entry file="file:///usr/local/opt/dart/libexec/lib/async/zone.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="129">
+              <caret line="1378" column="53" selection-start-line="1378" selection-start-column="53" selection-end-line="1378" selection-end-column="53" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-369">
+              <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="112">
+              <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -139,7 +146,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>god.deserialize</find>
       <find>reflector</find>
       <find>Angel(M</find>
       <find>pool</find>
@@ -169,6 +175,7 @@
       <find>injections</find>
       <find>injecti</find>
       <find>debug</find>
+      <find>handle(</find>
     </findStrings>
     <replaceStrings>
       <replace>'server'</replace>
@@ -245,20 +252,14 @@
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
@@ -266,15 +267,21 @@
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/example/handle_error.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -694,21 +701,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="4502000" />
-    </task>
-    <task id="LOCAL-00101" summary="Patch">
-      <created>1531151957605</created>
-      <option name="number" value="00101" />
-      <option name="presentableId" value="LOCAL-00101" />
-      <option name="project" value="LOCAL" />
-      <updated>1531151957606</updated>
-    </task>
-    <task id="LOCAL-00102" summary="Bump">
-      <created>1531152011317</created>
-      <option name="number" value="00102" />
-      <option name="presentableId" value="LOCAL-00102" />
-      <option name="project" value="LOCAL" />
-      <updated>1531152011317</updated>
+      <workItem from="1534793956753" duration="6517000" />
     </task>
     <task id="LOCAL-00103" summary="Finalizers before sending">
       <created>1531155020859</created>
@@ -1039,7 +1032,21 @@
       <option name="project" value="LOCAL" />
       <updated>1534798410411</updated>
     </task>
-    <option name="localTasksCounter" value="150" />
+    <task id="LOCAL-00150" summary="Starts up, but is broken">
+      <created>1534798717707</created>
+      <option name="number" value="00150" />
+      <option name="presentableId" value="LOCAL-00150" />
+      <option name="project" value="LOCAL" />
+      <updated>1534798717707</updated>
+    </task>
+    <task id="LOCAL-00151" summary="Routable.use only accepts a Service">
+      <created>1534812824990</created>
+      <option name="number" value="00151" />
+      <option name="presentableId" value="LOCAL-00151" />
+      <option name="project" value="LOCAL" />
+      <updated>1534812824990</updated>
+    </task>
+    <option name="localTasksCounter" value="152" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1075,7 +1082,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="176709000" />
+    <option name="totallyTimeSpent" value="178724000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1138,8 +1145,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Upgrade combinator dependency" />
-    <MESSAGE value="Upgrade body_parser dependency" />
     <MESSAGE value="Update description" />
     <MESSAGE value="Completely removed the `AngelBase` class" />
     <MESSAGE value="Remove all usage of dart2_constant" />
@@ -1163,7 +1168,9 @@
     <MESSAGE value="Force all handlers to (req, res) { ... }" />
     <MESSAGE value="Move all existing handlers to (req, res) or IoC-based" />
     <MESSAGE value="Removed debug property" />
-    <option name="LAST_COMMIT_MESSAGE" value="Removed debug property" />
+    <MESSAGE value="Starts up, but is broken" />
+    <MESSAGE value="Routable.use only accepts a Service" />
+    <option name="LAST_COMMIT_MESSAGE" value="Routable.use only accepts a Service" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1171,37 +1178,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="235">
-          <caret line="75" column="7" lean-forward="true" selection-start-line="75" selection-start-column="7" selection-end-line="75" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="61" lean-forward="true" selection-start-line="61" selection-end-line="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="21" column="34" lean-forward="true" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/hooks.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/common.dart" />
-    <entry file="file://$PROJECT_DIR$/test/typed_service_test.dart" />
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="438">
-          <caret line="105" column="35" selection-start-line="105" selection-start-column="35" selection-end-line="105" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib/src/mirrors/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="96">
@@ -1260,13 +1236,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="7" column="52" selection-start-line="7" selection-start-column="52" selection-end-line="7" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
@@ -1274,16 +1243,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="136" column="11" lean-forward="true" selection-start-line="136" selection-start-column="11" selection-end-line="136" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib/src/container.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="406">
@@ -1291,16 +1250,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-394">
-          <caret line="98" column="26" selection-start-line="98" selection-start-column="26" selection-end-line="98" selection-end-column="26" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="203">
@@ -1345,13 +1294,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3259">
-          <caret line="6" column="21" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1366,16 +1308,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="33" column="29" selection-start-line="33" selection-start-column="29" selection-end-line="33" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-667">
@@ -1411,13 +1343,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1528">
-          <caret line="64" column="51" lean-forward="true" selection-start-line="64" selection-start-column="51" selection-end-line="64" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -1449,13 +1374,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="92" column="31" selection-start-line="92" selection-start-column="31" selection-end-line="92" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="128">
@@ -1487,43 +1405,153 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="329">
-            <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/utils.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="181">
+          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="166">
-          <caret line="64" column="7" selection-start-line="64" selection-start-column="7" selection-end-line="64" selection-end-column="7" />
+        <state relative-caret-position="129">
+          <caret line="45" column="11" selection-start-line="45" selection-start-column="11" selection-end-line="45" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/opt/dart/libexec/lib/collection/list.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="217" column="21" selection-start-line="217" selection-start-column="21" selection-end-line="217" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib/src/symlink_route.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="97">
+          <caret line="42" column="28" lean-forward="true" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="262">
+          <caret line="96" column="14" selection-start-line="96" selection-start-column="14" selection-end-line="96" selection-end-column="14" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="43" selection-start-column="43" selection-end-column="43" />
+          <folding>
+            <element signature="e#31#51#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="886">
+          <caret line="94" column="16" selection-start-line="94" selection-start-column="16" selection-end-line="94" selection-end-column="16" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1153">
-          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        <state relative-caret-position="-369">
+          <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="149">
+          <caret line="103" column="31" selection-start-line="103" selection-start-column="31" selection-end-line="103" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="128" column="17" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/opt/dart/libexec/lib/async/zone.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="1378" column="53" selection-start-line="1378" selection-start-column="53" selection-end-line="1378" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-140">
+          <caret line="163" column="31" lean-forward="true" selection-start-line="163" selection-start-column="31" selection-end-line="163" selection-end-column="31" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="363" column="45" selection-start-line="363" selection-start-column="45" selection-end-line="363" selection-end-column="45" />
+        <state relative-caret-position="406">
+          <caret line="370" column="38" selection-start-line="370" selection-start-column="38" selection-end-line="370" selection-end-column="38" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="540">
+            <caret line="53" column="75" selection-start-line="53" selection-start-column="75" selection-end-line="53" selection-end-column="75" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76c6a367..e49c819f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,4 +46,9 @@ type-safe manner.
 * Removed `RequestContext.grab`.
 * Removed `RequestContext.properties`.
 * Removed the defunct `debug` property where it still existed.
-* `Routable.use` now only accepts a `Service`.
\ No newline at end of file
+* `Routable.use` now only accepts a `Service`.
+* The above change removes the concept of "nested apps," which are messy to maintain, and
+not very elegant.
+* Removed `Angel.createZoneForRequest`.
+* Removed `Angel.defaultZoneCreator`.
+* Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
\ No newline at end of file
diff --git a/example/handle_error.dart b/example/handle_error.dart
index 10af58e0..1fa5d1bb 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -9,7 +9,7 @@ main() async {
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
 
-  app.use(() => new Future.error('Throwing just because I feel like!'));
+  app.fallback((req, res) => new Future.error('Throwing just because I feel like!'));
 
   var http = new AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
diff --git a/example/main.dart b/example/main.dart
index 27dbd80b..8ffa35b7 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -2,7 +2,9 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel(reflector: MirrorsReflector());
+  var app = new Angel(
+    reflector: MirrorsReflector(),
+  );
 
   // Index route. Returns JSON.
   app.get('/', (req, res) => res.write('Welcome to Angel!'));
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 34c909f1..08c600b2 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -20,7 +20,7 @@ import 'response_context.dart';
 import 'routable.dart';
 import 'service.dart';
 
-final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+//final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A function that configures an [Angel] server in some way.
 typedef FutureOr AngelConfigurer(Angel app);
@@ -47,15 +47,6 @@ class Angel extends Routable {
   /// A global Map of converters that can transform responses bodies.
   final Map<String, Converter<List<int>, List<int>>> encoders = {};
 
-  /// A function that is called on every request to create a [Zone], A.K.A an asynchronous
-  /// execution context.
-  ///
-  /// The utility of zones in Angel is to safely catch errors without crashing the application;
-  /// this also lets the driver wrap failures in instances of [AngelHttpException].
-  Future<ZoneSpecification> Function(
-          HttpRequest request, RequestContext req, ResponseContext res)
-      createZoneForRequest;
-
   final Map<dynamic, InjectionRequest> _preContained = {};
 
   /// A middleware to inject a serialize on every request.
@@ -373,25 +364,17 @@ class Angel extends Routable {
     return super.use(path, service)..app = this;
   }
 
-  Angel({@required Reflector reflector}) {
+  Angel(
+      {@required Reflector reflector,
+      this.logger,
+      this.eagerParseRequestBodies: false,
+      this.allowMethodOverrides: true,
+      this.keepRawRequestBuffers: false,
+      this.serializer,
+      this.viewGenerator}) {
     _container = new Container(reflector);
     bootstrapContainer();
-    // ignore: deprecated_member_use
-    createZoneForRequest = defaultZoneCreator;
-  }
-
-  @deprecated
-  Future<ZoneSpecification> defaultZoneCreator(request, req, res) {
-    return new Future.value(
-      new ZoneSpecification(
-        print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
-          if (logger != null) {
-            logger.info(line);
-          } else {
-            return parent.print(zone, line);
-          }
-        },
-      ),
-    );
+    viewGenerator ??= noViewEngineConfigured;
+    serializer ??= json.encode;
   }
 }
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index cd01d135..bf81bb92 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -44,7 +44,7 @@ class Controller {
     }
 
     var routable = new Routable();
-    app.use(exposeDecl.path, routable);
+    app.mount(exposeDecl.path, routable);
     TypeMirror typeMirror = reflectType(this.runtimeType);
     String name = exposeDecl.as?.isNotEmpty == true
         ? exposeDecl.as
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 59104d26..05fcf9fa 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -67,14 +67,14 @@ main() {
       return req.params;
     });
 
-    app.use('/nes', nested);
+    app.mount('/nes', nested);
     app.get('/meta', testMiddlewareMetadata);
     app.get('/intercepted', (req, res) => 'This should not be shown',
         middleware: [interceptor]);
     app.get('/hello', (req, res) => 'world');
     app.get('/name/:first/last/:last', (req, res) => req.params);
     app.post('/lambda', (RequestContext req, res) => req.parseBody());
-    app.use('/todos/:id', todos);
+    app.mount('/todos/:id', todos);
     app
         .get('/greet/:name',
             (RequestContext req, res) async => "Hello ${req.params['name']}")
@@ -101,7 +101,7 @@ main() {
     app.chain([write('a')]).chain([write('b'), write('c')]).get(
         '/chained', (req, res) => false);
 
-    app.use('MJ');
+    app.fallback((req, res) => 'MJ');
 
     app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
diff --git a/test/server_test.dart b/test/server_test.dart
index 44d9015f..b27c0d42 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -16,7 +16,7 @@ main() {
     var parent = new Angel(reflector: MirrorsReflector())
       ..configuration['two'] = 2;
     var child = new Angel(reflector: MirrorsReflector());
-    parent.use('/child', child);
+    parent.mount('/child', child);
 
     test('sets children', () {
       expect(parent.children, contains(child));

From f8bca542c4242d226574570b9bedde56cbbb6bfd Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 21:12:12 -0400
Subject: [PATCH 274/414] Catch sync errors when using zone

---
 example/main.dart            | 10 ++++++++++
 lib/src/http/angel_http.dart | 14 +++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/example/main.dart b/example/main.dart
index 8ffa35b7..3a97ef61 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -1,11 +1,21 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:logging/logging.dart';
 
 main() async {
   var app = new Angel(
+    logger: Logger('angel'),
     reflector: MirrorsReflector(),
   );
 
+  hierarchicalLoggingEnabled = true;
+
+  app.logger.onRecord.listen((rec) {
+    print(rec);
+    if (rec.error != null) print(rec.error);
+    if (rec.stackTrace != null) print(rec.stackTrace);
+  });
+
   // Index route. Returns JSON.
   app.get('/', (req, res) => res.write('Welcome to Angel!'));
 
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index d3055c31..69dd6eb4 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -227,9 +227,17 @@ class AngelHttp {
           req.container.registerSingleton<Zone>(zone);
           req.container.registerSingleton<ZoneSpecification>(zoneSpec);
 
-          return zone.run(handle).whenComplete(() {
-            res.dispose();
-          });
+          // If a synchronous error is thrown, it's not caught by `zone.run`,
+          // so use a try/catch, and recover when need be.
+
+          try {
+            return zone.run(handle).whenComplete(() {
+              res.dispose();
+            });
+          } catch (e, st) {
+            zone.handleUncaughtError(e, st);
+            return Future.value();
+          }
         }
       });
     });

From 4d980b8e49e9b3f33589ff5b648e64bddcbeb6e5 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 21:27:39 -0400
Subject: [PATCH 275/414] ResponseContext.isBuffered

---
 .idea/runConfigurations/json_dart.xml       |   7 +
 .idea/runConfigurations/templating_dart.xml |   7 -
 .idea/workspace.xml                         | 349 ++++++++------------
 CHANGELOG.md                                |   7 +-
 example/json.dart                           |   9 +-
 lib/src/core/response_context.dart          |  25 +-
 lib/src/http/angel_http.dart                |  14 +-
 7 files changed, 170 insertions(+), 248 deletions(-)
 create mode 100644 .idea/runConfigurations/json_dart.xml
 delete mode 100644 .idea/runConfigurations/templating_dart.xml

diff --git a/.idea/runConfigurations/json_dart.xml b/.idea/runConfigurations/json_dart.xml
new file mode 100644
index 00000000..0c6db2aa
--- /dev/null
+++ b/.idea/runConfigurations/json_dart.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="json.dart" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/example/json.dart" />
+    <option name="workingDirectory" value="$PROJECT_DIR$" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/templating_dart.xml b/.idea/runConfigurations/templating_dart.xml
deleted file mode 100644
index 618351c8..00000000
--- a/.idea/runConfigurations/templating_dart.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="templating.dart" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application" singleton="true" nameIsGenerated="true">
-    <option name="filePath" value="$PROJECT_DIR$/example/templating.dart" />
-    <option name="workingDirectory" value="$PROJECT_DIR$" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c290ba05..a95b8d23 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/json_dart.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/templating_dart.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/handle_error.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/handle_error.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,108 +31,30 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="54">
-              <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-140">
-              <caret line="163" column="31" lean-forward="true" selection-start-line="163" selection-start-column="31" selection-end-line="163" selection-end-column="31" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="149">
-              <caret line="103" column="31" selection-start-line="103" selection-start-column="31" selection-end-line="103" selection-end-column="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="540">
-                <caret line="53" column="75" selection-start-line="53" selection-start-column="75" selection-end-line="53" selection-end-column="75" />
+              <first_editor relative-caret-position="588">
+                <caret line="58" column="75" selection-start-line="58" selection-start-column="75" selection-end-line="58" selection-end-column="75" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="406">
-              <caret line="370" column="38" selection-start-line="370" selection-start-column="38" selection-end-line="370" selection-end-column="38" />
+            <state relative-caret-position="269">
+              <caret line="118" column="19" selection-start-line="118" selection-start-column="19" selection-end-line="118" selection-end-column="19" />
               <folding>
-                <element signature="e#38#58#0" expanded="true" />
+                <element signature="e#48#68#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="future_impl.dart" pinned="false" current-in-tab="false">
-        <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="129">
-              <caret line="128" column="17" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="zone.dart" pinned="false" current-in-tab="false">
-        <entry file="file:///usr/local/opt/dart/libexec/lib/async/zone.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="129">
-              <caret line="1378" column="53" selection-start-line="1378" selection-start-column="53" selection-end-line="1378" selection-end-column="53" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="controller.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-369">
-              <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="handle_error.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="112">
-              <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -254,7 +175,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
@@ -266,7 +186,6 @@
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
@@ -278,9 +197,11 @@
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -318,11 +239,6 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="example" type="cbb8eebc:String" user="example" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -341,23 +257,6 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="core" type="cbb8eebc:String" user="core" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="test" type="cbb8eebc:String" user="test" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="tool" type="cbb8eebc:String" user="tool" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -406,7 +305,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Command Line App.performance::hello::raw">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -553,15 +452,18 @@
       <envs />
     </configuration>
     <list>
-      <item itemvalue="Dart Test.All Tests (PRODUCTION)" />
-      <item itemvalue="Dart Test.Can serialize function result as JSON in routing_test.dart" />
-      <item itemvalue="Dart Test.Match routes, even with query params in routing_test.dart" />
-      <item itemvalue="Dart Test.listen before and after in hooked_test.dart" />
       <item itemvalue="Dart Command Line App.performance::hello (DEV)" />
       <item itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
       <item itemvalue="Dart Command Line App.All Tests (for coverage)" />
       <item itemvalue="Dart Command Line App.performance::hello::raw" />
       <item itemvalue="Dart Command Line App.main.dart" />
+      <item itemvalue="Dart Command Line App.view.dart" />
+      <item itemvalue="Dart Command Line App.handle_error.dart" />
+      <item itemvalue="Dart Command Line App.json.dart" />
+      <item itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item itemvalue="Dart Test.Can serialize function result as JSON in routing_test.dart" />
+      <item itemvalue="Dart Test.Match routes, even with query params in routing_test.dart" />
+      <item itemvalue="Dart Test.listen before and after in hooked_test.dart" />
       <item itemvalue="Dart Test.tests in extension_test.dart" />
       <item itemvalue="Dart Test.global injection added to injection map in server_test.dart" />
       <item itemvalue="Dart Test.middleware in controller_test.dart" />
@@ -598,11 +500,13 @@
       <item itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
       <item itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
       <item itemvalue="Dart Test.can fetch data in services_test.dart" />
-      <item itemvalue="Dart Command Line App.view.dart" />
-      <item itemvalue="Dart Command Line App.handle_error.dart" />
-      <item itemvalue="Dart Command Line App.templating.dart" />
       <item itemvalue="Dart Test.tests in find_one_test.dart" />
     </list>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Dart Command Line App.json.dart" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -701,21 +605,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="6517000" />
-    </task>
-    <task id="LOCAL-00103" summary="Finalizers before sending">
-      <created>1531155020859</created>
-      <option name="number" value="00103" />
-      <option name="presentableId" value="LOCAL-00103" />
-      <option name="project" value="LOCAL" />
-      <updated>1531155020859</updated>
-    </task>
-    <task id="LOCAL-00104" summary="Added findOne to `Service`">
-      <created>1531408133584</created>
-      <option name="number" value="00104" />
-      <option name="presentableId" value="LOCAL-00104" />
-      <option name="project" value="LOCAL" />
-      <updated>1531408133586</updated>
+      <workItem from="1534793956753" duration="7749000" />
     </task>
     <task id="LOCAL-00105" summary="Added `Service.findOne` tests">
       <created>1531408765286</created>
@@ -1046,7 +936,21 @@
       <option name="project" value="LOCAL" />
       <updated>1534812824990</updated>
     </task>
-    <option name="localTasksCounter" value="152" />
+    <task id="LOCAL-00152" summary="Add flags to Angel constructor">
+      <created>1534813505067</created>
+      <option name="number" value="00152" />
+      <option name="presentableId" value="LOCAL-00152" />
+      <option name="project" value="LOCAL" />
+      <updated>1534813505067</updated>
+    </task>
+    <task id="LOCAL-00153" summary="Catch sync errors when using zone">
+      <created>1534813932227</created>
+      <option name="number" value="00153" />
+      <option name="presentableId" value="LOCAL-00153" />
+      <option name="project" value="LOCAL" />
+      <updated>1534813932227</updated>
+    </task>
+    <option name="localTasksCounter" value="154" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1082,7 +986,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="178724000" />
+    <option name="totallyTimeSpent" value="179956000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1145,8 +1049,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Update description" />
-    <MESSAGE value="Completely removed the `AngelBase` class" />
     <MESSAGE value="Remove all usage of dart2_constant" />
     <MESSAGE value="Add more to parseId" />
     <MESSAGE value="Make parseId static + docs" />
@@ -1170,7 +1072,9 @@
     <MESSAGE value="Removed debug property" />
     <MESSAGE value="Starts up, but is broken" />
     <MESSAGE value="Routable.use only accepts a Service" />
-    <option name="LAST_COMMIT_MESSAGE" value="Routable.use only accepts a Service" />
+    <MESSAGE value="Add flags to Angel constructor" />
+    <MESSAGE value="Catch sync errors when using zone" />
+    <option name="LAST_COMMIT_MESSAGE" value="Catch sync errors when using zone" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1178,21 +1082,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha/lib/src/mirrors/reflector.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/templating.dart" />
-    <entry file="file://$PROJECT_DIR$/test/all.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="22" column="42" selection-start-line="22" selection-start-column="42" selection-end-line="22" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1250,16 +1139,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/json.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="203">
-          <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/core/list.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="149">
@@ -1284,16 +1163,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/view.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1343,13 +1212,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="28" column="21" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="64">
@@ -1364,16 +1226,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="317" column="62" selection-start-line="317" selection-start-column="62" selection-end-line="317" selection-end-column="62" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="128">
@@ -1470,24 +1322,27 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-369">
-          <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
+        <state relative-caret-position="42">
+          <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
+    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/async/zone.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
+        <state relative-caret-position="859">
+          <caret line="445" column="7" selection-start-line="445" selection-start-column="7" selection-end-line="445" selection-end-column="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="103" column="31" selection-start-line="103" selection-start-column="31" selection-end-line="103" selection-end-column="31" />
+        <state relative-caret-position="182">
+          <caret line="195" column="18" lean-forward="true" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" />
         </state>
       </provider>
     </entry>
@@ -1498,6 +1353,16 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="254" column="26" selection-start-line="254" selection-start-column="26" selection-end-line="254" selection-end-column="26" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -1512,32 +1377,78 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="-369">
+          <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-140">
-          <caret line="163" column="31" lean-forward="true" selection-start-line="163" selection-start-column="31" selection-end-line="163" selection-end-column="31" />
+        <state relative-caret-position="302">
+          <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="406">
-          <caret line="370" column="38" selection-start-line="370" selection-start-column="38" selection-end-line="370" selection-end-column="38" />
+        <state relative-caret-position="144">
+          <caret line="13" column="21" lean-forward="true" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="14" lean-forward="true" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="-663" />
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="566">
+          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/json.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="269">
+          <caret line="118" column="19" selection-start-line="118" selection-start-column="19" selection-end-line="118" selection-end-column="19" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1545,8 +1456,8 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="540">
-            <caret line="53" column="75" selection-start-line="53" selection-start-column="75" selection-end-line="53" selection-end-column="75" />
+          <first_editor relative-caret-position="588">
+            <caret line="58" column="75" selection-start-line="58" selection-start-column="75" selection-end-line="58" selection-end-column="75" />
           </first_editor>
           <second_editor />
         </state>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e49c819f..df51c8da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,4 +51,9 @@ type-safe manner.
 not very elegant.
 * Removed `Angel.createZoneForRequest`.
 * Removed `Angel.defaultZoneCreator`.
-* Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
\ No newline at end of file
+* Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
+* Fix a bug where synchronous errors in `handleRequest` would not be caught.
+* `AngelHttp.useZone` now defaults to `false`.
+* `ResponseContext` now starts in streaming mode by default; the response buffer is opt-in,
+as in many cases it is unnecessary and slows down response time.
+* `ResponseContext.streaming` was replaced by `ResponseContext.isBuffered`.
\ No newline at end of file
diff --git a/example/json.dart b/example/json.dart
index 2d608c34..2b556da6 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 import 'dart:isolate';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
@@ -16,7 +18,7 @@ main() async {
     }
   });
 
-  for (int i = 0; i < 50; i++) {
+  for (int i = 1; i < Platform.numberOfProcessors; i++) {
     var isolate = await Isolate.spawn(serverMain, null);
     isolates.add(isolate);
     print('Spawned isolate #${i + 1}...');
@@ -24,6 +26,8 @@ main() async {
     isolate.addOnExitListener(exit.sendPort);
   }
 
+  serverMain(null);
+
   print('Angel listening at http://localhost:3000');
   await c.future;
 }
@@ -40,9 +44,6 @@ serverMain(_) async {
     });
   });
 
-  // Performance tuning
-  app..serializer = json.encode;
-
   app.errorHandler = (e, req, res) {
     print(e.message ?? e.error ?? e);
     print(e.stackTrace);
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index e1877cde..9689f724 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -20,7 +20,7 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 abstract class ResponseContext<RawResponse>
     implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
-  final BytesBuilder _buffer = new _LockableBytesBuilder();
+  BytesBuilder _buffer;
   final Map<String, String> _headers = {'server': 'angel'};
 
   Completer _done;
@@ -54,7 +54,7 @@ abstract class ResponseContext<RawResponse>
   /// Headers that will be sent to the user.
   Map<String, String> get headers {
     /// If the response is closed, then this getter will return an immutable `Map`.
-    if (streaming)
+    if (!isBuffered)
       return new Map<String, String>.unmodifiable(_headers);
     else
       return _headers;
@@ -87,8 +87,8 @@ abstract class ResponseContext<RawResponse>
   /// Can we still write to this response?
   bool get isOpen;
 
-  /// Returns `true` if a [Stream] is being written directly.
-  bool get streaming;
+  /// Returns `true` if response data is being written to a buffer, rather than to the underlying stream.
+  bool get isBuffered;
 
   /// A set of UTF-8 encoded bytes that will be written to the response.
   BytesBuilder get buffer => _buffer;
@@ -116,7 +116,7 @@ abstract class ResponseContext<RawResponse>
     headers['content-type'] = lookupMimeType(file.path);
     headers['content-length'] = file.lengthSync().toString();
 
-    if (streaming) {
+    if (!isBuffered) {
       file.openRead().pipe(this);
     } else {
       buffer.add(file.readAsBytesSync());
@@ -128,7 +128,7 @@ abstract class ResponseContext<RawResponse>
   ///
   /// This method should be overwritten, setting [streaming] to `false`, **after** a `super` call.
   Future close() {
-    if (streaming) {
+    if (!isBuffered) {
       _buffer?.clear();
     } else if (_buffer is _LockableBytesBuilder) {
       (_buffer as _LockableBytesBuilder)._lock();
@@ -340,13 +340,10 @@ abstract class ResponseContext<RawResponse>
   void write(value, {Encoding encoding}) {
     encoding ??= utf8;
 
-    if (!isOpen && !streaming)
+    if (!isOpen && isBuffered)
       throw closed();
-    else if (streaming) {
-      if (value is List<int>)
-        add(value);
-      else
-        add(encoding.encode(value.toString()));
+    else if (!isBuffered) {
+      add(encoding.encode(value.toString()));
     } else {
       if (value is List<int>)
         buffer.add(value);
@@ -357,9 +354,9 @@ abstract class ResponseContext<RawResponse>
 
   @override
   void writeCharCode(int charCode) {
-    if (!isOpen && !streaming)
+    if (!isOpen && isBuffered)
       throw closed();
-    else if (streaming)
+    else if (!isBuffered)
       add([charCode]);
     else
       buffer.addByte(charCode);
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 69dd6eb4..e5afaf33 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -30,7 +30,7 @@ class AngelHttp {
   Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
   StreamSubscription<HttpRequest> _sub;
 
-  AngelHttp(this.app, {this.useZone: true});
+  AngelHttp(this.app, {this.useZone: false});
 
   /// The function used to bind this instance to an HTTP server.
   Future<HttpServer> Function(dynamic, int) get serverGenerator =>
@@ -62,7 +62,7 @@ class AngelHttp {
   /// the server.
   factory AngelHttp.secure(
       Angel app, String certificateChainPath, String serverKeyPath,
-      { String password, bool useZone: true}) {
+      {String password, bool useZone: true}) {
     var certificateChain =
         Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
@@ -162,7 +162,15 @@ class AngelHttp {
         }
 
         if (useZone == false) {
-          return handle().catchError((e, StackTrace st) {
+          Future f;
+
+          try {
+            f = handle();
+          } catch (e, st) {
+            f = Future.error(e, st);
+          }
+
+          return f.catchError((e, StackTrace st) {
             if (e is FormatException)
               throw new AngelHttpException.badRequest(message: e.message)
                 ..stackTrace = st;

From 582227f99ee037629e56c6463ff865bdddbc773a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 21:32:28 -0400
Subject: [PATCH 276/414] Make LockableBytesBuilder public

---
 .idea/workspace.xml                     | 94 ++++++++++++++-----------
 lib/src/core/response_context.dart      | 30 ++++----
 lib/src/http/http_response_context.dart |  2 +-
 3 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a95b8d23..7b016146 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/json_dart.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/templating_dart.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/json.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/json.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -31,7 +27,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
@@ -43,11 +39,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="269">
-              <caret line="118" column="19" selection-start-line="118" selection-start-column="19" selection-end-line="118" selection-end-column="19" />
+            <state relative-caret-position="260">
+              <caret line="394" column="8" lean-forward="true" selection-start-line="394" selection-start-column="8" selection-end-line="394" selection-end-column="8" />
               <folding>
                 <element signature="e#48#68#0" expanded="true" />
               </folding>
@@ -55,6 +51,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="176">
+              <caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -172,7 +180,6 @@
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
@@ -201,8 +208,9 @@
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
       </list>
     </option>
   </component>
@@ -605,14 +613,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="7749000" />
-    </task>
-    <task id="LOCAL-00105" summary="Added `Service.findOne` tests">
-      <created>1531408765286</created>
-      <option name="number" value="00105" />
-      <option name="presentableId" value="LOCAL-00105" />
-      <option name="project" value="LOCAL" />
-      <updated>1531408765286</updated>
+      <workItem from="1534793956753" duration="8159000" />
     </task>
     <task id="LOCAL-00106" summary="Bump version -&gt; 1.1.5">
       <created>1531409300283</created>
@@ -950,7 +951,14 @@
       <option name="project" value="LOCAL" />
       <updated>1534813932227</updated>
     </task>
-    <option name="localTasksCounter" value="154" />
+    <task id="LOCAL-00154" summary="ResponseContext.isBuffered">
+      <created>1534814859355</created>
+      <option name="number" value="00154" />
+      <option name="presentableId" value="LOCAL-00154" />
+      <option name="project" value="LOCAL" />
+      <updated>1534814859355</updated>
+    </task>
+    <option name="localTasksCounter" value="155" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -986,7 +994,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="179956000" />
+    <option name="totallyTimeSpent" value="180366000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1049,7 +1057,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Remove all usage of dart2_constant" />
     <MESSAGE value="Add more to parseId" />
     <MESSAGE value="Make parseId static + docs" />
     <MESSAGE value="Make RequestContext generic" />
@@ -1074,7 +1081,8 @@
     <MESSAGE value="Routable.use only accepts a Service" />
     <MESSAGE value="Add flags to Angel constructor" />
     <MESSAGE value="Catch sync errors when using zone" />
-    <option name="LAST_COMMIT_MESSAGE" value="Catch sync errors when using zone" />
+    <MESSAGE value="ResponseContext.isBuffered" />
+    <option name="LAST_COMMIT_MESSAGE" value="ResponseContext.isBuffered" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1115,16 +1123,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1368">
-          <caret line="6" column="22" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="69">
@@ -1443,16 +1441,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="118" column="19" selection-start-line="118" selection-start-column="19" selection-end-line="118" selection-end-column="19" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1463,6 +1451,26 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="260">
+          <caret line="394" column="8" lean-forward="true" selection-start-line="394" selection-start-column="8" selection-end-line="394" selection-end-column="8" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 9689f724..395833ac 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -52,13 +52,9 @@ abstract class ResponseContext<RawResponse>
   Future get done => (_done ?? new Completer()).future;
 
   /// Headers that will be sent to the user.
-  Map<String, String> get headers {
-    /// If the response is closed, then this getter will return an immutable `Map`.
-    if (!isBuffered)
-      return new Map<String, String>.unmodifiable(_headers);
-    else
-      return _headers;
-  }
+  ///
+  /// Note that if you have already started writing to the underlying stream, headers will not persist.
+  Map<String, String> get headers => _headers;
 
   /// Serializes response data into a String.
   ///
@@ -128,10 +124,8 @@ abstract class ResponseContext<RawResponse>
   ///
   /// This method should be overwritten, setting [streaming] to `false`, **after** a `super` call.
   Future close() {
-    if (!isBuffered) {
-      _buffer?.clear();
-    } else if (_buffer is _LockableBytesBuilder) {
-      (_buffer as _LockableBytesBuilder)._lock();
+    if (_buffer is LockableBytesBuilder) {
+      (_buffer as LockableBytesBuilder).lock();
     }
 
     if (_done?.isCompleted == false) _done.complete();
@@ -319,8 +313,8 @@ abstract class ResponseContext<RawResponse>
     }
   }
 
-  /// Configure the response to write directly to the output stream, instead of buffering.
-  bool useStream();
+  /// Configure the response to write to an intermediate response buffer, rather than to the stream directly.
+  void enableBuffer();
 
   /// Adds a stream directly the underlying response.
   ///
@@ -374,15 +368,15 @@ abstract class ResponseContext<RawResponse>
   }
 }
 
-abstract class _LockableBytesBuilder extends BytesBuilder {
-  factory _LockableBytesBuilder() {
+abstract class LockableBytesBuilder extends BytesBuilder {
+  factory LockableBytesBuilder() {
     return new _LockableBytesBuilderImpl();
   }
 
-  void _lock();
+  void lock();
 }
 
-class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
+class _LockableBytesBuilderImpl implements LockableBytesBuilder {
   final BytesBuilder _buf = new BytesBuilder(copy: false);
   bool _closed = false;
 
@@ -390,7 +384,7 @@ class _LockableBytesBuilderImpl implements _LockableBytesBuilder {
       new StateError('Cannot modified a closed response\'s buffer.');
 
   @override
-  void _lock() {
+  void lock() {
     _closed = true;
   }
 
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index dc244d31..c71d9e6e 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -11,7 +11,7 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   Angel app;
 
   final HttpRequestContext _correspondingRequest;
-  bool _isClosed = false, _useStream = false;
+  bool _isClosed = false, _useStream = true;
 
   HttpResponseContext(this.rawResponse, this.app, [this._correspondingRequest]);
 

From 15e5cef691d0de11973f54ce4faa3d426104f8b3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 21:45:33 -0400
Subject: [PATCH 277/414] Remove ResponseContext.dispose

---
 CHANGELOG.md                            |  5 +++-
 example/json.dart                       |  1 -
 lib/src/core/response_context.dart      | 24 ++-------------
 lib/src/http/angel_http.dart            |  8 ++---
 lib/src/http/http_response_context.dart | 39 +++++++++++++++----------
 5 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df51c8da..48f6ad30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,4 +56,7 @@ not very elegant.
 * `AngelHttp.useZone` now defaults to `false`.
 * `ResponseContext` now starts in streaming mode by default; the response buffer is opt-in,
 as in many cases it is unnecessary and slows down response time.
-* `ResponseContext.streaming` was replaced by `ResponseContext.isBuffered`.
\ No newline at end of file
+* `ResponseContext.streaming` was replaced by `ResponseContext.isBuffered`.
+* Made `LockableBytesBuilder` public.
+* Removed the now-obsolete `ResponseContext.willCloseItself`.
+* Removed `ResponseContext.dispose`.
\ No newline at end of file
diff --git a/example/json.dart b/example/json.dart
index 2b556da6..0fc28946 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 import 'dart:io';
 import 'dart:isolate';
 
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 395833ac..533cdf98 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -20,7 +20,6 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 abstract class ResponseContext<RawResponse>
     implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
-  BytesBuilder _buffer;
   final Map<String, String> _headers = {'server': 'angel'};
 
   Completer _done;
@@ -87,7 +86,7 @@ abstract class ResponseContext<RawResponse>
   bool get isBuffered;
 
   /// A set of UTF-8 encoded bytes that will be written to the response.
-  BytesBuilder get buffer => _buffer;
+  BytesBuilder get buffer;
 
   /// The underlying [RawResponse] under this instance.
   RawResponse get rawResponse;
@@ -95,11 +94,6 @@ abstract class ResponseContext<RawResponse>
   /// Gets or sets the content type to send back to a client.
   MediaType contentType = new MediaType('text', 'plain');
 
-  /// Set this to true if you will manually close the response.
-  ///
-  /// If `true`, all response finalizers will be skipped.
-  bool willCloseItself = false;
-
   static StateError closed() =>
       new StateError('Cannot modify a closed response.');
 
@@ -124,26 +118,14 @@ abstract class ResponseContext<RawResponse>
   ///
   /// This method should be overwritten, setting [streaming] to `false`, **after** a `super` call.
   Future close() {
-    if (_buffer is LockableBytesBuilder) {
-      (_buffer as LockableBytesBuilder).lock();
+    if (buffer is LockableBytesBuilder) {
+      (buffer as LockableBytesBuilder).lock();
     }
 
     if (_done?.isCompleted == false) _done.complete();
     return new Future.value();
   }
 
-  /// Disposes of all resources.
-  void dispose() {
-    close();
-    properties.clear();
-    encoders.clear();
-    _buffer.clear();
-    cookies.clear();
-    app = null;
-    _headers.clear();
-    serializer = null;
-  }
-
   /// Prevents further request handlers from running on the response, except for response finalizers.
   ///
   /// To disable response finalizers, see [willCloseItself].
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index e5afaf33..09ed2485 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -180,7 +180,7 @@ class AngelHttp {
             var e = ee as AngelHttpException;
             return handleAngelHttpException(
                 e, e.stackTrace ?? st, req, res, request);
-          }).whenComplete(() => res.dispose());
+          });
         } else {
           var zoneSpec = new ZoneSpecification(
             print: (self, parent, zone, line) {
@@ -239,9 +239,7 @@ class AngelHttp {
           // so use a try/catch, and recover when need be.
 
           try {
-            return zone.run(handle).whenComplete(() {
-              res.dispose();
-            });
+            return zone.run(handle);
           } catch (e, st) {
             zone.handleUncaughtError(e, st);
             return Future.value();
@@ -287,7 +285,7 @@ class AngelHttp {
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
-    if (res.willCloseItself) return new Future.value();
+    if (!res.isBuffered) return new Future.value();
 
     Future finalizers = ignoreFinalizers == true
         ? new Future.value()
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index c71d9e6e..06074b56 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+
 import '../core/core.dart';
 import 'http_request_context.dart';
 
@@ -10,8 +11,10 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   final HttpResponse rawResponse;
   Angel app;
 
+  LockableBytesBuilder _buffer;
+
   final HttpRequestContext _correspondingRequest;
-  bool _isClosed = false, _useStream = true;
+  bool _isClosed = false, _streamInitialized = false;
 
   HttpResponseContext(this.rawResponse, this.app, [this._correspondingRequest]);
 
@@ -26,9 +29,10 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   }
 
   @override
-  bool get streaming {
-    return _useStream;
-  }
+  bool get isBuffered => _buffer != null;
+
+  @override
+  BytesBuilder get buffer => _buffer;
 
   @override
   void addError(Object error, [StackTrace stackTrace]) {
@@ -37,17 +41,21 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   }
 
   @override
-  bool useStream() {
-    if (!_useStream) {
+  void enableBuffer() {
+    _buffer = new LockableBytesBuilder();
+  }
+
+  bool _openStream() {
+    if (!_streamInitialized) {
       // If this is the first stream added to this response,
       // then add headers, status code, etc.
       rawResponse
         ..statusCode = statusCode
         ..cookies.addAll(cookies);
       headers.forEach(rawResponse.headers.set);
-      willCloseItself = _useStream = _isClosed = true;
+      _isClosed = true;
       releaseCorrespondingRequest();
-      return true;
+      return _streamInitialized = true;
     }
 
     return false;
@@ -55,14 +63,15 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   void end() {
+    _buffer?.lock();
     _isClosed = true;
     super.end();
   }
 
   @override
   Future addStream(Stream<List<int>> stream) {
-    if (_isClosed && !_useStream) throw ResponseContext.closed();
-    var firstStream = useStream();
+    if (_isClosed && isBuffered) throw ResponseContext.closed();
+    var firstStream = _openStream();
 
     Stream<List<int>> output = stream;
 
@@ -107,17 +116,18 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   void add(List<int> data) {
-    if (_isClosed && !_useStream)
+    if (_isClosed && isBuffered)
       throw ResponseContext.closed();
-    else if (_useStream)
+    else if (!isBuffered) {
+      _openStream();
       rawResponse.add(data);
-    else
+    } else
       buffer.add(data);
   }
 
   @override
   Future close() {
-    if (_useStream) {
+    if (!isBuffered) {
       try {
         rawResponse.close();
       } catch (_) {
@@ -128,7 +138,6 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
     _isClosed = true;
     super.close();
-    _useStream = false;
     return new Future.value();
   }
 }

From 2b1a548cf9155de6d0f3b14a52bc2ab732c16621 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 21:57:26 -0400
Subject: [PATCH 278/414] Remove releaseCOrrespondingRequest

---
 .idea/workspace.xml                     | 311 ++++++++++++++----------
 CHANGELOG.md                            |   4 +-
 lib/src/core/response_context.dart      |  29 +--
 lib/src/core/server.dart                |   2 +-
 lib/src/http/angel_http.dart            |  26 +-
 lib/src/http/http_response_context.dart |  30 ++-
 test/routing_test.dart                  |   2 +-
 7 files changed, 221 insertions(+), 183 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7b016146..aa5d08f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,12 @@
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -27,35 +31,65 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="588">
-                <caret line="58" column="75" selection-start-line="58" selection-start-column="75" selection-end-line="58" selection-end-column="75" />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/main.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="301">
+              <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" />
+              <folding>
+                <element signature="e#0#46#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="260">
-              <caret line="394" column="8" lean-forward="true" selection-start-line="394" selection-start-column="8" selection-end-line="394" selection-end-column="8" />
+            <state relative-caret-position="182">
+              <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="252">
+              <caret line="286" column="39" selection-start-line="286" selection-start-column="39" selection-end-line="286" selection-end-column="39" />
               <folding>
-                <element signature="e#48#68#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1483">
+              <caret line="153" column="15" selection-start-line="153" selection-start-column="15" selection-end-line="153" selection-end-column="15" />
+              <folding>
+                <element signature="e#38#58#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/json.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-282">
+              <caret column="20" selection-start-column="20" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
+            <state relative-caret-position="129">
+              <caret line="56" column="19" lean-forward="true" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -63,6 +97,30 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="283">
+                <caret line="62" column="49" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="258">
+              <caret line="119" column="9" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -75,12 +133,8 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>reflector</find>
-      <find>Angel(M</find>
-      <find>pool</find>
       <find>super</find>
       <find>close()</find>
-      <find>close(</find>
       <find>DEFUNC</find>
       <find>const</find>
       <find>dart2_constant/convert.dart</find>
@@ -105,9 +159,12 @@
       <find>injecti</find>
       <find>debug</find>
       <find>handle(</find>
+      <find>lock</find>
+      <find>add(</find>
+      <find>close(</find>
+      <find>end()</find>
     </findStrings>
     <replaceStrings>
-      <replace>'server'</replace>
       <replace>FutureOr</replace>
       <replace>var body = await getBody(rs);</replace>
       <replace />
@@ -137,6 +194,7 @@
       <replace>));</replace>
       <replace>req</replace>
       <replace>req.container</replace>
+      <replace>close()</replace>
     </replaceStrings>
     <dirStrings>
       <dir>C:\Users\thosa\Source\Angel\framework\lib</dir>
@@ -202,15 +260,15 @@
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/example/json.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
-        <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -247,6 +305,11 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="example" type="cbb8eebc:String" user="example" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -313,7 +376,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.performance::hello::raw">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -613,21 +676,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="8159000" />
-    </task>
-    <task id="LOCAL-00106" summary="Bump version -&gt; 1.1.5">
-      <created>1531409300283</created>
-      <option name="number" value="00106" />
-      <option name="presentableId" value="LOCAL-00106" />
-      <option name="project" value="LOCAL" />
-      <updated>1531409300283</updated>
-    </task>
-    <task id="LOCAL-00107" summary="Patched another cast bug">
-      <created>1533353912000</created>
-      <option name="number" value="00107" />
-      <option name="presentableId" value="LOCAL-00107" />
-      <option name="project" value="LOCAL" />
-      <updated>1533353912001</updated>
+      <workItem from="1534793956753" duration="9486000" />
     </task>
     <task id="LOCAL-00108" summary="Removed random_string dependency">
       <created>1534547008912</created>
@@ -958,7 +1007,21 @@
       <option name="project" value="LOCAL" />
       <updated>1534814859355</updated>
     </task>
-    <option name="localTasksCounter" value="155" />
+    <task id="LOCAL-00155" summary="Make LockableBytesBuilder public">
+      <created>1534815148128</created>
+      <option name="number" value="00155" />
+      <option name="presentableId" value="LOCAL-00155" />
+      <option name="project" value="LOCAL" />
+      <updated>1534815148128</updated>
+    </task>
+    <task id="LOCAL-00156" summary="Remove ResponseContext.dispose">
+      <created>1534815933898</created>
+      <option name="number" value="00156" />
+      <option name="presentableId" value="LOCAL-00156" />
+      <option name="project" value="LOCAL" />
+      <updated>1534815933898</updated>
+    </task>
+    <option name="localTasksCounter" value="157" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -994,7 +1057,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="180366000" />
+    <option name="totallyTimeSpent" value="181693000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1030,7 +1093,7 @@
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
       <window_info content_ui="combo" id="Project" order="0" weight="0.27846155" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
@@ -1057,8 +1120,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Add more to parseId" />
-    <MESSAGE value="Make parseId static + docs" />
     <MESSAGE value="Make RequestContext generic" />
     <MESSAGE value="Completely remove RequestContext.io" />
     <MESSAGE value="Completely remove ResponseContext.io" />
@@ -1082,7 +1143,9 @@
     <MESSAGE value="Add flags to Angel constructor" />
     <MESSAGE value="Catch sync errors when using zone" />
     <MESSAGE value="ResponseContext.isBuffered" />
-    <option name="LAST_COMMIT_MESSAGE" value="ResponseContext.isBuffered" />
+    <MESSAGE value="Make LockableBytesBuilder public" />
+    <MESSAGE value="Remove ResponseContext.dispose" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove ResponseContext.dispose" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1245,16 +1308,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="160" column="31" lean-forward="true" selection-start-line="160" selection-start-column="31" selection-end-line="160" selection-end-column="31" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/utils.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="181">
@@ -1290,16 +1343,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="262">
-          <caret line="96" column="14" selection-start-line="96" selection-start-column="14" selection-end-line="96" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1320,16 +1363,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/async/zone.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="859">
@@ -1337,13 +1370,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="195" column="18" lean-forward="true" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
@@ -1351,16 +1377,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="254" column="26" selection-start-line="254" selection-start-column="26" selection-end-line="254" selection-end-column="26" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -1382,16 +1398,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1431,10 +1437,81 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="80">
+          <caret line="5" column="46" lean-forward="true" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="119" column="9" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
+        <state relative-caret-position="-282">
+          <caret column="20" selection-start-column="20" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="301">
+          <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1483">
+          <caret line="153" column="15" selection-start-line="153" selection-start-column="15" selection-end-line="153" selection-end-column="15" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="286" column="39" selection-start-line="286" selection-start-column="39" selection-end-line="286" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="56" column="19" lean-forward="true" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1444,33 +1521,13 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="588">
-            <caret line="58" column="75" selection-start-line="58" selection-start-column="75" selection-end-line="58" selection-end-column="75" />
+          <first_editor relative-caret-position="283">
+            <caret line="62" column="49" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="394" column="8" lean-forward="true" selection-start-line="394" selection-start-column="8" selection-end-line="394" selection-end-column="8" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48f6ad30..d5982410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,4 +59,6 @@ as in many cases it is unnecessary and slows down response time.
 * `ResponseContext.streaming` was replaced by `ResponseContext.isBuffered`.
 * Made `LockableBytesBuilder` public.
 * Removed the now-obsolete `ResponseContext.willCloseItself`.
-* Removed `ResponseContext.dispose`.
\ No newline at end of file
+* Removed `ResponseContext.dispose`.
+* Removed the now-obsolete `ResponseContext.end`.
+* Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
\ No newline at end of file
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 533cdf98..0964db40 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -110,7 +110,7 @@ abstract class ResponseContext<RawResponse>
       file.openRead().pipe(this);
     } else {
       buffer.add(file.readAsBytesSync());
-      end();
+      close();
     }
   }
 
@@ -126,15 +126,6 @@ abstract class ResponseContext<RawResponse>
     return new Future.value();
   }
 
-  /// Prevents further request handlers from running on the response, except for response finalizers.
-  ///
-  /// To disable response finalizers, see [willCloseItself].
-  ///
-  /// This method should also set [!isOpen] to true.
-  void end() {
-    if (_done?.isCompleted == false) _done.complete();
-  }
-
   /// Serializes JSON to the response.
   void json(value) => this
     ..contentType = MediaType('application', 'json')
@@ -148,7 +139,7 @@ abstract class ResponseContext<RawResponse>
     write("$callbackName(${serializer(value)})");
     this.contentType =
         contentType ?? new MediaType('application', 'javascript');
-    end();
+    close();
   }
 
   /// Renders a view to the response stream, and closes the response.
@@ -160,7 +151,7 @@ abstract class ResponseContext<RawResponse>
           ..addAll(data ?? <String, dynamic>{}))).then((content) {
       write(content);
       headers['content-type'] = 'text/html';
-      end();
+      close();
     });
   }
 
@@ -196,7 +187,7 @@ abstract class ResponseContext<RawResponse>
       </body>
     </html>
     ''');
-    end();
+    close();
   }
 
   /// Redirects to the given named [Route].
@@ -267,7 +258,7 @@ abstract class ResponseContext<RawResponse>
 
     headers['content-type'] = lookupMimeType(file.path);
     buffer.add(file.readAsBytesSync());
-    end();
+    close();
   }
 
   /// Serializes data to the response.
@@ -276,7 +267,7 @@ abstract class ResponseContext<RawResponse>
     var text = serializer(value);
     if (text.isEmpty) return true;
     write(text);
-    end();
+    close();
     return false;
   }
 
@@ -287,14 +278,6 @@ abstract class ResponseContext<RawResponse>
     return file.openRead().pipe(this);
   }
 
-  /// Releases critical resources from the [correspondingRequest].
-  void releaseCorrespondingRequest() {
-    if (!correspondingRequest.app.isProduction &&
-        correspondingRequest.app.logger != null) {
-      correspondingRequest.container.make<Stopwatch>().stop();
-    }
-  }
-
   /// Configure the response to write to an intermediate response buffer, rather than to the stream directly.
   void enableBuffer();
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 08c600b2..42c5535f 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -151,7 +151,7 @@ class Angel extends Routable {
     }
 
     res.write("</ul></body></html>");
-    res.end();
+    res.close();
   };
 
   @override
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 09ed2485..4c3e4e29 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -273,7 +273,7 @@ class AngelHttp {
       res.statusCode = e.statusCode;
       handleError =
           new Future.sync(() => app.errorHandler(e, req, res)).then((result) {
-        return app.executeHandler(result, req, res).then((_) => res.end());
+        return app.executeHandler(result, req, res).then((_) => res.close());
       });
     }
 
@@ -285,7 +285,15 @@ class AngelHttp {
   Future sendResponse(
       HttpRequest request, RequestContext req, ResponseContext res,
       {bool ignoreFinalizers: false}) {
-    if (!res.isBuffered) return new Future.value();
+    void _cleanup(_) {
+      if (!app.isProduction && app.logger != null) {
+        var sw = req.container.make<Stopwatch>();
+        app.logger.info(
+            "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
+      }
+    }
+
+    if (!res.isBuffered) return res.close().then(_cleanup);
 
     Future finalizers = ignoreFinalizers == true
         ? new Future.value()
@@ -293,7 +301,7 @@ class AngelHttp {
             new Future.value(), (out, f) => out.then((_) => f(req, res)));
 
     return finalizers.then((_) {
-      if (res.isOpen) res.end();
+      if (res.isOpen) res.close();
 
       for (var key in res.headers.keys) {
         request.response.headers.add(key, res.headers[key]);
@@ -343,17 +351,7 @@ class AngelHttp {
         ..cookies.addAll(res.cookies)
         ..add(outputBuffer);
 
-      return request.response.close().then((_) {
-        if (!app.isProduction && app.logger != null) {
-          var sw = req.container.make<Stopwatch>();
-
-          if (sw.isRunning) {
-            sw?.stop();
-            app.logger.info(
-                "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
-          }
-        }
-      });
+      return request.response.close().then(_cleanup);
     });
   }
 
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 06074b56..c2e263c5 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -5,6 +5,7 @@ import 'dart:io';
 import '../core/core.dart';
 import 'http_request_context.dart';
 
+/// An implementation of [ResponseContext] that abstracts over an [HttpResponse].
 class HttpResponseContext extends ResponseContext<HttpResponse> {
   /// The underlying [HttpResponse] under this instance.
   @override
@@ -53,21 +54,13 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
         ..statusCode = statusCode
         ..cookies.addAll(cookies);
       headers.forEach(rawResponse.headers.set);
-      _isClosed = true;
-      releaseCorrespondingRequest();
+      //_isClosed = true;
       return _streamInitialized = true;
     }
 
     return false;
   }
 
-  @override
-  void end() {
-    _buffer?.lock();
-    _isClosed = true;
-    super.end();
-  }
-
   @override
   Future addStream(Stream<List<int>> stream) {
     if (_isClosed && isBuffered) throw ResponseContext.closed();
@@ -127,16 +120,21 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   Future close() {
-    if (!isBuffered) {
-      try {
-        rawResponse.close();
-      } catch (_) {
-        // This only seems to occur on `MockHttpRequest`, but
-        // this try/catch prevents a crash.
+    if (!_isClosed) {
+      if (!isBuffered) {
+        try {
+          rawResponse.close();
+        } catch (_) {
+          // This only seems to occur on `MockHttpRequest`, but
+          // this try/catch prevents a crash.
+        }
+      } else {
+        _buffer.lock();
       }
+
+      _isClosed = true;
     }
 
-    _isClosed = true;
     super.close();
     return new Future.value();
   }
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 05fcf9fa..3edb1f46 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -25,7 +25,7 @@ class QueryService extends Service {
 void interceptor(RequestContext req, ResponseContext res) {
   res
     ..write('Middleware')
-    ..end();
+    ..close();
 }
 
 void interceptService(RequestContext req, ResponseContext res) {

From 6822657f2644d7cfff992148dbbd84bd52167242 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 20 Aug 2018 22:44:32 -0400
Subject: [PATCH 279/414] ioc uses executeHandler

---
 .idea/libraries/Dart_Packages.xml |   4 +-
 .idea/workspace.xml               | 500 +++++++++++++++---------------
 example/main.dart                 |   4 +-
 lib/src/core/hooked_service.dart  |   7 +-
 lib/src/core/injection.dart       |   7 +-
 lib/src/core/routable.dart        |  13 +-
 lib/src/core/server.dart          |  10 +-
 lib/src/core/service.dart         |  14 +-
 lib/src/http/angel_http.dart      |   9 +-
 lib/src/util.dart                 |  30 +-
 test/hooked_test.dart             |   2 +-
 11 files changed, 309 insertions(+), 291 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index ec70caa9..db6079ec 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
         <entry key="angel_container">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.5/lib" />
             </list>
           </value>
         </entry>
@@ -454,7 +454,7 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.5/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aa5d08f2..6c8be27b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -34,8 +38,8 @@
       <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/example/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="301">
-              <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" />
+            <state relative-caret-position="150">
+              <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
               </folding>
@@ -43,23 +47,32 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="routing_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="182">
-              <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+            <state relative-caret-position="86">
+              <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
+              <folding>
+                <element signature="e#40#60#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <file leaf-file-name="util.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="286" column="39" selection-start-line="286" selection-start-column="39" selection-end-line="286" selection-end-column="39" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="256">
+              <caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="128">
+              <caret line="8" column="65" selection-start-line="8" selection-start-column="65" selection-end-line="8" selection-end-column="65" />
             </state>
           </provider>
         </entry>
@@ -67,8 +80,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1483">
-              <caret line="153" column="15" selection-start-line="153" selection-start-column="15" selection-end-line="153" selection-end-column="15" />
+            <state relative-caret-position="129">
+              <caret line="162" column="17" selection-start-line="162" selection-start-column="17" selection-end-line="162" selection-end-column="17" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -76,51 +89,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="json.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/json.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-282">
-              <caret column="20" selection-start-column="20" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="129">
-              <caret line="56" column="19" lean-forward="true" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="283">
-                <caret line="62" column="49" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="258">
-              <caret line="119" column="9" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" />
-              <folding>
-                <element signature="e#48#68#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -133,15 +101,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>super</find>
-      <find>close()</find>
-      <find>DEFUNC</find>
-      <find>const</find>
-      <find>dart2_constant/convert.dart</find>
-      <find>dart2_constant/io.dart</find>
-      <find>package:dart:convert</find>
-      <find>package:dart:io</find>
-      <find>deprecated</find>
       <find>parse</find>
       <find>io</find>
       <find>io.</find>
@@ -163,6 +122,15 @@
       <find>add(</find>
       <find>close(</find>
       <find>end()</find>
+      <find>stop</find>
+      <find>sto</find>
+      <find>sopw</find>
+      <find>stopw</find>
+      <find>release</find>
+      <find>handleRe</find>
+      <find>mirrors</find>
+      <find>get container</find>
+      <find>Parameter</find>
     </findStrings>
     <replaceStrings>
       <replace>FutureOr</replace>
@@ -218,8 +186,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/exception_test.dart" />
-        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0/lib/angel_http_exception.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
@@ -234,7 +200,6 @@
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
         <option value="$PROJECT_DIR$/test/services_test.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
@@ -252,23 +217,26 @@
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.3/lib/src/mirrors/reflector.dart" />
+        <option value="$PROJECT_DIR$/lib/src/util.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
       </list>
     </option>
   </component>
@@ -278,12 +246,18 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand />
+      <select />
+    </treeState>
+  </component>
   <component name="NodePackageJsonFileManager">
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="36" />
-    <option name="y" value="23" />
+    <option name="x" value="64" />
+    <option name="y" value="41" />
     <option name="width" value="1342" />
     <option name="height" value="784" />
   </component>
@@ -328,6 +302,18 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="core" type="cbb8eebc:String" user="core" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -376,7 +362,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Test.Controller Tests">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -676,14 +662,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="9486000" />
-    </task>
-    <task id="LOCAL-00108" summary="Removed random_string dependency">
-      <created>1534547008912</created>
-      <option name="number" value="00108" />
-      <option name="presentableId" value="LOCAL-00108" />
-      <option name="project" value="LOCAL" />
-      <updated>1534547008913</updated>
+      <workItem from="1534793956753" duration="12414000" />
     </task>
     <task id="LOCAL-00109" summary="Removed random_string dependency">
       <created>1534547132671</created>
@@ -1021,13 +1000,17 @@
       <option name="project" value="LOCAL" />
       <updated>1534815933898</updated>
     </task>
-    <option name="localTasksCounter" value="157" />
+    <task id="LOCAL-00157" summary="Remove releaseCOrrespondingRequest">
+      <created>1534816646962</created>
+      <option name="number" value="00157" />
+      <option name="presentableId" value="LOCAL-00157" />
+      <option name="project" value="LOCAL" />
+      <updated>1534816646962</updated>
+    </task>
+    <option name="localTasksCounter" value="158" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.07.09 at 11h 06m 50s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="All_Tests - 2018.07.09 at 12h 48m 12s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1055,9 +1038,12 @@
     <history-entry file="tests_in_find_one_test_dart - 2018.08.19 at 11h 22m 50s.xml">
       <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="All_Tests - 2018.08.20 at 22h 14m 22s.xml">
+      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="181693000" />
+    <option name="totallyTimeSpent" value="184621000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1069,7 +1055,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="36" y="23" width="1342" height="784" extended-state="0" />
+    <frame x="64" y="41" width="1342" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1095,7 +1081,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27846155" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27846155" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1120,7 +1106,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Make RequestContext generic" />
     <MESSAGE value="Completely remove RequestContext.io" />
     <MESSAGE value="Completely remove ResponseContext.io" />
     <MESSAGE value="Rename HTTP request+response impl, drop the &quot;impl&quot;" />
@@ -1145,7 +1130,8 @@
     <MESSAGE value="ResponseContext.isBuffered" />
     <MESSAGE value="Make LockableBytesBuilder public" />
     <MESSAGE value="Remove ResponseContext.dispose" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove ResponseContext.dispose" />
+    <MESSAGE value="Remove releaseCOrrespondingRequest" />
+    <option name="LAST_COMMIT_MESSAGE" value="Remove releaseCOrrespondingRequest" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1153,53 +1139,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/angel_base.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1338">
-          <caret line="23" column="40" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-2.0.7/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/safe_stream_controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1402" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="6" column="36" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="7" column="20" lean-forward="true" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.1/lib/src/container.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="406">
-          <caret line="96" column="33" lean-forward="true" selection-start-line="96" selection-start-column="33" selection-end-line="96" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/core/list.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="149">
@@ -1245,13 +1184,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="20" column="51" lean-forward="true" selection-start-line="20" selection-start-column="51" selection-end-line="20" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
@@ -1294,20 +1226,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="44" column="38" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/utils.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="181">
@@ -1336,33 +1254,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib/src/router.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="97">
-          <caret line="42" column="28" lean-forward="true" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-          <folding>
-            <element signature="e#31#51#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="886">
-          <caret line="94" column="16" selection-start-line="94" selection-start-column="16" selection-end-line="94" selection-end-column="16" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/async/zone.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="859">
@@ -1370,13 +1261,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -1391,13 +1275,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-369">
-          <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1430,13 +1307,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="566">
-          <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="257">
@@ -1454,12 +1324,22 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="468">
+            <caret line="33" column="69" selection-start-line="33" selection-start-column="69" selection-end-line="33" selection-end-column="69" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="119" column="9" selection-start-line="119" selection-start-column="9" selection-end-line="119" selection-end-column="9" />
+        <state relative-caret-position="99">
+          <caret line="54" column="34" lean-forward="true" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="34" />
           <folding>
-            <element signature="e#48#68#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1478,53 +1358,181 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="301">
-          <caret line="24" column="16" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="16" />
+        <state relative-caret-position="51">
+          <caret line="278" column="3" selection-start-line="278" selection-start-column="3" selection-end-line="278" selection-end-column="3" />
           <folding>
-            <element signature="e#0#46#0" expanded="true" />
+            <element signature="e#48#68#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="258">
+          <caret line="26" column="22" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/async/future.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="156">
+          <caret line="259" column="17" selection-start-line="259" selection-start-column="17" selection-end-line="259" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-42">
+          <caret line="153" column="46" selection-start-line="153" selection-start-column="46" selection-end-line="153" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="181" column="45" selection-start-line="181" selection-start-column="45" selection-end-line="181" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="99" column="68" selection-start-line="99" selection-start-column="68" selection-end-line="99" selection-end-column="68" />
+          <folding>
+            <element signature="e#46#66#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="185">
+          <caret line="100" column="75" selection-start-line="100" selection-start-column="75" selection-end-line="100" selection-end-column="75" />
+          <folding>
+            <element signature="e#0#22#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="263">
+          <caret line="49" column="29" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="45" column="27" selection-start-line="45" selection-start-column="27" selection-end-line="45" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="19" column="18" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1483">
-          <caret line="153" column="15" selection-start-line="153" selection-start-column="15" selection-end-line="153" selection-end-column="15" />
+        <state relative-caret-position="129">
+          <caret line="162" column="17" selection-start-line="162" selection-start-column="17" selection-end-line="162" selection-end-column="17" />
           <folding>
             <element signature="e#38#58#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.2/lib/src/mirrors/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="286" column="39" selection-start-line="286" selection-start-column="39" selection-end-line="286" selection-end-column="39" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="220">
+          <caret line="32" column="40" selection-start-line="32" selection-start-column="40" selection-end-line="32" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.3/lib/src/mirrors/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
-          <caret line="56" column="19" lean-forward="true" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
+          <caret line="188" column="26" selection-start-line="188" selection-start-column="26" selection-end-line="188" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/opt/dart/libexec/lib/internal/iterable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="413" column="28" selection-start-line="413" selection-start-column="28" selection-end-line="413" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.4/lib/src/mirrors/reflector.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="81">
+          <caret line="52" column="43" selection-start-line="52" selection-start-column="43" selection-end-line="52" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.4/lib/src/reflector.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="166" column="6" selection-start-line="166" selection-start-column="6" selection-end-line="166" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib/src/router.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="97">
+          <caret line="361" column="11" selection-start-line="361" selection-start-column="11" selection-end-line="361" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="86">
+          <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#40#60#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="283">
-            <caret line="62" column="49" selection-start-line="62" selection-start-column="49" selection-end-line="62" selection-end-column="49" />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="8" column="65" selection-start-line="8" selection-start-column="65" selection-end-line="8" selection-end-column="65" />
         </state>
       </provider>
     </entry>
diff --git a/example/main.dart b/example/main.dart
index 3a97ef61..d52378fc 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -24,7 +24,9 @@ main() async {
     '/greet/:name',
     (req, res) {
       var name = req.params['name'];
-      res.write('Hello, $name!');
+      res
+        ..write('Hello, $name!')
+        ..close();
     },
   );
 
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 0bca22d0..7ef14e78 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -6,6 +6,7 @@ import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'metadata.dart';
+import 'server.dart';
 import 'service.dart';
 
 /// Wraps another service in a service that broadcasts events on actions.
@@ -85,8 +86,8 @@ class HookedService extends Service {
   }
 
   /// Adds hooks to this instance.
-  void addHooks() {
-    Hooks hooks = getAnnotation(inner, Hooks);
+  void addHooks(Angel app) {
+    Hooks hooks = getAnnotation(inner, Hooks, app.container.reflector);
     List<HookedServiceEventListener> before = [], after = [];
 
     if (hooks != null) {
@@ -96,7 +97,7 @@ class HookedService extends Service {
 
     void applyListeners(Function fn, HookedServiceEventDispatcher dispatcher,
         [bool isAfter]) {
-      Hooks hooks = getAnnotation(fn, Hooks);
+      Hooks hooks = getAnnotation(fn, Hooks, app.container.reflector);
       final listeners = <HookedServiceEventListener>[]
         ..addAll(isAfter == true ? after : before);
 
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index e87c485c..6e56635a 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -5,10 +5,15 @@ const List<Type> _primitiveTypes = [String, int, num, double, Null];
 /// Shortcut for calling [preInject], and then [handleContained].
 ///
 /// Use this to instantly create a request handler for a DI-enabled method.
+///
+/// Calling [ioc] also auto-serializes the result of a [handler].
 RequestHandler ioc(Function handler, {Iterable<String> optional: const []}) {
   var injection = preInject(handler);
   injection.optional.addAll(optional ?? []);
-  return handleContained(handler, injection);
+  var contained = handleContained(handler, injection);
+  return (req, res) {
+    return req.app.executeHandler(contained, req, res);
+  };
 }
 
 resolveInjection(requirement, InjectionRequest injection, RequestContext req,
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index b809c873..29b7c33d 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -2,6 +2,7 @@ library angel_framework.http.routable;
 
 import 'dart:async';
 
+import 'package:angel_container/angel_container.dart';
 import 'package:angel_route/angel_route.dart';
 
 import '../util.dart';
@@ -45,7 +46,14 @@ class Routable extends Router<RequestHandler> {
   final Map<Pattern, Service> _services = {};
   final Map configuration = {};
 
-  Routable() : super();
+  final Container _container;
+
+  Routable([Reflector reflector])
+      : _container = reflector == null ? null : new Container(reflector),
+        super();
+
+  /// A [Container] used to inject dependencies.
+  Container get container => _container;
 
   void close() {
     _services.clear();
@@ -75,7 +83,8 @@ class Routable extends Router<RequestHandler> {
       {Iterable<RequestHandler> middleware: const <RequestHandler>[]}) {
     final handlers = <RequestHandler>[];
     // Merge @Middleware declaration, if any
-    Middleware middlewareDeclaration = getAnnotation(handler, Middleware);
+    Middleware middlewareDeclaration =
+        getAnnotation(handler, Middleware, _container?.reflector);
     if (middlewareDeclaration != null) {
       handlers.addAll(middlewareDeclaration.handlers);
     }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 42c5535f..6cd1b66b 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -104,8 +104,6 @@ class Angel extends Routable {
   /// These will only not run if a response's `willCloseItself` is set to `true`.
   final List<RequestHandler> responseFinalizers = [];
 
-  Container _container;
-
   /// A [Map] of application-specific data that can be accessed by any
   /// piece of code that can see this [Angel] instance.
   ///
@@ -122,9 +120,6 @@ class Angel extends Routable {
   /// on requests. `false` by default.
   bool keepRawRequestBuffers = false;
 
-  /// A [Container] used to inject dependencies.
-  Container get container => _container;
-
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
@@ -199,7 +194,6 @@ class Angel extends Routable {
     });
 
     super.close();
-    _container = null;
     viewGenerator = noViewEngineConfigured;
     _preContained.clear();
     handlerCache.clear();
@@ -371,8 +365,8 @@ class Angel extends Routable {
       this.allowMethodOverrides: true,
       this.keepRawRequestBuffers: false,
       this.serializer,
-      this.viewGenerator}) {
-    _container = new Container(reflector);
+      this.viewGenerator})
+      : super(reflector) {
     bootstrapContainer();
     viewGenerator ??= noViewEngineConfigured;
     serializer ??= json.encode;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index cdba7ecc..e157da8f 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -154,11 +154,11 @@ class Service extends Routable {
     var handlers = new List<RequestHandler>.from(handlerss);
 
     // Add global middleware if declared on the instance itself
-    Middleware before = getAnnotation(service, Middleware);
+    Middleware before = getAnnotation(service, Middleware, app.container.reflector);
 
     if (before != null) handlers.addAll(before.handlers);
 
-    Middleware indexMiddleware = getAnnotation(service.index, Middleware);
+    Middleware indexMiddleware = getAnnotation(service.index, Middleware, app.container.reflector);
     get('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.index(mergeMap([
@@ -172,7 +172,7 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
-    Middleware createMiddleware = getAnnotation(service.create, Middleware);
+    Middleware createMiddleware = getAnnotation(service.create, Middleware, app.container.reflector);
     post('/', (req, ResponseContext res) {
       return req.parseQuery().then((query) {
         return req.parseBody().then((body) {
@@ -196,7 +196,7 @@ class Service extends Routable {
           ..addAll(
               (createMiddleware == null) ? [] : createMiddleware.handlers));
 
-    Middleware readMiddleware = getAnnotation(service.read, Middleware);
+    Middleware readMiddleware = getAnnotation(service.read, Middleware, app.container.reflector);
 
     get('/:id', (req, res) {
       return req.parseQuery().then((query) {
@@ -213,7 +213,7 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
-    Middleware modifyMiddleware = getAnnotation(service.modify, Middleware);
+    Middleware modifyMiddleware = getAnnotation(service.modify, Middleware, app.container.reflector);
     patch(
         '/:id',
         (req, res) => req.parseBody().then((body) {
@@ -233,7 +233,7 @@ class Service extends Routable {
           ..addAll(
               (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
-    Middleware updateMiddleware = getAnnotation(service.update, Middleware);
+    Middleware updateMiddleware = getAnnotation(service.update, Middleware, app.container.reflector);
     post(
         '/:id',
         (req, res) => req.parseBody().then((body) {
@@ -271,7 +271,7 @@ class Service extends Routable {
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
-    Middleware removeMiddleware = getAnnotation(service.remove, Middleware);
+    Middleware removeMiddleware = getAnnotation(service.remove, Middleware, app.container.reflector);
     delete('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.remove(
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 4c3e4e29..d2b1c950 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -141,18 +141,17 @@ class AngelHttp {
 
           var pipeline = tuple.item1;
 
-          Future<bool> Function() runPipeline;
+          Future Function() runPipeline;
 
           for (var handler in pipeline) {
             if (handler == null) break;
 
             if (runPipeline == null)
-              runPipeline = () => app.executeHandler(handler, req, res);
+              runPipeline = () => Future.sync(() => handler(req, res));
             else {
               var current = runPipeline;
-              runPipeline = () => current().then((result) => !result
-                  ? new Future.value(result)
-                  : app.executeHandler(handler, req, res));
+              runPipeline = () => current().then((result) =>
+                  !res.isOpen ? new Future.value(result) : handler(req, res));
             }
           }
 
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 435ad4e9..077551c2 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -1,26 +1,26 @@
-import 'dart:async';
-import 'dart:mirrors';
+import 'package:angel_container/angel_container.dart';
 
 final RegExp straySlashes = new RegExp(r'(^/+)|(/+$)');
 
-matchingAnnotation(List<InstanceMirror> metadata, Type T) {
-  for (InstanceMirror metaDatum in metadata) {
-    if (metaDatum.hasReflectee) {
-      var reflectee = metaDatum.reflectee;
-      if (reflectee.runtimeType == T) {
-        return reflectee;
-      }
+matchingAnnotation(List<ReflectedInstance> metadata, Type T) {
+  for (ReflectedInstance metaDatum in metadata) {
+    if (metaDatum.type == T) {
+      return metaDatum.reflectee;
     }
   }
   return null;
 }
 
-getAnnotation(obj, Type T) {
-  if (obj is Function || obj is Future) {
-    MethodMirror methodMirror = (reflect(obj) as ClosureMirror).function;
-    return matchingAnnotation(methodMirror.metadata, T);
+getAnnotation(obj, Type T, Reflector reflector) {
+  if (reflector == null) {
+    return null;
   } else {
-    ClassMirror classMirror = reflectClass(obj.runtimeType as Type);
-    return matchingAnnotation(classMirror.metadata, T);
+    if (obj is Function) {
+      var methodMirror = reflector.reflectFunction(obj);
+      return matchingAnnotation(methodMirror.annotations, T);
+    } else {
+      var classMirror = reflector.reflectClass(obj.runtimeType as Type);
+      return matchingAnnotation(classMirror.annotations, T);
+    }
   }
 }
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 8c9ce923..97fc4980 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -98,7 +98,7 @@ main() {
   });
 
   test('metadata', () async {
-    final service = new HookedService(new IncrementService())..addHooks();
+    final service = new HookedService(new IncrementService())..addHooks(app);
     expect(service.inner, isNot(const IsInstanceOf<MapService>()));
     IncrementService.TIMES = 0;
     await service.index();

From edcbf9f639a7c1750cc223fc32dc1f66e1c5bcd7 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 21 Aug 2018 10:22:41 -0400
Subject: [PATCH 280/414] Default to const EmptyReflector()

---
 .idea/libraries/Dart_Packages.xml  |   4 +-
 .idea/workspace.xml                | 344 +++++++++++++++++------------
 CHANGELOG.md                       |   5 +-
 lib/src/core/injection.dart        |  30 ++-
 lib/src/core/request_context.dart  |   2 +-
 lib/src/core/response_context.dart |   2 +-
 lib/src/core/server.dart           |  11 +-
 lib/src/http/controller.dart       |  45 ++--
 8 files changed, 255 insertions(+), 188 deletions(-)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index db6079ec..b8dfae30 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
         <entry key="angel_container">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.5/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.7/lib" />
             </list>
           </value>
         </entry>
@@ -454,7 +454,7 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.5/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.7/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6c8be27b..7de0fedd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,15 +4,12 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/routable.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/routable.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/hooked_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/hooked_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -62,17 +59,59 @@
       <file leaf-file-name="util.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="256">
-              <caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
+            <state relative-caret-position="96">
+              <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="556">
+                <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
+              </first_editor>
+              <second_editor />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="112">
+              <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="8" column="65" selection-start-line="8" selection-start-column="65" selection-end-line="8" selection-end-column="65" />
+            <state relative-caret-position="25">
+              <caret line="85" column="36" selection-start-line="85" selection-start-column="36" selection-end-line="85" selection-end-column="36" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="64">
+              <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="261">
+              <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -80,8 +119,8 @@
       <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="129">
-              <caret line="162" column="17" selection-start-line="162" selection-start-column="17" selection-end-line="162" selection-end-column="17" />
+            <state relative-caret-position="347">
+              <caret line="355" column="11" lean-forward="true" selection-start-line="355" selection-start-column="11" selection-end-line="355" selection-end-column="11" />
               <folding>
                 <element signature="e#38#58#0" expanded="true" />
               </folding>
@@ -89,6 +128,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="66">
+              <caret line="244" column="53" selection-start-line="244" selection-start-column="53" selection-end-line="244" selection-end-column="53" />
+              <folding>
+                <element signature="e#48#68#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -128,9 +179,9 @@
       <find>stopw</find>
       <find>release</find>
       <find>handleRe</find>
-      <find>mirrors</find>
       <find>get container</find>
       <find>Parameter</find>
+      <find>mirrors</find>
     </findStrings>
     <replaceStrings>
       <replace>FutureOr</replace>
@@ -217,26 +268,26 @@
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.3/lib/src/mirrors/reflector.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -256,8 +307,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="64" />
-    <option name="y" value="41" />
+    <option name="x" value="80" />
+    <option name="y" value="23" />
     <option name="width" value="1342" />
     <option name="height" value="784" />
   </component>
@@ -314,6 +365,11 @@
               <item name="framework" type="cbb8eebc:String" user="framework" />
               <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="test" type="cbb8eebc:String" user="test" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -362,7 +418,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Test.Controller Tests">
+  <component name="RunManager" selected="Dart Command Line App.main.dart">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -662,14 +718,7 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="12414000" />
-    </task>
-    <task id="LOCAL-00109" summary="Removed random_string dependency">
-      <created>1534547132671</created>
-      <option name="number" value="00109" />
-      <option name="presentableId" value="LOCAL-00109" />
-      <option name="project" value="LOCAL" />
-      <updated>1534547132671</updated>
+      <workItem from="1534793956753" duration="14213000" />
     </task>
     <task id="LOCAL-00110" summary="Switch to MediaType">
       <created>1534692805087</created>
@@ -1007,19 +1056,17 @@
       <option name="project" value="LOCAL" />
       <updated>1534816646962</updated>
     </task>
-    <option name="localTasksCounter" value="158" />
+    <task id="LOCAL-00158" summary="ioc uses executeHandler">
+      <created>1534819472503</created>
+      <option name="number" value="00158" />
+      <option name="presentableId" value="LOCAL-00158" />
+      <option name="project" value="LOCAL" />
+      <updated>1534819472503</updated>
+    </task>
+    <option name="localTasksCounter" value="159" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2018.07.09 at 12h 48m 12s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 13m 12s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 14m 14s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 16m 10s.xml">
       <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1041,9 +1088,18 @@
     <history-entry file="All_Tests - 2018.08.20 at 22h 14m 22s.xml">
       <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="tests_in_accepts_test_dart - 2018.08.20 at 22h 44m 02s.xml">
+      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="tests_in_anonymous_service_test_dart - 2018.08.20 at 22h 44m 10s.xml">
+      <configuration name="tests in anonymous_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
+    <history-entry file="Controller_Tests - 2018.08.20 at 22h 44m 19s.xml">
+      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="184621000" />
+    <option name="totallyTimeSpent" value="186420000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1055,7 +1111,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="64" y="41" width="1342" height="784" extended-state="0" />
+    <frame x="80" y="23" width="1342" height="784" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
@@ -1079,9 +1135,9 @@
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27846155" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.27846155" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1106,7 +1162,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Completely remove RequestContext.io" />
     <MESSAGE value="Completely remove ResponseContext.io" />
     <MESSAGE value="Rename HTTP request+response impl, drop the &quot;impl&quot;" />
     <MESSAGE value="Make lazy parsing the default" />
@@ -1131,7 +1186,8 @@
     <MESSAGE value="Make LockableBytesBuilder public" />
     <MESSAGE value="Remove ResponseContext.dispose" />
     <MESSAGE value="Remove releaseCOrrespondingRequest" />
-    <option name="LAST_COMMIT_MESSAGE" value="Remove releaseCOrrespondingRequest" />
+    <MESSAGE value="ioc uses executeHandler" />
+    <option name="LAST_COMMIT_MESSAGE" value="ioc uses executeHandler" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1139,30 +1195,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/core/list.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="53" column="15" selection-start-line="53" selection-start-column="15" selection-end-line="53" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="15" column="69" selection-start-line="15" selection-start-column="69" selection-end-line="15" selection-end-column="69" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
-          <folding>
-            <element signature="e#40#104#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1307,16 +1339,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="20" column="15" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -1324,16 +1346,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="468">
-            <caret line="33" column="69" selection-start-line="33" selection-start-column="69" selection-end-line="33" selection-end-column="69" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="99">
@@ -1358,16 +1370,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="278" column="3" selection-start-line="278" selection-start-column="3" selection-end-line="278" selection-end-column="3" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1429,13 +1431,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="45" column="27" selection-start-line="45" selection-start-column="27" selection-end-line="45" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -1443,16 +1438,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="162" column="17" selection-start-line="162" selection-start-column="17" selection-end-line="162" selection-end-column="17" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.2/lib/src/mirrors/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="220">
@@ -1488,13 +1473,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib/src/router.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="97">
@@ -1502,23 +1480,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="256">
-          <caret line="16" column="10" selection-start-line="16" selection-start-column="10" selection-end-line="16" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
@@ -1529,10 +1490,105 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.5/lib/src/reflector.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="430">
+          <caret line="53" column="7" selection-start-line="53" selection-start-column="7" selection-end-line="53" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="8" column="65" selection-start-line="8" selection-start-column="65" selection-end-line="8" selection-end-column="65" />
+        <state relative-caret-position="25">
+          <caret line="85" column="36" selection-start-line="85" selection-start-column="36" selection-end-line="85" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="66">
+          <caret line="244" column="53" selection-start-line="244" selection-start-column="53" selection-end-line="244" selection-end-column="53" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="100" column="45" lean-forward="true" selection-start-line="100" selection-start-column="45" selection-end-line="100" selection-end-column="45" />
+          <folding>
+            <element signature="e#42#62#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="261">
+          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.lock">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="86">
+          <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="347">
+          <caret line="355" column="11" lean-forward="true" selection-start-line="355" selection-start-column="11" selection-end-line="355" selection-end-column="11" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="556">
+            <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5982410..26d2c047 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,4 +61,7 @@ as in many cases it is unnecessary and slows down response time.
 * Removed the now-obsolete `ResponseContext.willCloseItself`.
 * Removed `ResponseContext.dispose`.
 * Removed the now-obsolete `ResponseContext.end`.
-* Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
\ No newline at end of file
+* Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
+* `preInject` now takes a `Reflector` as its second argument.
+* `Angel.reflector` defaults to `const EmptyReflector()`, disabling
+reflection out-of-the-box.
\ No newline at end of file
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 6e56635a..ff086ee6 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -8,10 +8,16 @@ const List<Type> _primitiveTypes = [String, int, num, double, Null];
 ///
 /// Calling [ioc] also auto-serializes the result of a [handler].
 RequestHandler ioc(Function handler, {Iterable<String> optional: const []}) {
-  var injection = preInject(handler);
-  injection.optional.addAll(optional ?? []);
-  var contained = handleContained(handler, injection);
+  InjectionRequest injection;
+  RequestHandler contained;
+
   return (req, res) {
+    if (injection == null) {
+      injection = preInject(handler, req.app.container.reflector);
+      injection.optional.addAll(optional ?? []);
+      contained = handleContained(handler, injection);
+    }
+
     return req.app.executeHandler(contained, req, res);
   };
 }
@@ -127,22 +133,22 @@ class InjectionRequest {
         parameters = {};
 }
 
-final TypeMirror _Parameter = reflectType(Parameter);
-
 /// Predetermines what needs to be injected for a handler to run.
-InjectionRequest preInject(Function handler) {
+InjectionRequest preInject(Function handler, Reflector reflector) {
   var injection = new InjectionRequest();
 
-  ClosureMirror closureMirror = reflect(handler);
+  var closureMirror = reflector.reflectFunction(handler);
 
-  if (closureMirror.function.parameters.isEmpty) return injection;
+  if (closureMirror.parameters.isEmpty) return injection;
 
   // Load parameters
-  for (var parameter in closureMirror.function.parameters) {
-    var name = MirrorSystem.getName(parameter.simpleName);
+  for (var parameter in closureMirror.parameters) {
+    var name = parameter.name;
     var type = parameter.type.reflectedType;
 
-    var p = parameter.metadata
+    var _Parameter = reflector.reflectType(Parameter);
+
+    var p = parameter.annotations
         .firstWhere((m) => m.type.isAssignableTo(_Parameter),
             orElse: () => null)
         ?.reflectee as Parameter;
@@ -160,7 +166,7 @@ InjectionRequest preInject(Function handler) {
     }
 
     if (!parameter.isNamed) {
-      if (parameter.isOptional) injection.optional.add(name);
+      if (!parameter.isRequired) injection.optional.add(name);
 
       if (type == RequestContext || type == ResponseContext) {
         injection.required.add(type);
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index da47bef1..deeec10e 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -2,7 +2,7 @@ library angel_framework.http.request_context;
 
 import 'dart:async';
 import 'dart:io' show Cookie, HttpHeaders, HttpSession, InternetAddress;
-import 'dart:mirrors';
+//import 'dart:mirrors';
 
 import 'package:angel_container/angel_container.dart';
 import 'package:body_parser/body_parser.dart';
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 0964db40..214637b7 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -242,7 +242,7 @@ abstract class ResponseContext<RawResponse>
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
     final head =
-        controller.findExpose().path.toString().replaceAll(_straySlashes, '');
+        controller.findExpose(app.container.reflector).path.toString().replaceAll(_straySlashes, '');
     final tail = matched
         .makeUri(params.keys.fold<Map<String, dynamic>>({}, (out, k) {
           return out..[k.toString()] = params[k];
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 6cd1b66b..912179d4 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -10,7 +10,6 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:logging/logging.dart';
-import 'package:meta/meta.dart';
 import 'package:tuple/tuple.dart';
 
 import '../http/http.dart';
@@ -299,7 +298,7 @@ class Angel extends Routable {
       _isProduction = true;
       _add(v) {
         if (v is Function && !_preContained.containsKey(v)) {
-          _preContained[v] = preInject(v);
+          _preContained[v] = preInject(v, container.reflector);
         }
       }
 
@@ -336,8 +335,10 @@ class Angel extends Routable {
   /// Runs with DI, and *always* reflects. Prefer [runContained].
   Future runReflected(
       Function handler, RequestContext req, ResponseContext res) {
-    var h =
-        handleContained(handler, _preContained[handler] = preInject(handler));
+    var h = handleContained(
+        handler,
+        _preContained[handler] =
+            preInject(handler, req.app.container.reflector));
     return new Future.sync(() => h(req, res));
     // return   closureMirror.apply(args).reflectee;
   }
@@ -359,7 +360,7 @@ class Angel extends Routable {
   }
 
   Angel(
-      {@required Reflector reflector,
+      {Reflector reflector: const EmptyReflector(),
       this.logger,
       this.eagerParseRequestBodies: false,
       this.allowMethodOverrides: true,
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index bf81bb92..6920e939 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -1,8 +1,7 @@
 library angel_framework.http.controller;
 
 import 'dart:async';
-import 'dart:mirrors';
-
+import 'package:angel_container/angel_container.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:meta/meta.dart';
 
@@ -35,8 +34,8 @@ class Controller {
     }
 
     // Load global expose decl
-    ClassMirror classMirror = reflectClass(this.runtimeType);
-    Expose exposeDecl = findExpose();
+    var classMirror = app.container.reflector.reflectClass(this.runtimeType);
+    Expose exposeDecl = findExpose(app.container.reflector);
 
     if (exposeDecl == null) {
       throw new Exception(
@@ -45,36 +44,37 @@ class Controller {
 
     var routable = new Routable();
     app.mount(exposeDecl.path, routable);
-    TypeMirror typeMirror = reflectType(this.runtimeType);
+    var typeMirror = app.container.reflector.reflectType(this.runtimeType);
     String name = exposeDecl.as?.isNotEmpty == true
         ? exposeDecl.as
-        : MirrorSystem.getName(typeMirror.simpleName);
+        : typeMirror.name;
 
     app.controllers[name] = this;
 
     // Pre-reflect methods
-    InstanceMirror instanceMirror = reflect(this);
+    var instanceMirror = app.container.reflector.reflectInstance(this);
     final handlers = <RequestHandler>[]
       ..addAll(exposeDecl.middleware)
       ..addAll(middleware);
     final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
-    classMirror.instanceMembers.forEach(routeBuilder);
+    classMirror.declarations.forEach(routeBuilder);
     configureRoutes(routable);
     return new Future.value();
   }
 
-  void Function(Symbol, MethodMirror) _routeBuilder(
-      InstanceMirror instanceMirror,
+  void Function(ReflectedDeclaration) _routeBuilder(
+      ReflectedInstance instanceMirror,
       Routable routable,
       Iterable<RequestHandler> handlers) {
-    return (Symbol methodName, MethodMirror method) {
-      if (method.isRegularMethod &&
-          methodName != #toString &&
-          methodName != #noSuchMethod &&
-          methodName != #call &&
-          methodName != #equals &&
-          methodName != #==) {
-        Expose exposeDecl = method.metadata
+    return (ReflectedDeclaration decl) {
+      var methodName = decl.name;
+
+      if (methodName != 'toString' &&
+          methodName != 'noSuchMethod' &&
+          methodName != 'call' &&
+          methodName != 'equals' &&
+          methodName != '==') {
+        Expose exposeDecl = decl.function.annotations
             .map((m) => m.reflectee)
             .firstWhere((r) => r is Expose, orElse: () => null);
 
@@ -87,9 +87,10 @@ class Controller {
           ..addAll(exposeDecl.middleware);
         String name = exposeDecl.as?.isNotEmpty == true
             ? exposeDecl.as
-            : MirrorSystem.getName(methodName);
+            : methodName;
 
         // Check if normal
+        var method = decl.function;
         if (method.parameters.length == 2 &&
             method.parameters[0].type.reflectedType == RequestContext &&
             method.parameters[1].type.reflectedType == ResponseContext) {
@@ -103,7 +104,7 @@ class Controller {
           return;
         }
 
-        var injection = preInject(reflectedMethod);
+        var injection = preInject(reflectedMethod, app.container.reflector);
 
         if (exposeDecl?.allowNull?.isNotEmpty == true)
           injection.optional?.addAll(exposeDecl.allowNull);
@@ -119,8 +120,8 @@ class Controller {
   void configureRoutes(Routable routable) {}
 
   /// Finds the [Expose] declaration for this class.
-  Expose findExpose() => reflectClass(runtimeType)
-      .metadata
+  Expose findExpose(Reflector reflector) => reflector.reflectClass(runtimeType)
+      .annotations
       .map((m) => m.reflectee)
       .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
 }

From 4017bc168232fb28a4cf558af21f3b2082944da6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 21 Aug 2018 10:28:53 -0400
Subject: [PATCH 281/414] dart:mirrors is completely gone from Angel

---
 lib/src/core/request_context.dart |  1 -
 lib/src/http/angel_http.dart      | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index deeec10e..7c47b86e 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -2,7 +2,6 @@ library angel_framework.http.request_context;
 
 import 'dart:async';
 import 'dart:io' show Cookie, HttpHeaders, HttpSession, InternetAddress;
-//import 'dart:mirrors';
 
 import 'package:angel_container/angel_container.dart';
 import 'package:body_parser/body_parser.dart';
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index d2b1c950..0dfedcbc 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -173,10 +173,21 @@ class AngelHttp {
             if (e is FormatException)
               throw new AngelHttpException.badRequest(message: e.message)
                 ..stackTrace = st;
-            throw new AngelHttpException(e, stackTrace: st, statusCode: 500);
+            throw new AngelHttpException(e,
+                stackTrace: st,
+                statusCode: 500,
+                message: e?.toString() ?? '500 Internal Server Error');
           }, test: (e) => e is! AngelHttpException).catchError(
               (ee, StackTrace st) {
             var e = ee as AngelHttpException;
+
+            if (app.logger != null) {
+              var error = e.error ?? e;
+              var trace =
+                  new Trace.from(e.stackTrace ?? StackTrace.current).terse;
+              app.logger.severe(e.message ?? e.toString(), error, trace);
+            }
+
             return handleAngelHttpException(
                 e, e.stackTrace ?? st, req, res, request);
           });
@@ -201,7 +212,9 @@ class AngelHttp {
                   e = error;
                 } else {
                   e = new AngelHttpException(error,
-                      stackTrace: stackTrace, message: error?.toString());
+                      stackTrace: stackTrace,
+                      message:
+                          error?.toString() ?? '500 Internal Server Error');
                 }
 
                 if (app.logger != null) {

From 9dd355a4c50171317b63a9477639c0795fc3b07b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 21 Aug 2018 14:50:43 -0400
Subject: [PATCH 282/414] All tests pass

---
 .idea/libraries/Dart_Packages.xml             |   4 +-
 ...ware_via_metadata_in_routing_test_dart.xml |   9 +
 .../encoding_in_streaming_test_dart.xml       |   9 +
 .../metadata_in_hooked_test_dart.xml          |   9 +
 ...ml => tests_in_framework__PRODUCTION_.xml} |   2 +-
 .idea/workspace.xml                           | 830 ++++++++----------
 CHANGELOG.md                                  |  10 +-
 README.md                                     |  69 +-
 example/handle_error.dart                     |   3 +-
 lib/src/core/hooked_service.dart              |  15 +-
 lib/src/core/response_context.dart            |  25 +-
 lib/src/core/server.dart                      |  31 +-
 lib/src/core/service.dart                     |  27 +-
 lib/src/core/typed_service.dart               |   1 +
 lib/src/http/angel_http.dart                  |   8 +-
 lib/src/http/controller.dart                  |  13 +-
 lib/src/http/http_response_context.dart       |  86 +-
 lib/src/util.dart                             |   3 +-
 test/common.dart                              |   7 +
 test/encoders_buffer_test.dart                |  12 +-
 test/parameter_meta_test.dart                 |   5 +-
 test/precontained_test.dart                   |   4 +-
 test/routing_test.dart                        |   2 +-
 test/serialize_test.dart                      |   4 +-
 test/server_test.dart                         |   2 +-
 test/streaming_test.dart                      |  36 +-
 test/view_generator_test.dart                 |   3 +-
 27 files changed, 640 insertions(+), 589 deletions(-)
 create mode 100644 .idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
 create mode 100644 .idea/runConfigurations/encoding_in_streaming_test_dart.xml
 create mode 100644 .idea/runConfigurations/metadata_in_hooked_test_dart.xml
 rename .idea/runConfigurations/{All_Tests__PRODUCTION_2.xml => tests_in_framework__PRODUCTION_.xml} (66%)

diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index b8dfae30..088c8509 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
         <entry key="angel_container">
           <value>
             <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.7/lib" />
+              <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.8/lib" />
             </list>
           </value>
         </entry>
@@ -454,7 +454,7 @@
     </properties>
     <CLASSES>
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.32.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.7/lib" />
+      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.8/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_http_exception-1.0.0+3/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_model-1.0.0+1/lib" />
       <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib" />
diff --git a/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml b/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
new file mode 100644
index 00000000..41e6ad8d
--- /dev/null
+++ b/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Middleware via metadata in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="Middleware via metadata" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/encoding_in_streaming_test_dart.xml b/.idea/runConfigurations/encoding_in_streaming_test_dart.xml
new file mode 100644
index 00000000..f3885511
--- /dev/null
+++ b/.idea/runConfigurations/encoding_in_streaming_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="encoding in streaming_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/streaming_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="encoding" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/metadata_in_hooked_test_dart.xml b/.idea/runConfigurations/metadata_in_hooked_test_dart.xml
new file mode 100644
index 00000000..618cdc73
--- /dev/null
+++ b/.idea/runConfigurations/metadata_in_hooked_test_dart.xml
@@ -0,0 +1,9 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="metadata in hooked_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true" nameIsGenerated="true">
+    <option name="filePath" value="$PROJECT_DIR$/test/hooked_test.dart" />
+    <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
+    <option name="testName" value="metadata" />
+    <option name="testRunnerOptions" value="-j 4" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml b/.idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
similarity index 66%
rename from .idea/runConfigurations/All_Tests__PRODUCTION_2.xml
rename to .idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
index 27a10c9c..263eac1e 100644
--- a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
+++ b/.idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="All Tests (PRODUCTION)" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
+  <configuration default="false" name="tests in framework (PRODUCTION)" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">
     <option name="envs">
       <entry key="ANGEL_ENV" value="production" />
     </option>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7de0fedd..ecb94876 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,27 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/encoding_in_streaming_test_dart.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/metadata_in_hooked_test_dart.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/injection.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/injection.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/controller.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/common.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/common.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/view_generator_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,83 +45,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
-              <folding>
-                <element signature="e#0#46#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="routable.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="86">
-              <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
-              <folding>
-                <element signature="e#40#60#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="util.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="96">
-              <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="556">
-                <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="112">
-              <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="injection.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="25">
-              <caret line="85" column="36" selection-start-line="85" selection-start-column="36" selection-end-line="85" selection-end-column="36" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="64">
-              <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="accepts_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="261">
-              <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
+            <state relative-caret-position="126">
+              <caret line="326" column="36" lean-forward="true" selection-start-line="326" selection-start-column="36" selection-end-line="326" selection-end-column="36" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -116,25 +57,43 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="server.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="347">
-              <caret line="355" column="11" lean-forward="true" selection-start-line="355" selection-start-column="11" selection-end-line="355" selection-end-column="11" />
+            <state relative-caret-position="150">
+              <caret line="24" column="41" lean-forward="true" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="297">
+              <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="172">
+              <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
               <folding>
-                <element signature="e#38#58#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="66">
-              <caret line="244" column="53" selection-start-line="244" selection-start-column="53" selection-end-line="244" selection-end-column="53" />
+            <state relative-caret-position="129">
+              <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
               <folding>
-                <element signature="e#48#68#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -152,28 +111,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>parse</find>
-      <find>io</find>
-      <find>io.</find>
-      <find>lazyP</find>
-      <find>storeO</find>
-      <find>origina</find>
-      <find>originalBuffer</find>
-      <find>lazyQue</find>
-      <find>singleton(</find>
-      <find>preI</find>
-      <find>);</find>
-      <find>RequestContext req</find>
-      <find>req.inject</find>
-      <find>injections</find>
-      <find>injecti</find>
-      <find>debug</find>
-      <find>handle(</find>
-      <find>lock</find>
-      <find>add(</find>
-      <find>close(</find>
-      <find>end()</find>
-      <find>stop</find>
       <find>sto</find>
       <find>sopw</find>
       <find>stopw</find>
@@ -181,7 +118,29 @@
       <find>handleRe</find>
       <find>get container</find>
       <find>Parameter</find>
+      <find>log</find>
       <find>mirrors</find>
+      <find>dart:mirror</find>
+      <find>dart:io</find>
+      <find>_Par</find>
+      <find>waterfall</find>
+      <find>wtf</find>
+      <find>errorHan</find>
+      <find>nested</find>
+      <find>_parent =</find>
+      <find>headers['content</find>
+      <find>skip</find>
+      <find>Provi</find>
+      <find>contentTy</find>
+      <find>abc</find>
+      <find>/chained</find>
+      <find>flatten</find>
+      <find>sendRe</find>
+      <find>enableB</find>
+      <find>Hooks</find>
+      <find>Middleware</find>
+      <find>/meta</find>
+      <find>complet</find>
     </findStrings>
     <replaceStrings>
       <replace>FutureOr</replace>
@@ -237,13 +196,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
-        <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
@@ -258,36 +215,38 @@
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
-        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
-        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/di_test.dart" />
-        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/test/repeat_request_test.dart" />
         <option value="$PROJECT_DIR$/test/controller_test.dart" />
         <option value="$PROJECT_DIR$/performance/hello/main.dart" />
-        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/test/primitives_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
-        <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/test/routing_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.3/lib/src/mirrors/reflector.dart" />
-        <option value="$PROJECT_DIR$/lib/src/util.dart" />
-        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
-        <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
+        <option value="$PROJECT_DIR$/example/main.dart" />
+        <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
+        <option value="$PROJECT_DIR$/test/common.dart" />
+        <option value="$PROJECT_DIR$/test/server_test.dart" />
+        <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/test/serialize_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/util.dart" />
+        <option value="$PROJECT_DIR$/test/routing_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/response_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
+        <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
+        <option value="$PROJECT_DIR$/test/streaming_test.dart" />
       </list>
     </option>
   </component>
@@ -307,7 +266,7 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="80" />
+    <option name="x" value="94" />
     <option name="y" value="23" />
     <option name="width" value="1342" />
     <option name="height" value="784" />
@@ -321,8 +280,6 @@
     </navigator>
     <panes>
       <pane id="PackagesPane" />
-      <pane id="AndroidView" />
-      <pane id="ProjectPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -330,11 +287,6 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="example" type="cbb8eebc:String" user="example" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -346,13 +298,6 @@
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -360,11 +305,6 @@
               <item name="src" type="cbb8eebc:String" user="src" />
               <item name="http" type="cbb8eebc:String" user="http" />
             </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="performance/hello" type="cbb8eebc:String" user="performance/hello" />
-            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -374,6 +314,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="ProjectPane" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -418,7 +360,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Dart Command Line App.main.dart">
+  <component name="RunManager" selected="Dart Test.tests in framework (PRODUCTION)">
     <configuration name="Can serialize function result as JSON in routing_test.dart" type="DartTestRunConfigurationType" factoryName="Dart Test" nameIsGenerated="true">
       <option name="filePath" value="$PROJECT_DIR$/test/routing_test.dart" />
       <option name="scope" value="GROUP_OR_TEST_BY_NAME" />
@@ -573,7 +515,8 @@
       <item itemvalue="Dart Command Line App.view.dart" />
       <item itemvalue="Dart Command Line App.handle_error.dart" />
       <item itemvalue="Dart Command Line App.json.dart" />
-      <item itemvalue="Dart Test.All Tests (PRODUCTION)" />
+      <item itemvalue="Dart Test.tests in framework" />
+      <item itemvalue="Dart Test.tests in framework (PRODUCTION)" />
       <item itemvalue="Dart Test.Can serialize function result as JSON in routing_test.dart" />
       <item itemvalue="Dart Test.Match routes, even with query params in routing_test.dart" />
       <item itemvalue="Dart Test.listen before and after in hooked_test.dart" />
@@ -609,17 +552,14 @@
       <item itemvalue="Dart Test.tests in server_test.dart (PRODUCTION)" />
       <item itemvalue="Dart Test.All Tests" />
       <item itemvalue="Dart Test.cannot write after close in streaming_test.dart" />
-      <item itemvalue="Dart Test.tests in framework" />
       <item itemvalue="Dart Test.encoding in encoders_buffer_test.dart" />
+      <item itemvalue="Dart Test.encoding in streaming_test.dart" />
       <item itemvalue="Dart Test.handleAngelHttpException in server_test.dart" />
       <item itemvalue="Dart Test.can fetch data in services_test.dart" />
       <item itemvalue="Dart Test.tests in find_one_test.dart" />
+      <item itemvalue="Dart Test.metadata in hooked_test.dart" />
+      <item itemvalue="Dart Test.Middleware via metadata in routing_test.dart" />
     </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Dart Command Line App.json.dart" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="SvnConfiguration">
     <configuration />
@@ -718,21 +658,9 @@
       <workItem from="1534009494986" duration="594000" />
       <workItem from="1534546784803" duration="353000" />
       <workItem from="1534547885788" duration="9908000" />
-      <workItem from="1534793956753" duration="14213000" />
-    </task>
-    <task id="LOCAL-00110" summary="Switch to MediaType">
-      <created>1534692805087</created>
-      <option name="number" value="00110" />
-      <option name="presentableId" value="LOCAL-00110" />
-      <option name="project" value="LOCAL" />
-      <updated>1534692805087</updated>
-    </task>
-    <task id="LOCAL-00111" summary="Change signature of ResponseContext.jsonp">
-      <created>1534693249779</created>
-      <option name="number" value="00111" />
-      <option name="presentableId" value="LOCAL-00111" />
-      <option name="project" value="LOCAL" />
-      <updated>1534693249779</updated>
+      <workItem from="1534793956753" duration="15012000" />
+      <workItem from="1534863259966" duration="198000" />
+      <workItem from="1534873119036" duration="4086000" />
     </task>
     <task id="LOCAL-00112" summary="Changed view engine to use `Map&lt;String, dynamic&gt;`">
       <created>1534693360366</created>
@@ -1063,43 +991,57 @@
       <option name="project" value="LOCAL" />
       <updated>1534819472503</updated>
     </task>
-    <option name="localTasksCounter" value="159" />
+    <task id="LOCAL-00159" summary="Default to const EmptyReflector()">
+      <created>1534861361523</created>
+      <option name="number" value="00159" />
+      <option name="presentableId" value="LOCAL-00159" />
+      <option name="project" value="LOCAL" />
+      <updated>1534861361524</updated>
+    </task>
+    <task id="LOCAL-00160" summary="dart:mirrors is completely gone from Angel">
+      <created>1534861733989</created>
+      <option name="number" value="00160" />
+      <option name="presentableId" value="LOCAL-00160" />
+      <option name="project" value="LOCAL" />
+      <updated>1534861733990</updated>
+    </task>
+    <option name="localTasksCounter" value="161" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 16m 10s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 36m 43s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 17m 32s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 38m 02s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 17m 58s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_encoders_buffer_test_dart - 2018.08.21 at 14h 39m 23s.xml">
+      <configuration name="encoding in encoders_buffer_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 18m 03s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 40m 24s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.07.12 at 11h 18m 30s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_streaming_test_dart - 2018.08.21 at 14h 40m 35s.xml">
+      <configuration name="tests in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_find_one_test_dart - 2018.08.19 at 11h 22m 50s.xml">
-      <configuration name="tests in find_one_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 41m 04s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="All_Tests - 2018.08.20 at 22h 14m 22s.xml">
-      <configuration name="All Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 45m 12s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_accepts_test_dart - 2018.08.20 at 22h 44m 02s.xml">
-      <configuration name="tests in accepts_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 45m 57s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="tests_in_anonymous_service_test_dart - 2018.08.20 at 22h 44m 10s.xml">
-      <configuration name="tests in anonymous_service_test.dart" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="encoding_in_streaming_test_dart - 2018.08.21 at 14h 46m 49s.xml">
+      <configuration name="encoding in streaming_test.dart" configurationId="DartTestRunConfigurationType" />
     </history-entry>
-    <history-entry file="Controller_Tests - 2018.08.20 at 22h 44m 19s.xml">
-      <configuration name="Controller Tests" configurationId="DartTestRunConfigurationType" />
+    <history-entry file="tests_in_framework - 2018.08.21 at 14h 47m 22s.xml">
+      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="186420000" />
+    <option name="totallyTimeSpent" value="191503000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1111,8 +1053,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="80" y="23" width="1342" height="784" extended-state="0" />
-    <editor active="true" />
+    <frame x="94" y="23" width="1342" height="784" extended-state="0" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Tool Output" order="7" />
@@ -1130,14 +1071,13 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.27846155" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.28615385" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
@@ -1150,6 +1090,7 @@
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
     </layout>
@@ -1162,8 +1103,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Completely remove ResponseContext.io" />
-    <MESSAGE value="Rename HTTP request+response impl, drop the &quot;impl&quot;" />
     <MESSAGE value="Make lazy parsing the default" />
     <MESSAGE value="Rename body parsing methods" />
     <MESSAGE value="Update query parsing" />
@@ -1187,7 +1126,9 @@
     <MESSAGE value="Remove ResponseContext.dispose" />
     <MESSAGE value="Remove releaseCOrrespondingRequest" />
     <MESSAGE value="ioc uses executeHandler" />
-    <option name="LAST_COMMIT_MESSAGE" value="ioc uses executeHandler" />
+    <MESSAGE value="Default to const EmptyReflector()" />
+    <MESSAGE value="dart:mirrors is completely gone from Angel" />
+    <option name="LAST_COMMIT_MESSAGE" value="dart:mirrors is completely gone from Angel" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1195,111 +1136,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-268">
-          <caret line="30" column="29" lean-forward="true" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-667">
-          <caret line="48" column="8" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="28" column="28" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/repeat_request_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/controller_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="24" column="40" lean-forward="true" selection-start-line="24" selection-start-column="40" selection-end-line="24" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="9" column="54" lean-forward="true" selection-start-line="9" selection-start-column="54" selection-end-line="9" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.2/lib/src/tuple.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="59" column="11" selection-start-line="59" selection-start-column="11" selection-end-line="59" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/primitives_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/utils.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib/src/media_type.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="45" column="11" selection-start-line="45" selection-start-column="11" selection-end-line="45" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/opt/dart/libexec/lib/collection/list.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="217" column="21" selection-start-line="217" selection-start-column="21" selection-end-line="217" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_route-3.0.0/lib/src/symlink_route.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="859">
-          <caret line="445" column="7" selection-start-line="445" selection-start-column="7" selection-end-line="445" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file:///usr/local/opt/dart/libexec/lib/async/future_impl.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="128" column="17" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/local/opt/dart/libexec/lib/async/zone.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
@@ -1318,9 +1154,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="48">
           <caret line="3" column="14" lean-forward="true" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1346,16 +1179,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="54" column="34" lean-forward="true" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-282">
@@ -1363,13 +1186,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1384,60 +1200,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-42">
-          <caret line="153" column="46" selection-start-line="153" selection-start-column="46" selection-end-line="153" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="181" column="45" selection-start-line="181" selection-start-column="45" selection-end-line="181" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="99" column="68" selection-start-line="99" selection-start-column="68" selection-end-line="99" selection-end-column="68" />
-          <folding>
-            <element signature="e#46#66#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="100" column="75" selection-start-line="100" selection-start-column="75" selection-end-line="100" selection-end-column="75" />
-          <folding>
-            <element signature="e#0#22#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="49" column="29" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="19" column="18" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.2/lib/src/mirrors/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="220">
@@ -1480,23 +1242,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.5/lib/src/reflector.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="430">
@@ -1504,40 +1249,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="25">
-          <caret line="85" column="36" selection-start-line="85" selection-start-column="36" selection-end-line="85" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="244" column="53" selection-start-line="244" selection-start-column="53" selection-end-line="244" selection-end-column="53" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/controller.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="109">
           <caret line="100" column="45" lean-forward="true" selection-start-line="100" selection-start-column="45" selection-end-line="100" selection-end-column="45" />
-          <folding>
-            <element signature="e#42#62#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="261">
-          <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1548,50 +1263,283 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
+        <state relative-caret-position="1152">
+          <caret line="72" column="30" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="30" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+    <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="6" column="27" selection-start-line="6" selection-start-column="27" selection-end-line="6" selection-end-column="27" />
+        <state relative-caret-position="150">
+          <caret line="41" column="67" lean-forward="true" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/extension_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="16" column="33" lean-forward="true" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-602">
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+          <folding>
+            <element signature="e#0#54#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/general_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="239">
+          <caret line="15" column="62" lean-forward="true" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
+          <folding>
+            <element signature="e#0#17#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="21">
+          <caret line="4" column="34" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#1#55#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/_http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="145">
+          <caret line="1010" column="57" lean-forward="true" selection-start-line="1010" selection-start-column="57" selection-end-line="1010" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="70">
+          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/server_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="25" column="22" lean-forward="true" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/parameter_meta_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="163">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
+        <state relative-caret-position="266">
+          <caret line="86" column="66" lean-forward="true" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
           <folding>
             <element signature="e#40#60#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="355" column="11" lean-forward="true" selection-start-line="355" selection-start-column="11" selection-end-line="355" selection-end-column="11" />
+        <state relative-caret-position="114">
+          <caret line="35" column="53" selection-start-line="35" selection-start-column="53" selection-end-line="35" selection-end-column="53" />
           <folding>
-            <element signature="e#38#58#0" expanded="true" />
+            <element signature="e#39#59#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="134">
+          <caret line="17" column="38" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="29">
+          <caret line="136" column="17" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="556">
-            <caret line="66" column="26" selection-start-line="66" selection-start-column="26" selection-end-line="66" selection-end-column="26" />
+          <first_editor relative-caret-position="460">
+            <caret line="63" column="26" lean-forward="true" selection-start-line="63" selection-start-column="26" selection-end-line="63" selection-end-column="26" />
           </first_editor>
           <second_editor />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="528">
+          <caret line="34" column="3" lean-forward="true" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="65">
+          <caret line="100" column="32" selection-start-line="100" selection-start-column="32" selection-end-line="100" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="68" lean-forward="true" selection-start-line="68" selection-end-line="69" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="89" column="23" selection-start-line="89" selection-start-column="23" selection-end-line="89" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="309" column="12" selection-start-line="309" selection-start-column="12" selection-end-line="309" selection-end-column="12" />
+          <folding>
+            <element signature="e#48#68#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/mock_request-1.0.3/lib/src/response.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="89" column="11" selection-start-line="89" selection-start-column="11" selection-end-line="89" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/util.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="181">
+          <caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="249" column="26" selection-start-line="249" selection-start-column="26" selection-end-line="249" selection-end-column="26" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/di_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="24" column="41" lean-forward="true" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="326" column="36" lean-forward="true" selection-start-line="326" selection-start-column="36" selection-end-line="326" selection-end-column="36" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="297">
+          <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="172">
+          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26d2c047..362f4082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@
 * Changed view engine to use `Map<String, dynamic>`.
 * Remove dependency on `package:json_god` by default.
 * Remove dependency on `package:dart2_constant`.
-* Remove `contentType` argument in `ResponseContext.serialize`.
 * Moved `lib/hooks.dart` into `package:angel_hooks`.
 * Moved `TypedService` into `package:angel_typed_service`.
 * Completely removed the `AngelBase` class.
@@ -47,8 +46,6 @@ type-safe manner.
 * Removed `RequestContext.properties`.
 * Removed the defunct `debug` property where it still existed.
 * `Routable.use` now only accepts a `Service`.
-* The above change removes the concept of "nested apps," which are messy to maintain, and
-not very elegant.
 * Removed `Angel.createZoneForRequest`.
 * Removed `Angel.defaultZoneCreator`.
 * Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
@@ -64,4 +61,9 @@ as in many cases it is unnecessary and slows down response time.
 * Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
 * `preInject` now takes a `Reflector` as its second argument.
 * `Angel.reflector` defaults to `const EmptyReflector()`, disabling
-reflection out-of-the-box.
\ No newline at end of file
+reflection out-of-the-box.
+* Removed `Angel.injectEncoders`.
+* Added `Providers.toJson`.
+* Moved `Providers.graphql` to `Providers.graphQL`.
+* `Angel.optimizeForProduction` no longer calls `preInject`,
+as it does not need to.
\ No newline at end of file
diff --git a/README.md b/README.md
index a287997c..9c4cec80 100644
--- a/README.md
+++ b/README.md
@@ -9,38 +9,53 @@ This is the core of the [Angel](https://github.com/angel-dart/angel) framework.
 To build real-world applications, please see the [homepage](https://angel-dart.github.io).
 
 ```dart
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-  var app = new Angel(reflector: MirrorsReflector());
+    var app = new Angel(reflector: MirrorsReflector());
 
-  // Index route. Returns JSON.
-  app.get('/', () => 'Welcome to Angel!');
-
-  // Accepts a URL like /greet/foo or /greet/bob.
-  app.get('/greet/:name', (String name) => 'Hello, $name!');
-
-  // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
-  app.get('/greet', (@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥');
-
-  // Handle any other query value of `name`.
-  app.get('/greet', (@Query('name') String name) => 'Hello, $name!');
-
-  // Simple fallback to throw a 404 on unknown paths.
-  app.use((RequestContext req) async {
-    throw new AngelHttpException.notFound(
-      message: 'Unknown path: "${req.uri.path}"',
+    // Index route. Returns JSON.
+    app.get('/', (req, res) => res.write('Welcome to Angel!'));
+  
+    // Accepts a URL like /greet/foo or /greet/bob.
+    app.get(
+      '/greet/:name',
+      (req, res) {
+        var name = req.params['name'];
+        res
+          ..write('Hello, $name!')
+          ..close();
+      },
     );
-  });
+    
+    // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
+    app.get(
+      '/greet',
+      ioc((@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥'),
+    );
+    
+    // Handle any other query value of `name`.
+    app.get(
+      '/greet',
+      ioc((@Query('name') String name) => 'Hello, $name!'),
+    );
+    
+    // Simple fallback to throw a 404 on unknown paths.
+    app.fallback((req, res) {
+      throw new AngelHttpException.notFound(
+        message: 'Unknown path: "${req.uri.path}"',
+      );
+    });
 
-  var http = new AngelHttp(app);
-  var server = await http.startServer('127.0.0.1', 3000);
-  var url = 'http://${server.address.address}:${server.port}';
-  print('Listening at $url');
-  print('Visit these pages to see Angel in action:');
-  print('* $url/greet/bob');
-  print('* $url/greet/?name=emoji');
-  print('* $url/greet/?name=jack');
-  print('* $url/nonexistent_page');
+    var http = new AngelHttp(app);
+    var server = await http.startServer('127.0.0.1', 3000);
+    var url = 'http://${server.address.address}:${server.port}';
+    print('Listening at $url');
+    print('Visit these pages to see Angel in action:');
+    print('* $url/greet/bob');
+    print('* $url/greet/?name=emoji');
+    print('* $url/greet/?name=jack');
+    print('* $url/nonexistent_page');
 }
 ```
diff --git a/example/handle_error.dart b/example/handle_error.dart
index 1fa5d1bb..2e7fab11 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -9,7 +9,8 @@ main() async {
     ..logger = (new Logger('angel')..onRecord.listen(print))
     ..encoders.addAll({'gzip': gzip.encoder});
 
-  app.fallback((req, res) => new Future.error('Throwing just because I feel like!'));
+  app.fallback(
+      (req, res) => new Future.error('Throwing just because I feel like!'));
 
   var http = new AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 7ef14e78..d9c6a147 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -121,13 +121,14 @@ class HookedService extends Service {
     applyListeners(inner.remove, afterRemoved, true);
   }
 
-  List<RequestHandler> get bootstrappers => new List<RequestHandler>.from(super.bootstrappers)
-    ..add((RequestContext req, ResponseContext res) {
-      req.serviceParams
-        ..['__requestctx'] = req
-        ..['__responsectx'] = res;
-      return true;
-    });
+  List<RequestHandler> get bootstrappers =>
+      new List<RequestHandler>.from(super.bootstrappers)
+        ..add((RequestContext req, ResponseContext res) {
+          req.serviceParams
+            ..['__requestctx'] = req
+            ..['__responsectx'] = res;
+          return true;
+        });
 
   void addRoutes([Service s]) {
     super.addRoutes(s ?? inner);
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 214637b7..aa821151 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -103,7 +103,7 @@ abstract class ResponseContext<RawResponse>
 
     headers["Content-Disposition"] =
         'attachment; filename="${filename ?? file.path}"';
-    headers['content-type'] = lookupMimeType(file.path);
+    contentType = MediaType.parse(lookupMimeType(file.path));
     headers['content-length'] = file.lengthSync().toString();
 
     if (!isBuffered) {
@@ -150,7 +150,7 @@ abstract class ResponseContext<RawResponse>
         new Map<String, dynamic>.from(renderParams)
           ..addAll(data ?? <String, dynamic>{}))).then((content) {
       write(content);
-      headers['content-type'] = 'text/html';
+      contentType = new MediaType('text', 'html');
       close();
     });
   }
@@ -241,8 +241,11 @@ abstract class ResponseContext<RawResponse>
       throw new Exception(
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
-    final head =
-        controller.findExpose(app.container.reflector).path.toString().replaceAll(_straySlashes, '');
+    final head = controller
+        .findExpose(app.container.reflector)
+        .path
+        .toString()
+        .replaceAll(_straySlashes, '');
     final tail = matched
         .makeUri(params.keys.fold<Map<String, dynamic>>({}, (out, k) {
           return out..[k.toString()] = params[k];
@@ -256,14 +259,15 @@ abstract class ResponseContext<RawResponse>
   void sendFile(File file) {
     if (!isOpen) throw closed();
 
-    headers['content-type'] = lookupMimeType(file.path);
+    contentType = MediaType.parse(lookupMimeType(file.path));
     buffer.add(file.readAsBytesSync());
     close();
   }
 
   /// Serializes data to the response.
-  bool serialize(value) {
+  bool serialize(value, {MediaType contentType}) {
     if (!isOpen) throw closed();
+    this.contentType = contentType ?? new MediaType('application', 'json');
     var text = serializer(value);
     if (text.isEmpty) return true;
     write(text);
@@ -274,12 +278,12 @@ abstract class ResponseContext<RawResponse>
   /// Streams a file to this response.
   Future streamFile(File file) {
     if (!isOpen) throw closed();
-    headers['content-type'] = lookupMimeType(file.path);
+    contentType = MediaType.parse(lookupMimeType(file.path));
     return file.openRead().pipe(this);
   }
 
   /// Configure the response to write to an intermediate response buffer, rather than to the stream directly.
-  void enableBuffer();
+  void useBuffer();
 
   /// Adds a stream directly the underlying response.
   ///
@@ -304,10 +308,7 @@ abstract class ResponseContext<RawResponse>
     else if (!isBuffered) {
       add(encoding.encode(value.toString()));
     } else {
-      if (value is List<int>)
-        buffer.add(value);
-      else
-        buffer.add(encoding.encode(value.toString()));
+      buffer.add(encoding.encode(value.toString()));
     }
   }
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 912179d4..700a3285 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -9,6 +9,7 @@ import 'package:angel_container/angel_container.dart';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
+import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
 import 'package:tuple/tuple.dart';
 
@@ -135,7 +136,7 @@ class Angel extends Routable {
       return;
     }
 
-    res.headers['content-type'] = 'text/html';
+    res.contentType = new MediaType('text', 'html', {'charset': 'utf8'});
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
@@ -170,6 +171,12 @@ class Angel extends Routable {
       logger?.warning(
           'This route will be ignored, and no requests will ever reach it.');
     }
+
+    if (router is Angel) {
+      router._parent = this;
+      _children.add(router);
+    }
+
     return super.mount(path.toString(), router);
   }
 
@@ -238,11 +245,6 @@ class Angel extends Routable {
     }
   }
 
-  /// Shortcuts for adding converters to transform the response buffer/stream of any request.
-  void injectEncoders(Map<String, Converter<List<int>, List<int>>> encoders) {
-    this.encoders.addAll(encoders);
-  }
-
   Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
     if (handler is RequestHandler) {
       var result = handler(req, res);
@@ -296,24 +298,7 @@ class Angel extends Routable {
   void optimizeForProduction({bool force: false}) {
     if (isProduction == true || force == true) {
       _isProduction = true;
-      _add(v) {
-        if (v is Function && !_preContained.containsKey(v)) {
-          _preContained[v] = preInject(v, container.reflector);
-        }
-      }
-
-      void _walk(Router router) {
-        router.middleware.forEach(_add);
-        router.routes.forEach((r) {
-          r.handlers.forEach(_add);
-          if (r is SymlinkRoute) _walk(r.router);
-        });
-      }
-
       _flattened ??= flatten(this);
-
-      _walk(_flattened);
-
       logger?.config('Angel is running in production mode.');
     }
   }
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index e157da8f..d243b18c 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -33,11 +33,15 @@ class Providers {
   static const Providers websocket = Providers(viaWebsocket);
 
   /// Represents a request parsed from GraphQL.
-  static const Providers graphql = Providers(viaGraphQL);
+  static const Providers graphQL = Providers(viaGraphQL);
 
   @override
   bool operator ==(other) => other is Providers && other.via == via;
 
+  Map<String, String> toJson() {
+    return {'via': via};
+  }
+
   @override
   String toString() {
     return 'via:$via';
@@ -154,11 +158,13 @@ class Service extends Routable {
     var handlers = new List<RequestHandler>.from(handlerss);
 
     // Add global middleware if declared on the instance itself
-    Middleware before = getAnnotation(service, Middleware, app.container.reflector);
+    Middleware before =
+        getAnnotation(service, Middleware, app.container.reflector);
 
     if (before != null) handlers.addAll(before.handlers);
 
-    Middleware indexMiddleware = getAnnotation(service.index, Middleware, app.container.reflector);
+    Middleware indexMiddleware =
+        getAnnotation(service.index, Middleware, app.container.reflector);
     get('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.index(mergeMap([
@@ -172,7 +178,8 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
-    Middleware createMiddleware = getAnnotation(service.create, Middleware, app.container.reflector);
+    Middleware createMiddleware =
+        getAnnotation(service.create, Middleware, app.container.reflector);
     post('/', (req, ResponseContext res) {
       return req.parseQuery().then((query) {
         return req.parseBody().then((body) {
@@ -196,7 +203,8 @@ class Service extends Routable {
           ..addAll(
               (createMiddleware == null) ? [] : createMiddleware.handlers));
 
-    Middleware readMiddleware = getAnnotation(service.read, Middleware, app.container.reflector);
+    Middleware readMiddleware =
+        getAnnotation(service.read, Middleware, app.container.reflector);
 
     get('/:id', (req, res) {
       return req.parseQuery().then((query) {
@@ -213,7 +221,8 @@ class Service extends Routable {
           ..addAll(handlers)
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
-    Middleware modifyMiddleware = getAnnotation(service.modify, Middleware, app.container.reflector);
+    Middleware modifyMiddleware =
+        getAnnotation(service.modify, Middleware, app.container.reflector);
     patch(
         '/:id',
         (req, res) => req.parseBody().then((body) {
@@ -233,7 +242,8 @@ class Service extends Routable {
           ..addAll(
               (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
-    Middleware updateMiddleware = getAnnotation(service.update, Middleware, app.container.reflector);
+    Middleware updateMiddleware =
+        getAnnotation(service.update, Middleware, app.container.reflector);
     post(
         '/:id',
         (req, res) => req.parseBody().then((body) {
@@ -271,7 +281,8 @@ class Service extends Routable {
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
-    Middleware removeMiddleware = getAnnotation(service.remove, Middleware, app.container.reflector);
+    Middleware removeMiddleware =
+        getAnnotation(service.remove, Middleware, app.container.reflector);
     delete('/', (req, res) {
       return req.parseQuery().then((query) {
         return this.remove(
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index e69de29b..8b137891 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -0,0 +1 @@
+
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 0dfedcbc..5623d6fe 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -147,11 +147,13 @@ class AngelHttp {
             if (handler == null) break;
 
             if (runPipeline == null)
-              runPipeline = () => Future.sync(() => handler(req, res));
+              runPipeline = () =>
+                  Future.sync(() => app.executeHandler(handler, req, res));
             else {
               var current = runPipeline;
-              runPipeline = () => current().then((result) =>
-                  !res.isOpen ? new Future.value(result) : handler(req, res));
+              runPipeline = () => current().then((result) => !res.isOpen
+                  ? new Future.value(result)
+                  : app.executeHandler(handler, req, res));
             }
           }
 
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 6920e939..4d6f71a4 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -45,9 +45,8 @@ class Controller {
     var routable = new Routable();
     app.mount(exposeDecl.path, routable);
     var typeMirror = app.container.reflector.reflectType(this.runtimeType);
-    String name = exposeDecl.as?.isNotEmpty == true
-        ? exposeDecl.as
-        : typeMirror.name;
+    String name =
+        exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name;
 
     app.controllers[name] = this;
 
@@ -85,9 +84,8 @@ class Controller {
         var middleware = <RequestHandler>[]
           ..addAll(handlers)
           ..addAll(exposeDecl.middleware);
-        String name = exposeDecl.as?.isNotEmpty == true
-            ? exposeDecl.as
-            : methodName;
+        String name =
+            exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : methodName;
 
         // Check if normal
         var method = decl.function;
@@ -120,7 +118,8 @@ class Controller {
   void configureRoutes(Routable routable) {}
 
   /// Finds the [Expose] declaration for this class.
-  Expose findExpose(Reflector reflector) => reflector.reflectClass(runtimeType)
+  Expose findExpose(Reflector reflector) => reflector
+      .reflectClass(runtimeType)
       .annotations
       .map((m) => m.reflectee)
       .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index c2e263c5..44e5ec9f 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -42,10 +42,26 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   }
 
   @override
-  void enableBuffer() {
+  void useBuffer() {
     _buffer = new LockableBytesBuilder();
   }
 
+  Iterable<String> __allowedEncodings;
+
+  Iterable<String> get _allowedEncodings {
+    return __allowedEncodings ??= correspondingRequest.headers
+        .value('accept-encoding')
+        ?.split(',')
+        ?.map((s) => s.trim())
+        ?.where((s) => s.isNotEmpty)
+        ?.map((str) {
+      // Ignore quality specifications in accept-encoding
+      // ex. gzip;q=0.8
+      if (!str.contains(';')) return str;
+      return str.split(';')[0];
+    });
+  }
+
   bool _openStream() {
     if (!_streamInitialized) {
       // If this is the first stream added to this response,
@@ -54,6 +70,31 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
         ..statusCode = statusCode
         ..cookies.addAll(cookies);
       headers.forEach(rawResponse.headers.set);
+      rawResponse.headers.contentType = new ContentType(
+          contentType.type, contentType.subtype,
+          charset: contentType.parameters['charset'],
+          parameters: contentType.parameters);
+
+      if (encoders.isNotEmpty && correspondingRequest != null) {
+        if (_allowedEncodings != null) {
+          for (var encodingName in _allowedEncodings) {
+            Converter<List<int>, List<int>> encoder;
+            String key = encodingName;
+
+            if (encoders.containsKey(encodingName))
+              encoder = encoders[encodingName];
+            else if (encodingName == '*') {
+              encoder = encoders[key = encoders.keys.first];
+            }
+
+            if (encoder != null) {
+              rawResponse.headers.set('content-encoding', key);
+              break;
+            }
+          }
+        }
+      }
+
       //_isClosed = true;
       return _streamInitialized = true;
     }
@@ -64,25 +105,13 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   @override
   Future addStream(Stream<List<int>> stream) {
     if (_isClosed && isBuffered) throw ResponseContext.closed();
-    var firstStream = _openStream();
+    _openStream();
 
     Stream<List<int>> output = stream;
 
     if (encoders.isNotEmpty && correspondingRequest != null) {
-      var allowedEncodings = correspondingRequest.headers
-          .value('accept-encoding')
-          ?.split(',')
-          ?.map((s) => s.trim())
-          ?.where((s) => s.isNotEmpty)
-          ?.map((str) {
-        // Ignore quality specifications in accept-encoding
-        // ex. gzip;q=0.8
-        if (!str.contains(';')) return str;
-        return str.split(';')[0];
-      });
-
-      if (allowedEncodings != null) {
-        for (var encodingName in allowedEncodings) {
+      if (_allowedEncodings != null) {
+        for (var encodingName in _allowedEncodings) {
           Converter<List<int>, List<int>> encoder;
           String key = encodingName;
 
@@ -93,10 +122,6 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
           }
 
           if (encoder != null) {
-            if (firstStream) {
-              rawResponse.headers.set('content-encoding', key);
-            }
-
             output = encoders[key].bind(output);
             break;
           }
@@ -113,6 +138,27 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
       throw ResponseContext.closed();
     else if (!isBuffered) {
       _openStream();
+
+      if (encoders.isNotEmpty && correspondingRequest != null) {
+        if (_allowedEncodings != null) {
+          for (var encodingName in _allowedEncodings) {
+            Converter<List<int>, List<int>> encoder;
+            String key = encodingName;
+
+            if (encoders.containsKey(encodingName))
+              encoder = encoders[encodingName];
+            else if (encodingName == '*') {
+              encoder = encoders[key = encoders.keys.first];
+            }
+
+            if (encoder != null) {
+              data = encoders[key].convert(data);
+              break;
+            }
+          }
+        }
+      }
+
       rawResponse.add(data);
     } else
       buffer.add(data);
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 077551c2..e3537a22 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -4,10 +4,11 @@ final RegExp straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 matchingAnnotation(List<ReflectedInstance> metadata, Type T) {
   for (ReflectedInstance metaDatum in metadata) {
-    if (metaDatum.type == T) {
+    if (metaDatum.type.reflectedType == T) {
       return metaDatum.reflectee;
     }
   }
+
   return null;
 }
 
diff --git a/test/common.dart b/test/common.dart
index 1c0b4a3b..0e028dcb 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -8,6 +8,13 @@ class Todo extends Model {
   String over;
 
   Todo({String this.text, String this.over});
+
+  Map<String, dynamic> toJson() {
+    return {
+      'text': text,
+      'over': over,
+    };
+  }
 }
 
 class BookService extends Service {
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 05d7070e..66732c7a 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io' show BytesBuilder;
+import 'dart:io';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
-import 'dart:io';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
@@ -19,7 +20,7 @@ main() {
 
   setUp(() {
     app = new Angel(reflector: MirrorsReflector());
-    app.injectEncoders(
+    app.encoders.addAll(
       {
         'deflate': zlib.encoder,
         'gzip': gzip.encoder,
@@ -27,7 +28,9 @@ main() {
     );
 
     app.get('/hello', (req, res) {
-      res.write('Hello, world!');
+      res
+        ..useBuffer()
+        ..write('Hello, world!');
     });
   });
 
@@ -63,6 +66,7 @@ void encodingTests(Angel getApp()) {
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
+      print(rs.headers);
       expect(rs.headers.value('content-encoding'), 'deflate');
       expect(body, zlib.encode(utf8.encode('Hello, world!')));
     });
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 2a767f56..e4a6ea4f 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -18,10 +18,7 @@ Future printResponse(MockHttpResponse rs) {
 }
 
 void main() {
-  group('parameter_meta', parameterMetaTests,
-      skip: !Platform.version.contains('2.0.0')
-          ? null
-          : 'Blocked on https://github.com/dart-lang/sdk/issues/33774');
+  group('parameter_meta', parameterMetaTests);
 }
 
 parameterMetaTests() {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 3488ab8d..22d38e79 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -12,7 +12,7 @@ main() {
       ..get('/foo', ioc(echoAppFoo));
     app.optimizeForProduction(force: true);
     print(app.preContained);
-    expect(app.preContained, contains(echoAppFoo));
+    expect(app.preContained.keys, contains(echoAppFoo));
 
     var rq = new MockHttpRequest('GET', new Uri(path: '/foo'));
     rq.close();
@@ -20,7 +20,7 @@ main() {
     var rs = rq.response;
     var body = await rs.transform(utf8.decoder).join();
     expect(body, json.encode('bar'));
-  });
+  }, skip: 'Angel no longer has to preinject functions');
 }
 
 echoAppFoo(String foo) => foo;
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 3edb1f46..b841fd10 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -99,7 +99,7 @@ main() {
     }
 
     app.chain([write('a')]).chain([write('b'), write('c')]).get(
-        '/chained', (req, res) => false);
+        '/chained', (req, res) => res.close());
 
     app.fallback((req, res) => 'MJ');
 
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index c8776e4d..a800dc05 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -16,8 +16,8 @@ main() {
     app = new Angel(reflector: MirrorsReflector())
       ..get('/foo', ioc(() => {'hello': 'world'}))
       ..get('/bar', (req, res) async {
-        res.contentType = new MediaType('text', 'html');
-        await res.serialize({'hello': 'world'});
+        await res.serialize({'hello': 'world'},
+            contentType: new MediaType('text', 'html'));
       });
     client = new http.Client();
 
diff --git a/test/server_test.dart b/test/server_test.dart
index b27c0d42..a084f2aa 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -145,7 +145,7 @@ main() {
       });
 
       test('end response', () async {
-        var handler = (req, res) => res.end();
+        var handler = (req, ResponseContext res) => res.close();
         expect(await app.executeHandler(handler, req, res), isFalse);
       });
     });
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index c45bf663..471c2283 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -17,7 +17,7 @@ main() {
 
   setUp(() {
     app = new Angel(reflector: MirrorsReflector());
-    http = new AngelHttp(app);
+    http = new AngelHttp(app, useZone: true);
 
     app.logger = new Logger('streaming_test')
       ..onRecord.listen((rec) {
@@ -25,15 +25,16 @@ main() {
         if (rec.stackTrace != null) print(rec.stackTrace);
       });
 
-    app.injectEncoders(
+    app.encoders.addAll(
       {
         'deflate': zlib.encoder,
         'gzip': gzip.encoder,
       },
     );
 
-    app.get('/hello', (req,  res) {
-      new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]).pipe(res);
+    app.get('/hello', (req, res) {
+      return new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+          .pipe(res);
     });
 
     app.get('/write', (req, res) async {
@@ -56,13 +57,12 @@ main() {
       await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
 
-      try {
-        await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
-            .pipe(res);
-        throw new Exception('Should throw on rewrite...');
-      } on StateError {
-        // Yay!!!
-      }
+      var f = new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+          .pipe(res)
+          .then((_) => false)
+          .catchError((_) => true);
+
+      expect(f, completion(true));
     });
 
     app.get('/error', (req, res) => res.addError(new StateError('wtf')));
@@ -86,12 +86,16 @@ main() {
   test('multiple addStream', () => _expectHelloBye('/multiple'));
 
   test('cannot write after close', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
-    await http.handleRequest(rq);
-    var body = await rq.response.transform(utf8.decoder).join();
+    try {
+      var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
+      await http.handleRequest(rq);
+      var body = await rq.response.transform(utf8.decoder).join();
 
-    if (rq.response.statusCode != 32)
-      throw 'overwrite should throw error; response: $body';
+      if (rq.response.statusCode != 32)
+        throw 'overwrite should throw error; response: $body';
+    } on StateError {
+      // Success
+    }
   });
 
   test('res => addError', () async {
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
index 0b304061..177fb63f 100644
--- a/test/view_generator_test.dart
+++ b/test/view_generator_test.dart
@@ -1,10 +1,9 @@
-import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:test/test.dart';
 
 main() {
   test('default view generator', () async {
-    var app = new Angel(reflector: MirrorsReflector());
+    var app = new Angel();
     var view = await app.viewGenerator('foo', {'bar': 'baz'});
     expect(view, contains('No view engine'));
   });

From 7e29d1519cbe5f765689d6663cc83bb20da55ea0 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 21 Aug 2018 14:52:09 -0400
Subject: [PATCH 283/414] CHANGELOG + bump to 2.0.0-alpha.1

---
 CHANGELOG.md | 15 +++++++++------
 pubspec.yaml |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 362f4082..ba970cfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 2.0.0-alpha.1
+* Removed `Angel.injectEncoders`.
+* Added `Providers.toJson`.
+* Moved `Providers.graphql` to `Providers.graphQL`.
+* `Angel.optimizeForProduction` no longer calls `preInject`,
+as it does not need to.
+* Rename `ResponseContext.enableBuffer` to `ResponseContext.useBuffer`.
+
 # 2.0.0-alpha
 * Removed `random_string` dependency.
 * Moved reflection to `package:angel_container`.
@@ -61,9 +69,4 @@ as in many cases it is unnecessary and slows down response time.
 * Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
 * `preInject` now takes a `Reflector` as its second argument.
 * `Angel.reflector` defaults to `const EmptyReflector()`, disabling
-reflection out-of-the-box.
-* Removed `Angel.injectEncoders`.
-* Added `Providers.toJson`.
-* Moved `Providers.graphql` to `Providers.graphQL`.
-* `Angel.optimizeForProduction` no longer calls `preInject`,
-as it does not need to.
\ No newline at end of file
+reflection out-of-the-box.
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index ca44a078..4a2c3835 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha
+version: 2.0.0-alpha.1
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From ed5632d11f9a54d19a768ccb9ebf503a3b019bbc Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 28 Aug 2018 09:44:58 -0400
Subject: [PATCH 284/414] CHANGELOG

---
 .idea/workspace.xml | 235 +++++++++++++++++++-------------------------
 CHANGELOG.md        |   3 +
 2 files changed, 103 insertions(+), 135 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ecb94876..1cd76c64 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,27 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/encoding_in_streaming_test_dart.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/metadata_in_hooked_test_dart.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/server.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/server.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/angel_http.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/angel_http.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/http/http_response_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/util.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/common.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/common.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/encoders_buffer_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/encoders_buffer_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/parameter_meta_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/parameter_meta_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/precontained_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/precontained_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/routing_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/routing_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/serialize_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/serialize_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/server_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/server_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/streaming_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/streaming_test.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/view_generator_test.dart" beforeDir="false" afterPath="$PROJECT_DIR$/test/view_generator_test.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -45,56 +25,29 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="angel_http.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="326" column="36" lean-forward="true" selection-start-line="326" selection-start-column="36" selection-end-line="326" selection-end-column="36" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="187">
+                <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
+                <folding>
+                  <element signature="e#0#54#0" expanded="true" />
+                </folding>
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="di_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/di_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="24" column="41" lean-forward="true" selection-start-line="24" selection-start-column="41" selection-end-line="24" selection-end-column="41" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="encoders_buffer_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/encoders_buffer_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
-              <caret line="41" column="11" lean-forward="true" selection-start-line="41" selection-start-column="11" selection-end-line="41" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="streaming_test.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test/streaming_test.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="172">
-              <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="http_response_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="129">
-              <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="96">
+                <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
@@ -196,7 +149,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/example/hm.dart" />
         <option value="$PROJECT_DIR$/test/hm.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
@@ -211,7 +163,6 @@
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
@@ -239,7 +190,6 @@
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
-        <option value="$PROJECT_DIR$/CHANGELOG.md" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
@@ -247,6 +197,9 @@
         <option value="$PROJECT_DIR$/lib/src/http/angel_http.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
   </component>
@@ -287,6 +240,11 @@
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="example" type="cbb8eebc:String" user="example" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -660,21 +618,7 @@
       <workItem from="1534547885788" duration="9908000" />
       <workItem from="1534793956753" duration="15012000" />
       <workItem from="1534863259966" duration="198000" />
-      <workItem from="1534873119036" duration="4086000" />
-    </task>
-    <task id="LOCAL-00112" summary="Changed view engine to use `Map&lt;String, dynamic&gt;`">
-      <created>1534693360366</created>
-      <option name="number" value="00112" />
-      <option name="presentableId" value="LOCAL-00112" />
-      <option name="project" value="LOCAL" />
-      <updated>1534693360366</updated>
-    </task>
-    <task id="LOCAL-00113" summary="Strip out json god">
-      <created>1534693773968</created>
-      <option name="number" value="00113" />
-      <option name="presentableId" value="LOCAL-00113" />
-      <option name="project" value="LOCAL" />
-      <updated>1534693773968</updated>
+      <workItem from="1534873119036" duration="4624000" />
     </task>
     <task id="LOCAL-00114" summary="Remove traces of json_god">
       <created>1534732268467</created>
@@ -1005,13 +949,24 @@
       <option name="project" value="LOCAL" />
       <updated>1534861733990</updated>
     </task>
-    <option name="localTasksCounter" value="161" />
+    <task id="LOCAL-00161" summary="All tests pass">
+      <created>1534877443455</created>
+      <option name="number" value="00161" />
+      <option name="presentableId" value="LOCAL-00161" />
+      <option name="project" value="LOCAL" />
+      <updated>1534877443455</updated>
+    </task>
+    <task id="LOCAL-00162" summary="CHANGELOG + bump to 2.0.0-alpha.1">
+      <created>1534877529522</created>
+      <option name="number" value="00162" />
+      <option name="presentableId" value="LOCAL-00162" />
+      <option name="project" value="LOCAL" />
+      <updated>1534877529522</updated>
+    </task>
+    <option name="localTasksCounter" value="163" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="tests_in_framework - 2018.08.21 at 14h 36m 43s.xml">
-      <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
-    </history-entry>
     <history-entry file="tests_in_framework - 2018.08.21 at 14h 38m 02s.xml">
       <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
@@ -1039,9 +994,12 @@
     <history-entry file="tests_in_framework - 2018.08.21 at 14h 47m 22s.xml">
       <configuration name="tests in framework" configurationId="DartTestRunConfigurationType" />
     </history-entry>
+    <history-entry file="tests_in_framework_(PRODUCTION) - 2018.08.21 at 14h 48m 10s.xml">
+      <configuration name="tests in framework (PRODUCTION)" configurationId="DartTestRunConfigurationType" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="191503000" />
+    <option name="totallyTimeSpent" value="192041000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1054,6 +1012,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="94" y="23" width="1342" height="784" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="Tool Output" order="7" />
@@ -1071,11 +1030,12 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4964476" visible="true" weight="0.3973799" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
       <window_info content_ui="combo" id="Project" order="0" weight="0.28615385" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
@@ -1090,7 +1050,6 @@
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
     </layout>
@@ -1103,8 +1062,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Make lazy parsing the default" />
-    <MESSAGE value="Rename body parsing methods" />
     <MESSAGE value="Update query parsing" />
     <MESSAGE value="Update CHANGELOG" />
     <MESSAGE value="Remove req.injections" />
@@ -1128,7 +1085,9 @@
     <MESSAGE value="ioc uses executeHandler" />
     <MESSAGE value="Default to const EmptyReflector()" />
     <MESSAGE value="dart:mirrors is completely gone from Angel" />
-    <option name="LAST_COMMIT_MESSAGE" value="dart:mirrors is completely gone from Angel" />
+    <MESSAGE value="All tests pass" />
+    <MESSAGE value="CHANGELOG + bump to 2.0.0-alpha.1" />
+    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG + bump to 2.0.0-alpha.1" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1136,13 +1095,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/local/opt/dart/libexec/lib/async/zone.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="1378" column="53" selection-start-line="1378" selection-start-column="53" selection-end-line="1378" selection-end-column="53" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1322,13 +1274,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="4" column="34" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -1352,16 +1297,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="70">
-          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/server_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="193">
@@ -1417,16 +1352,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="460">
-            <caret line="63" column="26" lean-forward="true" selection-start-line="63" selection-start-column="26" selection-end-line="63" selection-end-column="26" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/metadata.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="16">
@@ -1496,13 +1421,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="128">
+          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
         </state>
       </provider>
     </entry>
@@ -1513,10 +1435,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/example/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/http/angel_http.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
-          <caret line="326" column="36" lean-forward="true" selection-start-line="326" selection-start-column="36" selection-end-line="326" selection-end-column="36" />
+          <caret line="328" column="36" lean-forward="true" selection-start-line="328" selection-start-column="36" selection-end-line="328" selection-end-column="36" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
@@ -1540,6 +1472,39 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/http/http_response_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="96">
+            <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="187">
+            <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
+            <folding>
+              <element signature="e#0#54#0" expanded="true" />
+            </folding>
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba970cfa..d69f3267 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.2
+* Added `ResponseContext.detach`.
+
 # 2.0.0-alpha.1
 * Removed `Angel.injectEncoders`.
 * Added `Providers.toJson`.

From fdd1ca16c959eed7614253accc6f8772c8d32331 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 28 Aug 2018 09:47:03 -0400
Subject: [PATCH 285/414] Added ResponseContext.detach

---
 lib/src/core/response_context.dart | 6 ++++++
 test/parameter_meta_test.dart      | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index aa821151..23cd1e7f 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -91,6 +91,12 @@ abstract class ResponseContext<RawResponse>
   /// The underlying [RawResponse] under this instance.
   RawResponse get rawResponse;
 
+  /// Signals Angel that the response is being held alive deliberately, and that the framework should not automatically close it.
+  /// 
+  /// This is mostly used in situations like WebSocket handlers, where the connection should remain
+  /// open indefinitely.
+  RawResponse detach();
+
   /// Gets or sets the content type to send back to a client.
   MediaType contentType = new MediaType('text', 'plain');
 
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index e4a6ea4f..faa6e4b4 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';

From be521dcd7fe9cb45f9fbb03827213e06a9888481 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 28 Aug 2018 09:48:55 -0400
Subject: [PATCH 286/414] Added HttpResponseContext.detach

---
 lib/src/http/http_response_context.dart | 34 +++++++++++++++----------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 44e5ec9f..31b8b5dc 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -15,10 +15,16 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   LockableBytesBuilder _buffer;
 
   final HttpRequestContext _correspondingRequest;
-  bool _isClosed = false, _streamInitialized = false;
+  bool _detached = false, _isClosed = false, _streamInitialized = false;
 
   HttpResponseContext(this.rawResponse, this.app, [this._correspondingRequest]);
 
+  @override
+  HttpResponse detach() {
+    _detached = true;
+    return rawResponse;
+  }
+
   @override
   RequestContext get correspondingRequest {
     return _correspondingRequest;
@@ -166,22 +172,24 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   Future close() {
-    if (!_isClosed) {
-      if (!isBuffered) {
-        try {
-          rawResponse.close();
-        } catch (_) {
-          // This only seems to occur on `MockHttpRequest`, but
-          // this try/catch prevents a crash.
+    if (!_detached) {
+      if (!_isClosed) {
+        if (!isBuffered) {
+          try {
+            rawResponse.close();
+          } catch (_) {
+            // This only seems to occur on `MockHttpRequest`, but
+            // this try/catch prevents a crash.
+          }
+        } else {
+          _buffer.lock();
         }
-      } else {
-        _buffer.lock();
+
+        _isClosed = true;
       }
 
-      _isClosed = true;
+      super.close();
     }
-
-    super.close();
     return new Future.value();
   }
 }

From a212bab74ffe5e0090f391ed88f9806aea906089 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 28 Aug 2018 09:55:39 -0400
Subject: [PATCH 287/414] Response detachment test

---
 lib/src/core/response_context.dart      |  9 ++++---
 lib/src/http/http_response_context.dart |  8 +++---
 test/detach_test.dart                   | 34 +++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 test/detach_test.dart

diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 23cd1e7f..e7806b06 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -79,7 +79,10 @@ abstract class ResponseContext<RawResponse>
       _statusCode = value ?? 200;
   }
 
-  /// Can we still write to this response?
+  /// Returns `true` if the response is still available for processing by Angel.
+  /// 
+  /// If it is `false`, then Angel will stop executing handlers, and will only run
+  /// response finalizers if the response [isBuffered].
   bool get isOpen;
 
   /// Returns `true` if response data is being written to a buffer, rather than to the underlying stream.
@@ -92,10 +95,10 @@ abstract class ResponseContext<RawResponse>
   RawResponse get rawResponse;
 
   /// Signals Angel that the response is being held alive deliberately, and that the framework should not automatically close it.
-  /// 
+  ///
   /// This is mostly used in situations like WebSocket handlers, where the connection should remain
   /// open indefinitely.
-  RawResponse detach();
+  FutureOr<RawResponse> detach();
 
   /// Gets or sets the content type to send back to a client.
   MediaType contentType = new MediaType('text', 'plain');
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 31b8b5dc..4438282f 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -15,13 +15,13 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   LockableBytesBuilder _buffer;
 
   final HttpRequestContext _correspondingRequest;
-  bool _detached = false, _isClosed = false, _streamInitialized = false;
+  bool _isDetached = false, _isClosed = false, _streamInitialized = false;
 
   HttpResponseContext(this.rawResponse, this.app, [this._correspondingRequest]);
 
   @override
   HttpResponse detach() {
-    _detached = true;
+    _isDetached = true;
     return rawResponse;
   }
 
@@ -32,7 +32,7 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   bool get isOpen {
-    return !_isClosed;
+    return !_isClosed && !_isDetached;
   }
 
   @override
@@ -172,7 +172,7 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   Future close() {
-    if (!_detached) {
+    if (!_isDetached) {
       if (!_isClosed) {
         if (!isBuffered) {
           try {
diff --git a/test/detach_test.dart b/test/detach_test.dart
new file mode 100644
index 00000000..eaa600d0
--- /dev/null
+++ b/test/detach_test.dart
@@ -0,0 +1,34 @@
+import 'dart:convert';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+void main() {
+  AngelHttp http;
+
+  setUp(() async {
+    var app = new Angel();
+    http = new AngelHttp(app);
+
+    app.get('/detach', (req, res) async {
+      if (res is HttpResponseContext) {
+        var io = await res.detach();
+        io
+          ..write('Hey!')
+          ..close();
+      } else {
+        throw new StateError('This endpoint only supports HTTP/1.1.');
+      }
+    });
+  });
+
+  tearDown(() => http.close());
+
+  test('detach response', () async {
+    var rq = new MockHttpRequest('GET', Uri.parse('/detach'))..close();
+    var rs = rq.response;
+    await http.handleRequest(rq);
+    var body = await rs.transform(utf8.decoder).join();
+    expect(body, 'Hey!');
+  });
+}

From c6fe31310af6e351a7006e3d31fc0167e730dbec Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 28 Aug 2018 09:55:51 -0400
Subject: [PATCH 288/414] Formatting

---
 lib/src/core/response_context.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index e7806b06..9c0dd52f 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -80,7 +80,7 @@ abstract class ResponseContext<RawResponse>
   }
 
   /// Returns `true` if the response is still available for processing by Angel.
-  /// 
+  ///
   /// If it is `false`, then Angel will stop executing handlers, and will only run
   /// response finalizers if the response [isBuffered].
   bool get isOpen;

From ae5acd1a9c7993e01e5e611b78ef748bf7721e33 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 28 Aug 2018 09:57:51 -0400
Subject: [PATCH 289/414] Bump to 2.0.0-alpha.2

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 4a2c3835..f41c6294 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.1
+version: 2.0.0-alpha.2
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From 20c6aedaa3d64f5054617e9ab1603eeda44de841 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 11 Sep 2018 16:14:31 -0400
Subject: [PATCH 290/414] Add <Id, Data>

---
 lib/src/core/service.dart | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index d243b18c..5aaf4149 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -51,7 +51,7 @@ class Providers {
 /// A front-facing interface that can present data to and operate on data on behalf of the user.
 ///
 /// Heavily inspired by FeathersJS. <3
-class Service extends Routable {
+class Service<Id, Data> extends Routable {
   /// A [List] of keys that services should ignore, should they see them in the query.
   static const List<String> specialQueryKeys = <String>[
     r'$limit',
@@ -102,27 +102,27 @@ class Service extends Routable {
   }
 
   /// Retrieves the desired resource.
-  Future read(id, [Map params]) {
+  Future read(Id id, [Map params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Creates a resource.
-  Future create(data, [Map params]) {
+  Future create(Data data, [Map params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Modifies a resource.
-  Future modify(id, data, [Map params]) {
+  Future modify(Id id, Data data, [Map params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Overwrites a resource.
-  Future update(id, data, [Map params]) {
+  Future update(Id id, Data data, [Map params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Removes the given resource.
-  Future remove(id, [Map params]) {
+  Future remove(Id id, [Map params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
@@ -185,7 +185,7 @@ class Service extends Routable {
         return req.parseBody().then((body) {
           return this
               .create(
-                  body,
+                  body as Data,
                   mergeMap([
                     {'query': query},
                     restProvider,
@@ -229,7 +229,7 @@ class Service extends Routable {
               return req.parseQuery().then((query) {
                 return this.modify(
                     parseId(req.params['id']),
-                    body,
+                    body as Data,
                     mergeMap([
                       {'query': query},
                       restProvider,
@@ -250,7 +250,7 @@ class Service extends Routable {
               return req.parseQuery().then((query) {
                 return this.update(
                     parseId(req.params['id']),
-                    body,
+                    body as Data,
                     mergeMap([
                       {'query': query},
                       restProvider,
@@ -268,7 +268,7 @@ class Service extends Routable {
               return req.parseQuery().then((query) {
                 return this.update(
                     parseId(req.params['id']),
-                    body,
+                    body as Data,
                     mergeMap([
                       {'query': query},
                       restProvider,

From 7e2afed8534f3b277dfa6d0130ebe300cf4a2874 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 11 Sep 2018 16:25:07 -0400
Subject: [PATCH 291/414] Added generic to Routable.use

---
 .idea/workspace.xml                 | 254 ++++++++++++++--------------
 CHANGELOG.md                        |   4 +
 lib/src/core/anonymous_service.dart |  42 ++---
 lib/src/core/hooked_service.dart    |  24 +--
 lib/src/core/map_service.dart       |  37 ++--
 lib/src/core/request_context.dart   |   2 +-
 lib/src/core/routable.dart          |   5 +-
 lib/src/core/server.dart            |   3 +-
 lib/src/core/service.dart           |  14 +-
 9 files changed, 198 insertions(+), 187 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1cd76c64..1ce67e48 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -25,27 +30,57 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/README.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="187">
+              <first_editor relative-caret-position="124">
                 <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
-                <folding>
-                  <element signature="e#0#54#0" expanded="true" />
-                </folding>
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="false">
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="181">
+              <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
+              <folding>
+                <element signature="e#39#59#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="149">
+              <caret line="29" column="28" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
+              <folding>
+                <element signature="e#47#67#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="96">
-                <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
+              <first_editor relative-caret-position="32">
+                <caret line="2" column="95" selection-start-line="2" selection-start-column="95" selection-end-line="2" selection-end-column="95" />
               </first_editor>
               <second_editor />
             </state>
@@ -64,7 +99,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>sto</find>
       <find>sopw</find>
       <find>stopw</find>
       <find>release</find>
@@ -94,6 +128,7 @@
       <find>Middleware</find>
       <find>/meta</find>
       <find>complet</find>
+      <find>parseI</find>
     </findStrings>
     <replaceStrings>
       <replace>FutureOr</replace>
@@ -150,9 +185,7 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/test/hm.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/test/find_one_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/test/extension_test.dart" />
         <option value="$PROJECT_DIR$/test/accepts_test.dart" />
         <option value="$PROJECT_DIR$/example/templating.dart" />
@@ -174,18 +207,15 @@
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.3/lib/src/mirrors/reflector.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
         <option value="$PROJECT_DIR$/example/main.dart" />
         <option value="$PROJECT_DIR$/test/view_generator_test.dart" />
         <option value="$PROJECT_DIR$/test/common.dart" />
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
@@ -199,6 +229,11 @@
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -232,7 +267,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <expand>
@@ -256,6 +290,13 @@
               <item name="lib" type="cbb8eebc:String" user="lib" />
               <item name="src" type="cbb8eebc:String" user="src" />
             </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="core" type="cbb8eebc:String" user="core" />
+            </path>
             <path>
               <item name="Root" type="cbb8eebc:String" user="Root" />
               <item name="framework" type="cbb8eebc:String" user="framework" />
@@ -272,6 +313,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane" />
       <pane id="AndroidView" />
     </panes>
@@ -465,6 +507,7 @@
       <envs />
     </configuration>
     <list>
+      <item itemvalue="Dart Command Line App.All Tests (PRODUCTION)" />
       <item itemvalue="Dart Command Line App.performance::hello (DEV)" />
       <item itemvalue="Dart Command Line App.performance::hello (PRODUCTION)" />
       <item itemvalue="Dart Command Line App.All Tests (for coverage)" />
@@ -619,13 +662,7 @@
       <workItem from="1534793956753" duration="15012000" />
       <workItem from="1534863259966" duration="198000" />
       <workItem from="1534873119036" duration="4624000" />
-    </task>
-    <task id="LOCAL-00114" summary="Remove traces of json_god">
-      <created>1534732268467</created>
-      <option name="number" value="00114" />
-      <option name="presentableId" value="LOCAL-00114" />
-      <option name="project" value="LOCAL" />
-      <updated>1534732268467</updated>
+      <workItem from="1536696642254" duration="760000" />
     </task>
     <task id="LOCAL-00115" summary="Remove lib/hooks.dart">
       <created>1534732365272</created>
@@ -963,7 +1000,14 @@
       <option name="project" value="LOCAL" />
       <updated>1534877529522</updated>
     </task>
-    <option name="localTasksCounter" value="163" />
+    <task id="LOCAL-00163" summary="Add &lt;Id, Data&gt;">
+      <created>1536696871863</created>
+      <option name="number" value="00163" />
+      <option name="presentableId" value="LOCAL-00163" />
+      <option name="project" value="LOCAL" />
+      <updated>1536696871864</updated>
+    </task>
+    <option name="localTasksCounter" value="164" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -999,7 +1043,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="192041000" />
+    <option name="totallyTimeSpent" value="192801000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1030,15 +1074,13 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
+      <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
       <window_info content_ui="combo" id="Project" order="0" weight="0.28615385" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1049,7 +1091,9 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
     </layout>
@@ -1062,7 +1106,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Update query parsing" />
     <MESSAGE value="Update CHANGELOG" />
     <MESSAGE value="Remove req.injections" />
     <MESSAGE value="Remove Angel.inject" />
@@ -1087,7 +1130,8 @@
     <MESSAGE value="dart:mirrors is completely gone from Angel" />
     <MESSAGE value="All tests pass" />
     <MESSAGE value="CHANGELOG + bump to 2.0.0-alpha.1" />
-    <option name="LAST_COMMIT_MESSAGE" value="CHANGELOG + bump to 2.0.0-alpha.1" />
+    <MESSAGE value="Add &lt;Id, Data&gt;" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add &lt;Id, Data&gt;" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1095,20 +1139,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/example/handle_error.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="13" column="21" lean-forward="true" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/view.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" column="14" lean-forward="true" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
@@ -1215,23 +1245,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1152">
-          <caret line="72" column="30" selection-start-line="72" selection-start-column="30" selection-end-line="72" selection-end-column="30" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/accepts_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="41" column="67" lean-forward="true" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1239,28 +1256,18 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="256">
           <caret line="16" column="33" lean-forward="true" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/exception_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-602">
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
-        </state>
+        <state relative-caret-position="-602" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/find_one_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
           <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1268,20 +1275,11 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="239">
           <caret line="15" column="62" lean-forward="true" selection-start-line="15" selection-start-column="62" selection-end-line="15" selection-end-column="62" />
-          <folding>
-            <element signature="e#0#17#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test/view_generator_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#1#55#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file:///usr/local/Cellar/dart/2.0.0/libexec/lib/_http/http.dart">
       <provider selected="true" editor-type-id="text-editor">
@@ -1321,16 +1319,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="35" column="53" selection-start-line="35" selection-start-column="53" selection-end-line="35" selection-end-column="53" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="134">
@@ -1380,20 +1368,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="89" column="23" selection-start-line="89" selection-start-column="23" selection-end-line="89" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/response_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="186">
           <caret line="309" column="12" selection-start-line="309" selection-start-column="12" selection-end-line="309" selection-end-column="12" />
-          <folding>
-            <element signature="e#48#68#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1415,9 +1393,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
           <caret line="249" column="26" selection-start-line="249" selection-start-column="26" selection-end-line="249" selection-end-column="26" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1439,9 +1414,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="368">
           <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1449,9 +1421,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="126">
           <caret line="328" column="36" lean-forward="true" selection-start-line="328" selection-start-column="36" selection-end-line="328" selection-end-column="36" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1466,9 +1435,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="172">
           <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1476,30 +1442,68 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
           <caret line="154" column="49" selection-start-line="154" selection-start-column="49" selection-end-line="154" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="124">
+            <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="9" column="63" lean-forward="true" selection-start-line="9" selection-start-column="63" selection-end-line="9" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="149">
+          <caret line="29" column="28" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="181">
+          <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="4" column="22" lean-forward="true" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="96">
-            <caret line="6" column="69" selection-start-line="6" selection-start-column="69" selection-end-line="6" selection-end-column="69" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="187">
-            <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
-            <folding>
-              <element signature="e#0#54#0" expanded="true" />
-            </folding>
+          <first_editor relative-caret-position="32">
+            <caret line="2" column="95" selection-start-line="2" selection-start-column="95" selection-end-line="2" selection-end-column="95" />
           </first_editor>
           <second_editor />
         </state>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d69f3267..2aaf5ad9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.3
+* Added `<Id, Data>` type parameters to `Service`.
+* `HookedService` now follows suit, and takes a third parameter, pointing to the inner service.
+
 # 2.0.0-alpha.2
 * Added `ResponseContext.detach`.
 
diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index 4878b54c..408b5ca9 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -1,21 +1,23 @@
 import 'dart:async';
+
 import 'service.dart';
 
 /// An easy helper class to create one-off services without having to create an entire class.
 ///
 /// Well-suited for testing.
-class AnonymousService extends Service {
-  FutureOr Function([Map]) _index;
-  FutureOr Function(Object, [Map]) _read, _create, _remove;
-  FutureOr Function(Object, Object, [Map]) _modify, _update;
+class AnonymousService<Id, Data> extends Service<Id, Data> {
+  FutureOr Function([Map<String, dynamic>]) _index;
+  FutureOr Function(Id, [Map<String, dynamic>]) _read, _remove;
+  FutureOr Function(Data, [Map<String, dynamic>]) _create;
+  Function(Id, Data, [Map<String, dynamic>]) _modify, _update;
 
   AnonymousService(
       {FutureOr index([Map params]),
-      FutureOr read(id, [Map params]),
-      FutureOr create(data, [Map params]),
-      FutureOr modify(id, data, [Map params]),
-      FutureOr update(id, data, [Map params]),
-      FutureOr remove(id, [Map params])})
+      FutureOr read(Id id, [Map params]),
+      FutureOr create(Data data, [Map params]),
+      FutureOr modify(Id id, Data data, [Map params]),
+      FutureOr update(Id id, Data data, [Map params]),
+      FutureOr remove(Id id, [Map params])})
       : super() {
     _index = index;
     _read = read;
@@ -26,28 +28,30 @@ class AnonymousService extends Service {
   }
 
   @override
-  index([Map params]) => new Future.sync(
+  index([Map<String, dynamic> params]) => new Future.sync(
       () => _index != null ? _index(params) : super.index(params));
 
   @override
-  read(id, [Map params]) => new Future.sync(
+  read(Id id, [Map<String, dynamic> params]) => new Future.sync(
       () => _read != null ? _read(id, params) : super.read(id, params));
 
   @override
-  create(data, [Map params]) => new Future.sync(() =>
+  create(Data data, [Map<String, dynamic> params]) => new Future.sync(() =>
       _create != null ? _create(data, params) : super.create(data, params));
 
   @override
-  modify(id, data, [Map params]) => new Future.sync(() => _modify != null
-      ? _modify(id, data, params)
-      : super.modify(id, data, params));
+  modify(Id id, Data data, [Map<String, dynamic> params]) =>
+      new Future.sync(() => _modify != null
+          ? _modify(id, data, params)
+          : super.modify(id, data, params));
 
   @override
-  update(id, data, [Map params]) => new Future.sync(() => _update != null
-      ? _update(id, data, params)
-      : super.update(id, data, params));
+  update(Id id, Data data, [Map<String, dynamic> params]) =>
+      new Future.sync(() => _update != null
+          ? _update(id, data, params)
+          : super.update(id, data, params));
 
   @override
-  remove(id, [Map params]) => new Future.sync(
+  remove(Id id, [Map<String, dynamic> params]) => new Future.sync(
       () => _remove != null ? _remove(id, params) : super.remove(id, params));
 }
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index d9c6a147..87d3e42d 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -10,11 +10,12 @@ import 'server.dart';
 import 'service.dart';
 
 /// Wraps another service in a service that broadcasts events on actions.
-class HookedService extends Service {
+class HookedService<Id, Data, T extends Service<Id, Data>>
+    extends Service<Id, Data> {
   final List<StreamController<HookedServiceEvent>> _ctrl = [];
 
   /// Tbe service that is proxied by this hooked one.
-  final Service inner;
+  final T inner;
 
   final HookedServiceEventDispatcher beforeIndexed =
       new HookedServiceEventDispatcher();
@@ -41,7 +42,7 @@ class HookedService extends Service {
   final HookedServiceEventDispatcher afterRemoved =
       new HookedServiceEventDispatcher();
 
-  HookedService(Service this.inner) {
+  HookedService(this.inner) {
     // Clone app instance
     if (inner.app != null) this.app = inner.app;
   }
@@ -56,13 +57,14 @@ class HookedService extends Service {
     return params['__responsectx'] as ResponseContext;
   }
 
-  Map _stripReq(Map params) {
+  Map<String, dynamic> _stripReq(Map<String, dynamic> params) {
     if (params == null)
       return params;
     else
       return params.keys
           .where((key) => key != '__requestctx' && key != '__responsectx')
-          .fold({}, (map, key) => map..[key] = params[key]);
+          .fold<Map<String, dynamic>>(
+              {}, (map, key) => map..[key] = params[key]);
   }
 
   /// Closes any open [StreamController]s on this instance. **Internal use only**.
@@ -257,7 +259,7 @@ class HookedService extends Service {
   }
 
   @override
-  Future index([Map _params]) {
+  Future index([Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeIndexed
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -283,7 +285,7 @@ class HookedService extends Service {
   }
 
   @override
-  Future read(id, [Map _params]) {
+  Future read(id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRead
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -309,7 +311,7 @@ class HookedService extends Service {
   }
 
   @override
-  Future create(data, [Map _params]) {
+  Future create(data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeCreated
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -335,7 +337,7 @@ class HookedService extends Service {
   }
 
   @override
-  Future modify(id, data, [Map _params]) {
+  Future modify(id, data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeModified
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -361,7 +363,7 @@ class HookedService extends Service {
   }
 
   @override
-  Future update(id, data, [Map _params]) {
+  Future update(id, data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeUpdated
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -387,7 +389,7 @@ class HookedService extends Service {
   }
 
   @override
-  Future remove(id, [Map _params]) {
+  Future remove(id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRemoved
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 7fd79f23..c7d5f93f 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -5,7 +5,7 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'service.dart';
 
 /// A basic service that manages an in-memory list of maps.
-class MapService extends Service {
+class MapService extends Service<String, Map<String, dynamic>> {
   /// If set to `true`, clients can remove all items by passing a `null` `id` to `remove`.
   ///
   /// `false` by default.
@@ -35,8 +35,8 @@ class MapService extends Service {
   String get updatedAtKey =>
       autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at';
 
-  bool Function(Map) _matchesId(id) {
-    return (Map item) {
+  bool Function(Map<String, dynamic>) _matchesId(id) {
+    return (Map<String, dynamic> item) {
       if (item['id'] == null)
         return false;
       else if (autoIdAndDateFields != false)
@@ -47,7 +47,7 @@ class MapService extends Service {
   }
 
   @override
-  Future<List> index([Map params]) {
+  Future<List> index([Map<String, dynamic> params]) {
     if (allowQuery == false || params == null || params['query'] is! Map)
       return new Future.value(items);
     else {
@@ -66,20 +66,20 @@ class MapService extends Service {
   }
 
   @override
-  Future<Map> read(id, [Map params]) {
+  Future<Map> read(String id, [Map<String, dynamic> params]) {
     return new Future.value(items.firstWhere(_matchesId(id),
         orElse: () => throw new AngelHttpException.notFound(
             message: 'No record found for ID $id')));
   }
 
   @override
-  Future<Map> create(data, [Map params]) {
+  Future<Map> create(Map<String, dynamic> data, [Map<String, dynamic> params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
     var now = new DateTime.now().toIso8601String();
-    var result = data as Map;
+    var result = new Map<String, dynamic>.from(data);
 
     if (autoIdAndDateFields == true) {
       result
@@ -87,19 +87,13 @@ class MapService extends Service {
         ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] = now
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
-    items.add(_foldStringDynamic(result));
+    items.add(result);
     return new Future.value(result);
   }
 
-  Map<String, dynamic> _foldStringDynamic(Map map) {
-    return map == null
-        ? null
-        : map.keys.fold<Map<String, dynamic>>(
-            <String, dynamic>{}, (out, k) => out..[k.toString()] = map[k]);
-  }
-
   @override
-  Future<Map> modify(id, data, [Map params]) {
+  Future<Map> modify(String id, Map<String, dynamic> data,
+      [Map<String, dynamic> params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
@@ -107,7 +101,7 @@ class MapService extends Service {
     if (!items.any(_matchesId(id))) return create(data, params);
 
     return read(id).then((item) {
-      var result = item..addAll(data as Map);
+      var result = new Map<String, dynamic>.from(item)..addAll(data);
 
       if (autoIdAndDateFields == true)
         result
@@ -118,7 +112,8 @@ class MapService extends Service {
   }
 
   @override
-  Future<Map> update(id, data, [Map params]) {
+  Future<Map> update(String id, Map<String, dynamic> data,
+      [Map<String, dynamic> params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
@@ -130,7 +125,7 @@ class MapService extends Service {
         throw new AngelHttpException.notFound(
             message: 'No record found for ID $id');
 
-      var result = data as Map;
+      var result = new Map<String, dynamic>.from(data);
       if (autoIdAndDateFields == true) {
         result
           ..['id'] = id?.toString()
@@ -139,13 +134,13 @@ class MapService extends Service {
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
               new DateTime.now().toIso8601String();
       }
-      items.add(_foldStringDynamic(result));
+      items.add(result);
       return new Future.value(result);
     });
   }
 
   @override
-  Future<Map> remove(id, [Map params]) {
+  Future<Map> remove(String id, [Map<String, dynamic> params]) {
     if (id == null ||
         id == 'null' &&
             (allowRemoveAll == true ||
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 7c47b86e..0ed60ae7 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -27,7 +27,7 @@ abstract class RequestContext<RawRequest> {
   RawRequest get rawRequest;
 
   /// Additional params to be passed to services.
-  final Map serviceParams = {};
+  final Map<String, dynamic> serviceParams = {};
 
   /// The [Angel] instance that is responding to this request.
   Angel app;
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 29b7c33d..dcf48a73 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -101,8 +101,9 @@ class Routable extends Router<RequestHandler> {
   ///
   /// Returns a [HookedService] that can be used to hook into
   /// events dispatched by this service.
-  HookedService use(String path, Service service) {
-    var hooked = new HookedService(service);
+  HookedService<Id, Data, T> use<Id, Data, T extends Service<Id, Data>>(
+      String path, T service) {
+    var hooked = new HookedService<Id, Data, T>(service);
     _services[path
         .toString()
         .trim()
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 700a3285..60d3c421 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -339,7 +339,8 @@ class Angel extends Routable {
   }
 
   @override
-  HookedService use(String path, Service service) {
+  HookedService<Id, Data, T> use<Id, Data, T extends Service<Id, Data>>(
+      String path, T service) {
     service.app = this;
     return super.use(path, service)..app = this;
   }
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 5aaf4149..106be848 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -79,7 +79,7 @@ class Service<Id, Data> extends Routable {
   ///
   /// A custom [errorMessage] may be provided.
   Future findOne(
-      [Map params,
+      [Map<String, dynamic> params,
       String errorMessage = 'No record was found matching the given query.']) {
     return index(params).then((result) {
       if (result == null) {
@@ -97,32 +97,32 @@ class Service<Id, Data> extends Routable {
   }
 
   /// Retrieves all resources.
-  Future index([Map params]) {
+  Future index([Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Retrieves the desired resource.
-  Future read(Id id, [Map params]) {
+  Future read(Id id, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Creates a resource.
-  Future create(Data data, [Map params]) {
+  Future create(Data data, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Modifies a resource.
-  Future modify(Id id, Data data, [Map params]) {
+  Future modify(Id id, Data data, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Overwrites a resource.
-  Future update(Id id, Data data, [Map params]) {
+  Future update(Id id, Data data, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Removes the given resource.
-  Future remove(Id id, [Map params]) {
+  Future remove(Id id, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 

From f3481cc2270057357abfc0b4791ecec3b673e129 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 11 Sep 2018 16:34:29 -0400
Subject: [PATCH 292/414] Add generics to hooked service listeners

---
 .idea/workspace.xml              | 249 ++++++++++++++++---------------
 CHANGELOG.md                     |   2 +
 lib/src/core/core.dart           |   1 -
 lib/src/core/hooked_service.dart | 157 ++++++++++---------
 lib/src/core/typed_service.dart  |   1 -
 5 files changed, 211 insertions(+), 199 deletions(-)
 delete mode 100644 lib/src/core/typed_service.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1ce67e48..86763688 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/core.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/core.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/map_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/map_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/request_context.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/request_context.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/service.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,46 +29,13 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="124">
-                <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+      <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="181">
-              <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
+            <state relative-caret-position="125">
+              <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
               <folding>
-                <element signature="e#39#59#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="149">
-              <caret line="29" column="28" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-              <folding>
-                <element signature="e#47#67#0" expanded="true" />
+                <element signature="e#0#46#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -79,14 +45,47 @@
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="32">
-                <caret line="2" column="95" selection-start-line="2" selection-start-column="95" selection-end-line="2" selection-end-column="95" />
+              <first_editor relative-caret-position="64">
+                <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
               </first_editor>
               <second_editor />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="map_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="384">
+              <caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1386">
+              <caret line="459" column="46" selection-start-line="459" selection-start-column="46" selection-end-line="459" selection-end-column="46" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="core.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="128">
+              <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
+              <folding>
+                <element signature="e#0#32#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -99,7 +98,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>sopw</find>
       <find>stopw</find>
       <find>release</find>
       <find>handleRe</find>
@@ -129,6 +127,7 @@
       <find>/meta</find>
       <find>complet</find>
       <find>parseI</find>
+      <find>read(</find>
     </findStrings>
     <replaceStrings>
       <replace>FutureOr</replace>
@@ -192,10 +191,8 @@
         <option value="$PROJECT_DIR$/lib/hooks.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/typed_service.dart" />
         <option value="$PROJECT_DIR$/test/typed_service_test.dart" />
-        <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/test/all.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/angel_base.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/test/general_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/metadata.dart" />
         <option value="$PROJECT_DIR$/example/view.dart" />
@@ -217,9 +214,7 @@
         <option value="$PROJECT_DIR$/test/server_test.dart" />
         <option value="$PROJECT_DIR$/test/parameter_meta_test.dart" />
         <option value="$PROJECT_DIR$/test/serialize_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
         <option value="$PROJECT_DIR$/test/precontained_test.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
         <option value="$PROJECT_DIR$/test/encoders_buffer_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/util.dart" />
         <option value="$PROJECT_DIR$/test/routing_test.dart" />
@@ -231,9 +226,13 @@
         <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
-        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/map_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/routable.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/server.dart" />
+        <option value="$PROJECT_DIR$/test/services_test.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
+        <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -662,14 +661,7 @@
       <workItem from="1534793956753" duration="15012000" />
       <workItem from="1534863259966" duration="198000" />
       <workItem from="1534873119036" duration="4624000" />
-      <workItem from="1536696642254" duration="760000" />
-    </task>
-    <task id="LOCAL-00115" summary="Remove lib/hooks.dart">
-      <created>1534732365272</created>
-      <option name="number" value="00115" />
-      <option name="presentableId" value="LOCAL-00115" />
-      <option name="project" value="LOCAL" />
-      <updated>1534732365272</updated>
+      <workItem from="1536696642254" duration="1416000" />
     </task>
     <task id="LOCAL-00116" summary="Remove lib/common.dart">
       <created>1534732527424</created>
@@ -1007,7 +999,14 @@
       <option name="project" value="LOCAL" />
       <updated>1536696871864</updated>
     </task>
-    <option name="localTasksCounter" value="164" />
+    <task id="LOCAL-00164" summary="Added generic to Routable.use">
+      <created>1536697507787</created>
+      <option name="number" value="00164" />
+      <option name="presentableId" value="LOCAL-00164" />
+      <option name="project" value="LOCAL" />
+      <updated>1536697507787</updated>
+    </task>
+    <option name="localTasksCounter" value="165" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1043,7 +1042,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="192801000" />
+    <option name="totallyTimeSpent" value="193457000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1063,7 +1062,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1106,7 +1105,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Update CHANGELOG" />
     <MESSAGE value="Remove req.injections" />
     <MESSAGE value="Remove Angel.inject" />
     <MESSAGE value="Remove dep on package:pool" />
@@ -1131,7 +1129,8 @@
     <MESSAGE value="All tests pass" />
     <MESSAGE value="CHANGELOG + bump to 2.0.0-alpha.1" />
     <MESSAGE value="Add &lt;Id, Data&gt;" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add &lt;Id, Data&gt;" />
+    <MESSAGE value="Added generic to Routable.use" />
+    <option name="LAST_COMMIT_MESSAGE" value="Added generic to Routable.use" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1139,28 +1138,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/performance/hello/angel.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="-663" />
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/performance/hello/raw.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/http/http_request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="5" column="46" lean-forward="true" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/json.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-282">
@@ -1309,16 +1286,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="86" column="66" lean-forward="true" selection-start-line="86" selection-start-column="66" selection-end-line="86" selection-end-column="66" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/serialize_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="134">
@@ -1389,13 +1356,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="249" column="26" selection-start-line="249" selection-start-column="26" selection-end-line="249" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="128">
@@ -1445,16 +1405,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="124">
-            <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -1462,6 +1412,19 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="292" column="11" selection-start-line="292" selection-start-column="11" selection-end-line="292" selection-end-column="11" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="149">
@@ -1472,29 +1435,69 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="181">
-          <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
+        <state relative-caret-position="38">
+          <caret line="328" column="3" lean-forward="true" selection-start-line="328" selection-start-column="3" selection-end-line="328" selection-end-column="3" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/routable.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="70">
+          <caret line="86" column="17" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="124">
+            <caret line="20" column="49" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="49" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" column="22" lean-forward="true" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
+        <state relative-caret-position="384">
+          <caret line="24" column="2" selection-start-line="24" selection-start-column="2" selection-end-line="24" selection-end-column="2" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="79" column="33" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
+        <state relative-caret-position="-1386">
+          <caret line="459" column="46" selection-start-line="459" selection-start-column="46" selection-end-line="459" selection-end-column="46" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/core.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
           <folding>
-            <element signature="e#39#59#0" expanded="true" />
+            <element signature="e#0#32#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1502,8 +1505,8 @@
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="32">
-            <caret line="2" column="95" selection-start-line="2" selection-start-column="95" selection-end-line="2" selection-end-column="95" />
+          <first_editor relative-caret-position="64">
+            <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
           </first_editor>
           <second_editor />
         </state>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aaf5ad9..98484132 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # 2.0.0-alpha.3
 * Added `<Id, Data>` type parameters to `Service`.
 * `HookedService` now follows suit, and takes a third parameter, pointing to the inner service.
+* `Routable.use` now uses the generic parameters added to `Service`.
+* Added generic usage to `HookedServiceListener`, etc.
 
 # 2.0.0-alpha.2
 * Added `ResponseContext.detach`.
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index ebda0587..91b03380 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -7,4 +7,3 @@ export 'response_context.dart';
 export 'routable.dart';
 export 'server.dart';
 export 'service.dart';
-export 'typed_service.dart';
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 87d3e42d..fe499fb2 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -1,11 +1,12 @@
 library angel_framework.core.hooked_service;
 
 import 'dart:async';
+
 import '../util.dart';
+import 'metadata.dart';
 import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
-import 'metadata.dart';
 import 'server.dart';
 import 'service.dart';
 
@@ -17,30 +18,30 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// Tbe service that is proxied by this hooked one.
   final T inner;
 
-  final HookedServiceEventDispatcher beforeIndexed =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher beforeRead =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher beforeCreated =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher beforeModified =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher beforeUpdated =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher beforeRemoved =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher afterIndexed =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher afterRead =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher afterCreated =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher afterModified =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher afterUpdated =
-      new HookedServiceEventDispatcher();
-  final HookedServiceEventDispatcher afterRemoved =
-      new HookedServiceEventDispatcher();
+  final HookedServiceEventDispatcher<Id, Data, T> beforeIndexed =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> beforeRead =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> beforeCreated =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> beforeModified =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> beforeUpdated =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> beforeRemoved =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> afterIndexed =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> afterRead =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> afterCreated =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> afterModified =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> afterUpdated =
+      new HookedServiceEventDispatcher<Id, Data, T>();
+  final HookedServiceEventDispatcher<Id, Data, T> afterRemoved =
+      new HookedServiceEventDispatcher<Id, Data, T>();
 
   HookedService(this.inner) {
     // Clone app instance
@@ -90,17 +91,18 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// Adds hooks to this instance.
   void addHooks(Angel app) {
     Hooks hooks = getAnnotation(inner, Hooks, app.container.reflector);
-    List<HookedServiceEventListener> before = [], after = [];
+    List<HookedServiceEventListener<Id, Data, T>> before = [], after = [];
 
     if (hooks != null) {
       before.addAll(hooks.before);
       after.addAll(hooks.after);
     }
 
-    void applyListeners(Function fn, HookedServiceEventDispatcher dispatcher,
+    void applyListeners(
+        Function fn, HookedServiceEventDispatcher<Id, Data, T> dispatcher,
         [bool isAfter]) {
       Hooks hooks = getAnnotation(fn, Hooks, app.container.reflector);
-      final listeners = <HookedServiceEventListener>[]
+      final listeners = <HookedServiceEventListener<Id, Data, T>>[]
         ..addAll(isAfter == true ? after : before);
 
       if (hooks != null)
@@ -137,8 +139,8 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   /// Runs the [listener] before every service method specified.
-  void before(
-      Iterable<String> eventNames, HookedServiceEventListener listener) {
+  void before(Iterable<String> eventNames,
+      HookedServiceEventListener<Id, Data, T> listener) {
     eventNames.map((name) {
       switch (name) {
         case HookedServiceEvent.indexed:
@@ -156,12 +158,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
         default:
           throw new ArgumentError('Invalid service method: ${name}');
       }
-    }).forEach((HookedServiceEventDispatcher dispatcher) =>
+    }).forEach((HookedServiceEventDispatcher<Id, Data, T> dispatcher) =>
         dispatcher.listen(listener));
   }
 
   /// Runs the [listener] after every service method specified.
-  void after(Iterable<String> eventNames, HookedServiceEventListener listener) {
+  void after(Iterable<String> eventNames,
+      HookedServiceEventListener<Id, Data, T> listener) {
     eventNames.map((name) {
       switch (name) {
         case HookedServiceEvent.indexed:
@@ -179,12 +182,12 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
         default:
           throw new ArgumentError('Invalid service method: ${name}');
       }
-    }).forEach((HookedServiceEventDispatcher dispatcher) =>
+    }).forEach((HookedServiceEventDispatcher<Id, Data, T> dispatcher) =>
         dispatcher.listen(listener));
   }
 
   /// Runs the [listener] before every service method.
-  void beforeAll(HookedServiceEventListener listener) {
+  void beforeAll(HookedServiceEventListener<Id, Data, T> listener) {
     beforeIndexed.listen(listener);
     beforeRead.listen(listener);
     beforeCreated.listen(listener);
@@ -194,7 +197,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   /// Runs the [listener] after every service method.
-  void afterAll(HookedServiceEventListener listener) {
+  void afterAll(HookedServiceEventListener<Id, Data, T> listener) {
     afterIndexed.listen(listener);
     afterRead.listen(listener);
     afterCreated.listen(listener);
@@ -208,8 +211,8 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
   /// that events coming out of this [Stream] will see changes you make within the [Stream]
   /// callback.
-  Stream<HookedServiceEvent> beforeAllStream() {
-    var ctrl = new StreamController<HookedServiceEvent>();
+  Stream<HookedServiceEvent<Id, Data, T>> beforeAllStream() {
+    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     before(HookedServiceEvent.all, ctrl.add);
     return ctrl.stream;
@@ -220,8 +223,8 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
   /// that events coming out of this [Stream] will see changes you make within the [Stream]
   /// callback.
-  Stream<HookedServiceEvent> afterAllStream() {
-    var ctrl = new StreamController<HookedServiceEvent>();
+  Stream<HookedServiceEvent<Id, Data, T>> afterAllStream() {
+    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     before(HookedServiceEvent.all, ctrl.add);
     return ctrl.stream;
@@ -232,8 +235,9 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
   /// that events coming out of this [Stream] will see changes you make within the [Stream]
   /// callback.
-  Stream<HookedServiceEvent> beforeStream(Iterable<String> eventNames) {
-    var ctrl = new StreamController<HookedServiceEvent>();
+  Stream<HookedServiceEvent<Id, Data, T>> beforeStream(
+      Iterable<String> eventNames) {
+    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     before(eventNames, ctrl.add);
     return ctrl.stream;
@@ -244,15 +248,16 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// *NOTE*: Only use this if you do not plan to modify events. There is no guarantee
   /// that events coming out of this [Stream] will see changes you make within the [Stream]
   /// callback.
-  Stream<HookedServiceEvent> afterStream(Iterable<String> eventNames) {
-    var ctrl = new StreamController<HookedServiceEvent>();
+  Stream<HookedServiceEvent<Id, Data, T>> afterStream(
+      Iterable<String> eventNames) {
+    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     after(eventNames, ctrl.add);
     return ctrl.stream;
   }
 
   /// Runs the [listener] before [create], [modify] and [update].
-  void beforeModify(HookedServiceEventListener listener) {
+  void beforeModify(HookedServiceEventListener<Id, Data, T> listener) {
     beforeCreated.listen(listener);
     beforeModified.listen(listener);
     beforeUpdated.listen(listener);
@@ -285,7 +290,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future read(id, [Map<String, dynamic> _params]) {
+  Future read(Id id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRead
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -311,7 +316,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future create(data, [Map<String, dynamic> _params]) {
+  Future create(Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeCreated
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -337,7 +342,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future modify(id, data, [Map<String, dynamic> _params]) {
+  Future modify(Id id, Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeModified
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -363,7 +368,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future update(id, data, [Map<String, dynamic> _params]) {
+  Future update(Id id, Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeUpdated
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -389,7 +394,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future remove(id, [Map<String, dynamic> _params]) {
+  Future remove(Id id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRemoved
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -416,9 +421,9 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
   /// Fires an `after` event. This will not be propagated to clients,
   /// but will be broadcasted to WebSockets, etc.
-  Future<HookedServiceEvent> fire(String eventName, result,
-      [HookedServiceEventListener callback]) {
-    HookedServiceEventDispatcher dispatcher;
+  Future<HookedServiceEvent<Id, Data, T>> fire(String eventName, result,
+      [HookedServiceEventListener<Id, Data, T> callback]) {
+    HookedServiceEventDispatcher<Id, Data, T> dispatcher;
 
     switch (eventName) {
       case HookedServiceEvent.indexed:
@@ -443,14 +448,16 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
         throw new ArgumentError("Invalid service event name: '$eventName'");
     }
 
-    var ev = new HookedServiceEvent(true, null, null, this, eventName);
+    var ev =
+        new HookedServiceEvent<Id, Data, T>(true, null, null, inner, eventName);
     return fireEvent(dispatcher, ev, callback);
   }
 
   /// Sends an arbitrary event down the hook chain.
-  Future<HookedServiceEvent> fireEvent(
-      HookedServiceEventDispatcher dispatcher, HookedServiceEvent event,
-      [HookedServiceEventListener callback]) {
+  Future<HookedServiceEvent<Id, Data, T>> fireEvent(
+      HookedServiceEventDispatcher<Id, Data, T> dispatcher,
+      HookedServiceEvent<Id, Data, T> event,
+      [HookedServiceEventListener<Id, Data, T> callback]) {
     Future f;
     if (callback != null && event?._canceled != true)
       f = new Future.sync(() => callback(event));
@@ -460,7 +467,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 }
 
 /// Fired when a hooked service is invoked.
-class HookedServiceEvent {
+class HookedServiceEvent<Id, Data, T extends Service<Id, Data>> {
   static const String indexed = 'indexed';
   static const String read = 'read';
   static const String created = 'created';
@@ -490,17 +497,17 @@ class HookedServiceEvent {
 
   bool _canceled = false;
   String _eventName;
-  var _id;
+  Id _id;
   bool _isAfter;
-  var data;
-  Map _params;
+  Data data;
+  Map<String, dynamic> _params;
   RequestContext _request;
   ResponseContext _response;
   var result;
 
   String get eventName => _eventName;
 
-  get id => _id;
+  Id get id => _id;
 
   bool get isAfter => _isAfter == true;
 
@@ -513,23 +520,24 @@ class HookedServiceEvent {
   ResponseContext get response => _response;
 
   /// The inner service whose method was hooked.
-  Service service;
+  T service;
 
-  HookedServiceEvent(this._isAfter, this._request, this._response,
-      Service this.service, String this._eventName,
-      {id, this.data, Map params, this.result}) {
+  HookedServiceEvent(this._isAfter, this._request, this._response, this.service,
+      String this._eventName,
+      {Id id, this.data, Map<String, dynamic> params, this.result}) {
     _id = id;
     _params = params ?? {};
   }
 }
 
 /// Triggered on a hooked service event.
-typedef HookedServiceEventListener(HookedServiceEvent event);
+typedef FutureOr HookedServiceEventListener<Id, Data,
+    T extends Service<Id, Data>>(HookedServiceEvent<Id, Data, T> event);
 
 /// Can be listened to, but events may be canceled.
-class HookedServiceEventDispatcher {
-  final List<StreamController<HookedServiceEvent>> _ctrl = [];
-  final List<HookedServiceEventListener> listeners = [];
+class HookedServiceEventDispatcher<Id, Data, T extends Service<Id, Data>> {
+  final List<StreamController<HookedServiceEvent<Id, Data, T>>> _ctrl = [];
+  final List<HookedServiceEventListener<Id, Data, T>> listeners = [];
 
   void _close() {
     _ctrl.forEach((c) => c.close());
@@ -537,11 +545,12 @@ class HookedServiceEventDispatcher {
   }
 
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
-  Future<HookedServiceEvent> _emit(HookedServiceEvent event) {
+  Future<HookedServiceEvent<Id, Data, T>> _emit(
+      HookedServiceEvent<Id, Data, T> event) {
     if (event?._canceled == true || event == null || listeners.isEmpty)
       return new Future.value(event);
 
-    var f = new Future<HookedServiceEvent>.value(event);
+    var f = new Future<HookedServiceEvent<Id, Data, T>>.value(event);
 
     for (var listener in listeners) {
       f = f.then((event) {
@@ -557,16 +566,16 @@ class HookedServiceEventDispatcher {
   ///
   /// *NOTE*: Callbacks on the returned [Stream] cannot be guaranteed to run before other [listeners].
   /// Use this only if you need a read-only stream of events.
-  Stream<HookedServiceEvent> asStream() {
+  Stream<HookedServiceEvent<Id, Data, T>> asStream() {
     // TODO: Close StreamController
-    var ctrl = new StreamController<HookedServiceEvent>();
+    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     listen(ctrl.add);
     return ctrl.stream;
   }
 
   /// Registers the listener to be called whenever an event is triggered.
-  void listen(HookedServiceEventListener listener) {
+  void listen(HookedServiceEventListener<Id, Data, T> listener) {
     listeners.add(listener);
   }
 }
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
deleted file mode 100644
index 8b137891..00000000
--- a/lib/src/core/typed_service.dart
+++ /dev/null
@@ -1 +0,0 @@
-

From 9945884b5a99f6492ef223f410608d6f762c7346 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 11 Sep 2018 16:40:23 -0400
Subject: [PATCH 293/414] Bump to 2.0.0-alpha.3

---
 .idea/workspace.xml | 199 +++++++++++++++++---------------------------
 CHANGELOG.md        |   1 +
 pubspec.yaml        |   2 +-
 3 files changed, 79 insertions(+), 123 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 86763688..85710c16 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,6 @@
     <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/core.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/core.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/core/hooked_service.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/src/core/typed_service.dart" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -32,8 +29,8 @@
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="125">
-              <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
+            <state relative-caret-position="368">
+              <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
               </folding>
@@ -41,12 +38,30 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="416">
+              <caret line="125" column="48" lean-forward="true" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="anonymous_service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="176">
+              <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
             <state split_layout="SPLIT">
-              <first_editor relative-caret-position="64">
-                <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
+              <first_editor relative-caret-position="80">
+                <caret line="5" column="66" selection-start-line="5" selection-start-column="66" selection-end-line="5" selection-end-column="66" />
               </first_editor>
               <second_editor />
             </state>
@@ -68,7 +83,7 @@
       <file leaf-file-name="hooked_service.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1386">
+            <state relative-caret-position="7216">
               <caret line="459" column="46" selection-start-line="459" selection-start-column="46" selection-end-line="459" selection-end-column="46" />
             </state>
           </provider>
@@ -204,7 +219,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/http_request_context.dart" />
         <option value="$PROJECT_DIR$/example/handle_error.dart" />
         <option value="$PROJECT_DIR$/example/json.dart" />
-        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/angel_container-1.0.0-alpha.3/lib/src/mirrors/reflector.dart" />
         <option value="$PROJECT_DIR$/lib/src/http/controller.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/injection.dart" />
@@ -233,6 +247,7 @@
         <option value="$PROJECT_DIR$/test/services_test.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/hooked_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
+        <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
       </list>
     </option>
@@ -262,60 +277,10 @@
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
+    <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes>
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <expand>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="example" type="cbb8eebc:String" user="example" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="core" type="cbb8eebc:String" user="core" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="lib" type="cbb8eebc:String" user="lib" />
-              <item name="src" type="cbb8eebc:String" user="src" />
-              <item name="http" type="cbb8eebc:String" user="http" />
-            </path>
-            <path>
-              <item name="Root" type="cbb8eebc:String" user="Root" />
-              <item name="framework" type="cbb8eebc:String" user="framework" />
-              <item name="test" type="cbb8eebc:String" user="test" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane" />
-      <pane id="AndroidView" />
-    </panes>
+    <panes />
   </component>
   <component name="PropertiesComponent">
     <property name="GO_FMT" value="false" />
@@ -661,14 +626,8 @@
       <workItem from="1534793956753" duration="15012000" />
       <workItem from="1534863259966" duration="198000" />
       <workItem from="1534873119036" duration="4624000" />
-      <workItem from="1536696642254" duration="1416000" />
-    </task>
-    <task id="LOCAL-00116" summary="Remove lib/common.dart">
-      <created>1534732527424</created>
-      <option name="number" value="00116" />
-      <option name="presentableId" value="LOCAL-00116" />
-      <option name="project" value="LOCAL" />
-      <updated>1534732527424</updated>
+      <workItem from="1536696642254" duration="1497000" />
+      <workItem from="1536698151028" duration="136000" />
     </task>
     <task id="LOCAL-00117" summary="Strip out TypedService">
       <created>1534732668246</created>
@@ -1006,7 +965,14 @@
       <option name="project" value="LOCAL" />
       <updated>1536697507787</updated>
     </task>
-    <option name="localTasksCounter" value="165" />
+    <task id="LOCAL-00165" summary="Add generics to hooked service listeners">
+      <created>1536698069495</created>
+      <option name="number" value="00165" />
+      <option name="presentableId" value="LOCAL-00165" />
+      <option name="project" value="LOCAL" />
+      <updated>1536698069495</updated>
+    </task>
+    <option name="localTasksCounter" value="166" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1042,7 +1008,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="193457000" />
+    <option name="totallyTimeSpent" value="193674000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1086,15 +1052,15 @@
       <window_info anchor="right" id="Flutter Inspector" order="4" />
       <window_info anchor="bottom" id="DB Execution Console" order="8" />
       <window_info anchor="right" id="Coverage" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
-      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" id="Data View" order="4" />
+      <window_info anchor="bottom" id="Message" order="0" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1105,7 +1071,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Remove req.injections" />
     <MESSAGE value="Remove Angel.inject" />
     <MESSAGE value="Remove dep on package:pool" />
     <MESSAGE value="waterfall now only accepts RequestHandler" />
@@ -1130,7 +1095,8 @@
     <MESSAGE value="CHANGELOG + bump to 2.0.0-alpha.1" />
     <MESSAGE value="Add &lt;Id, Data&gt;" />
     <MESSAGE value="Added generic to Routable.use" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added generic to Routable.use" />
+    <MESSAGE value="Add generics to hooked service listeners" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add generics to hooked service listeners" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1314,20 +1280,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/common.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="528">
-          <caret line="34" column="3" lean-forward="true" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="65">
-          <caret line="100" column="32" selection-start-line="100" selection-start-column="32" selection-end-line="100" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/routing_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="115">
@@ -1405,13 +1357,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="9" column="63" lean-forward="true" selection-start-line="9" selection-start-column="63" selection-end-line="9" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="54">
@@ -1422,16 +1367,11 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart" />
     <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="149">
           <caret line="29" column="28" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-          <folding>
-            <element signature="e#47#67#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1439,9 +1379,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="38">
           <caret line="328" column="3" lean-forward="true" selection-start-line="328" selection-start-column="3" selection-end-line="328" selection-end-column="3" />
-          <folding>
-            <element signature="e#38#58#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1449,9 +1386,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="70">
           <caret line="86" column="17" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
-          <folding>
-            <element signature="e#40#60#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1465,16 +1399,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="23" column="29" lean-forward="true" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/map_service.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="384">
@@ -1487,7 +1411,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/hooked_service.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1386">
+        <state relative-caret-position="7216">
           <caret line="459" column="46" selection-start-line="459" selection-start-column="46" selection-end-line="459" selection-end-column="46" />
         </state>
       </provider>
@@ -1502,11 +1426,42 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/common.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="31" column="27" lean-forward="true" selection-start-line="31" selection-start-column="27" selection-end-line="31" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="125" column="48" lean-forward="true" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
         <state split_layout="SPLIT">
-          <first_editor relative-caret-position="64">
-            <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
+          <first_editor relative-caret-position="80">
+            <caret line="5" column="66" selection-start-line="5" selection-start-column="66" selection-end-line="5" selection-end-column="66" />
           </first_editor>
           <second_editor />
         </state>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98484132..140ac084 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * `HookedService` now follows suit, and takes a third parameter, pointing to the inner service.
 * `Routable.use` now uses the generic parameters added to `Service`.
 * Added generic usage to `HookedServiceListener`, etc.
+* All service methods take `Map<String, dynamic>` as `params` now.
 
 # 2.0.0-alpha.2
 * Added `ResponseContext.detach`.
diff --git a/pubspec.yaml b/pubspec.yaml
index f41c6294..826f606e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.2
+version: 2.0.0-alpha.3
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From ce45ef47e54329594502420297d7cdd5165b6359 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 12 Sep 2018 00:17:50 -0400
Subject: [PATCH 294/414] waterfall -> chain

---
 .idea/workspace.xml        | 258 +++++++++++++++++++++++--------------
 lib/src/core/routable.dart |   2 +-
 test/primitives_test.dart  |   2 +-
 3 files changed, 165 insertions(+), 97 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 85710c16..4109bc84 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-    </list>
+    <list default="true" id="7b89ff1e-1260-4dcf-9c3d-345de0471ea1" name="Default" comment="" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -29,7 +26,7 @@
       <file leaf-file-name="services_test.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/test/services_test.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="368">
+            <state relative-caret-position="16">
               <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
               <folding>
                 <element signature="e#0#46#0" expanded="true" />
@@ -38,32 +35,44 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hooked_test.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <file leaf-file-name="service.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="416">
-              <caret line="125" column="48" lean-forward="true" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
+            <state relative-caret-position="358">
+              <caret line="191" column="33" lean-forward="true" selection-start-line="191" selection-start-column="33" selection-end-line="191" selection-end-column="33" />
+              <folding>
+                <element signature="e#39#59#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="anonymous_service.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/core/anonymous_service.dart">
+      <file leaf-file-name="request_context.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
+            <state relative-caret-position="464">
+              <caret line="29" column="29" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
+              <folding>
+                <element signature="e#47#67#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CHANGELOG.md" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="80">
-                <caret line="5" column="66" selection-start-line="5" selection-start-column="66" selection-end-line="5" selection-end-column="66" />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="159">
+              <caret line="10" column="12" lean-forward="true" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="precontained_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="160">
+              <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
             </state>
           </provider>
         </entry>
@@ -113,8 +122,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>stopw</find>
-      <find>release</find>
       <find>handleRe</find>
       <find>get container</find>
       <find>Parameter</find>
@@ -143,6 +150,8 @@
       <find>complet</find>
       <find>parseI</find>
       <find>read(</find>
+      <find>as</find>
+      <find>serviceP</find>
     </findStrings>
     <replaceStrings>
       <replace>FutureOr</replace>
@@ -181,10 +190,10 @@
       <dir>C:\Users\thosa\Source\Angel\framework\lib\src\http</dir>
       <dir>C:\Users\thosa\Source\Angel\framework\test</dir>
       <dir>$PROJECT_DIR$/lib/src</dir>
-      <dir>$PROJECT_DIR$/lib/src/core</dir>
       <dir>$PROJECT_DIR$/lib</dir>
       <dir>$PROJECT_DIR$/test</dir>
       <dir>$PROJECT_DIR$</dir>
+      <dir>$PROJECT_DIR$/lib/src/core</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -237,7 +246,6 @@
         <option value="$PROJECT_DIR$/lib/src/http/http_response_context.dart" />
         <option value="$PROJECT_DIR$/test/streaming_test.dart" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/pubspec.yaml" />
         <option value="$PROJECT_DIR$/lib/src/core/request_context.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/anonymous_service.dart" />
         <option value="$PROJECT_DIR$/lib/src/core/service.dart" />
@@ -249,6 +257,7 @@
         <option value="$PROJECT_DIR$/lib/src/core/core.dart" />
         <option value="$PROJECT_DIR$/test/hooked_test.dart" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/pubspec.yaml" />
       </list>
     </option>
   </component>
@@ -277,10 +286,60 @@
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="AndroidView" />
+      <pane id="ProjectPane" />
+      <pane id="PackagesPane" />
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <expand>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="example" type="cbb8eebc:String" user="example" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="core" type="cbb8eebc:String" user="core" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="lib" type="cbb8eebc:String" user="lib" />
+              <item name="src" type="cbb8eebc:String" user="src" />
+              <item name="http" type="cbb8eebc:String" user="http" />
+            </path>
+            <path>
+              <item name="Root" type="cbb8eebc:String" user="Root" />
+              <item name="framework" type="cbb8eebc:String" user="framework" />
+              <item name="test" type="cbb8eebc:String" user="test" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="GO_FMT" value="false" />
@@ -627,14 +686,7 @@
       <workItem from="1534863259966" duration="198000" />
       <workItem from="1534873119036" duration="4624000" />
       <workItem from="1536696642254" duration="1497000" />
-      <workItem from="1536698151028" duration="136000" />
-    </task>
-    <task id="LOCAL-00117" summary="Strip out TypedService">
-      <created>1534732668246</created>
-      <option name="number" value="00117" />
-      <option name="presentableId" value="LOCAL-00117" />
-      <option name="project" value="LOCAL" />
-      <updated>1534732668246</updated>
+      <workItem from="1536698151028" duration="788000" />
     </task>
     <task id="LOCAL-00118" summary="Make reflector a named parameter">
       <created>1534732811445</created>
@@ -972,7 +1024,14 @@
       <option name="project" value="LOCAL" />
       <updated>1536698069495</updated>
     </task>
-    <option name="localTasksCounter" value="166" />
+    <task id="LOCAL-00166" summary="Bump to 2.0.0-alpha.3">
+      <created>1536698423774</created>
+      <option name="number" value="00166" />
+      <option name="presentableId" value="LOCAL-00166" />
+      <option name="project" value="LOCAL" />
+      <updated>1536698423774</updated>
+    </task>
+    <option name="localTasksCounter" value="167" />
     <servers />
   </component>
   <component name="TestHistory">
@@ -1008,7 +1067,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="193674000" />
+    <option name="totallyTimeSpent" value="194326000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1028,7 +1087,7 @@
       <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5035524" side_tool="true" weight="0.34188035" />
       <window_info anchor="right" id="Maven Projects" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" visible="true" weight="0.31004366" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.31004366" />
       <window_info anchor="right" id="Flutter Outline" order="4" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
@@ -1039,13 +1098,15 @@
       <window_info id="UI Designer" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39857143" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32714286" />
+      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
       <window_info anchor="right" id="Palette&#9;" order="3" />
       <window_info id="Image Layers" order="2" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4964476" weight="0.3973799" />
       <window_info anchor="bottom" id="Version Control" order="7" weight="0.32905984" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.44978166" />
-      <window_info content_ui="combo" id="Project" order="0" weight="0.28615385" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28615385" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="SciView" order="4" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="3" side_tool="true" />
@@ -1056,8 +1117,6 @@
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="DB Browser" order="2" weight="0.32998413" />
-      <window_info anchor="bottom" id="Messages" order="7" weight="0.33478895" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32905984" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Data View" order="4" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -1071,7 +1130,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
-    <MESSAGE value="Remove Angel.inject" />
     <MESSAGE value="Remove dep on package:pool" />
     <MESSAGE value="waterfall now only accepts RequestHandler" />
     <MESSAGE value="Remove req.inject" />
@@ -1096,7 +1154,8 @@
     <MESSAGE value="Add &lt;Id, Data&gt;" />
     <MESSAGE value="Added generic to Routable.use" />
     <MESSAGE value="Add generics to hooked service listeners" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add generics to hooked service listeners" />
+    <MESSAGE value="Bump to 2.0.0-alpha.3" />
+    <option name="LAST_COMMIT_MESSAGE" value="Bump to 2.0.0-alpha.3" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1259,13 +1318,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/injection.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="29">
@@ -1308,13 +1360,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/di_test.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
@@ -1357,28 +1402,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="54">
-          <caret line="292" column="11" selection-start-line="292" selection-start-column="11" selection-end-line="292" selection-end-column="11" />
-          <folding>
-            <element signature="e#39#59#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/typed_service.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="29" column="28" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/core/server.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="38">
           <caret line="328" column="3" lean-forward="true" selection-start-line="328" selection-start-column="3" selection-end-line="328" selection-end-column="3" />
+          <folding>
+            <element signature="e#38#58#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1386,6 +1417,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="70">
           <caret line="86" column="17" selection-start-line="86" selection-start-column="17" selection-end-line="86" selection-end-column="17" />
+          <folding>
+            <element signature="e#40#60#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1426,16 +1460,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
-          <folding>
-            <element signature="e#0#46#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test/common.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="151">
@@ -1443,10 +1467,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="416">
-          <caret line="125" column="48" lean-forward="true" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="144">
+            <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
@@ -1457,13 +1484,54 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="80">
-            <caret line="5" column="66" selection-start-line="5" selection-start-column="66" selection-end-line="5" selection-end-column="66" />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/test/hooked_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="125" column="48" lean-forward="true" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/services_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="23" column="29" selection-start-line="23" selection-start-column="29" selection-end-line="23" selection-end-column="29" />
+          <folding>
+            <element signature="e#0#46#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/service.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="358">
+          <caret line="191" column="33" lean-forward="true" selection-start-line="191" selection-start-column="33" selection-end-line="191" selection-end-column="33" />
+          <folding>
+            <element signature="e#39#59#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/core/request_context.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="464">
+          <caret line="29" column="29" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
+          <folding>
+            <element signature="e#47#67#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/test/precontained_test.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="10" column="12" lean-forward="true" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
         </state>
       </provider>
     </entry>
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index dcf48a73..b3c179a5 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -19,7 +19,7 @@ typedef FutureOr RequestHandler(RequestContext req, ResponseContext res);
 
 /// Sequentially runs a list of [handlers] of middleware, and returns early if any does not
 /// return `true`. Works well with [Router].chain.
-RequestHandler waterfall(Iterable<RequestHandler> handlers) {
+RequestHandler chain(Iterable<RequestHandler> handlers) {
   return (req, res) {
     Future Function() runPipeline;
 
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 66df81ab..5d503534 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -19,7 +19,7 @@ main() {
 
     app.get(
         '/num/parsed/:num',
-        waterfall([
+        chain([
           (req, res) {
             req.params['n'] = num.parse(req.params['num'].toString());
             return true;

From fed8cf74f6ee390f351d0b54ed89fa08348fb804 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 12 Sep 2018 00:18:15 -0400
Subject: [PATCH 295/414] CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 140ac084..35abec92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.4
+* Renamed `waterfall` to `chain`.
+
 # 2.0.0-alpha.3
 * Added `<Id, Data>` type parameters to `Service`.
 * `HookedService` now follows suit, and takes a third parameter, pointing to the inner service.

From c63cb41dfea500a5ecdc66c97c2e6b3c1d5f5d1e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 12 Sep 2018 00:29:53 -0400
Subject: [PATCH 296/414] Test findHookedService, etc.

---
 lib/src/core/hooked_service.dart |  2 +-
 lib/src/core/routable.dart       | 16 +++++++++++++---
 test/hooked_test.dart            | 17 +++++++++--------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index fe499fb2..a8cd6fa6 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -493,7 +493,7 @@ class HookedServiceEvent<Id, Data, T extends Service<Id, Data>> {
   /// Resolves a service from the application.
   ///
   /// Shorthand for `e.service.app.service(...)`.
-  Service getService(Pattern path) => service.app.service(path);
+  Service getService(Pattern path) => service.app.findService(path);
 
   bool _canceled = false;
   String _eventName;
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index b3c179a5..782ac4f3 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -44,6 +44,7 @@ RequestHandler chain(Iterable<RequestHandler> handlers) {
 /// A routable server that can handle dynamic requests.
 class Routable extends Router<RequestHandler> {
   final Map<Pattern, Service> _services = {};
+  final Map<Pattern, Service> _serviceLookups = {};
   final Map configuration = {};
 
   final Container _container;
@@ -73,9 +74,18 @@ class Routable extends Router<RequestHandler> {
   Stream<Service> get onService => _onService.stream;
 
   /// Retrieves the service assigned to the given path.
-  Service service(Pattern path) =>
-      _services[path] ??
-      _services[path.toString().replaceAll(_straySlashes, '')];
+  T findService<T extends Service>(Pattern path) {
+    return _serviceLookups.putIfAbsent(path, () {
+      return _services[path] ??
+          _services[path.toString().replaceAll(_straySlashes, '')];
+    }) as T;
+  }
+
+  /// Shorthand for finding a [HookedService] in a statically-typed
+  HookedService<dynamic, dynamic, T> findHookedService<T extends Service>(
+      Pattern path) {
+    return findService(path) as HookedService<dynamic, dynamic, T>;
+  }
 
   @override
   Route<RequestHandler> addRoute(
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 97fc4980..2dbee135 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -16,16 +16,17 @@ main() {
   HttpServer server;
   String url;
   http.Client client;
-  HookedService Todos;
+  HookedService todoService;
 
   setUp(() async {
     app = new Angel(reflector: MirrorsReflector());
     client = new http.Client();
     app.use('/todos', new MapService());
     app.use('/books', new BookService());
-    Todos = app.service("todos") as HookedService;
 
-    Todos.beforeAllStream().listen((e) {
+    todoService = app.findHookedService<MapService>('todos');
+
+    todoService.beforeAllStream().listen((e) {
       print('Fired ${e.eventName}! Data: ${e.data}; Params: ${e.params}');
     });
 
@@ -43,13 +44,13 @@ main() {
     url = null;
     client.close();
     client = null;
-    Todos = null;
+    todoService = null;
   });
 
   test("listen before and after", () async {
     int count = 0;
 
-    Todos
+    todoService
       ..beforeIndexed.listen((_) {
         count++;
       })
@@ -63,7 +64,7 @@ main() {
   });
 
   test("cancel before", () async {
-    Todos.beforeCreated
+    todoService.beforeCreated
       ..listen((HookedServiceEvent event) {
         event.cancel({"hello": "hooked world"});
       })
@@ -80,7 +81,7 @@ main() {
   });
 
   test("cancel after", () async {
-    Todos.afterIndexed
+    todoService.afterIndexed
       ..listen((HookedServiceEvent event) async {
         // Hooks can be Futures ;)
         event.cancel([
@@ -106,7 +107,7 @@ main() {
   });
 
   test('inject request + response', () async {
-    HookedService books = app.service('books');
+    HookedService books = app.findService('books');
 
     books.beforeIndexed.listen((e) {
       expect([e.request, e.response], everyElement(isNotNull));

From 88b8c6de25b43683359f21e69f444eb64103316e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 12 Sep 2018 00:32:22 -0400
Subject: [PATCH 297/414] Bump to 2.0.0-alpha.4

---
 CHANGELOG.md | 2 ++
 pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35abec92..b5a0f800 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # 2.0.0-alpha.4
 * Renamed `waterfall` to `chain`.
+* Renamed `Routable.service` to `Routable.findService`.
+    * Also `Routable.findHookedService`.
 
 # 2.0.0-alpha.3
 * Added `<Id, Data>` type parameters to `Service`.
diff --git a/pubspec.yaml b/pubspec.yaml
index 826f606e..7f660f26 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.3
+version: 2.0.0-alpha.4
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From b1d685797e3394fd83b3d4dddde857549a215364 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 19 Oct 2018 12:54:05 -0400
Subject: [PATCH 298/414] MapService -> <String, dynamic>

---
 CHANGELOG.md                  |  3 +++
 lib/src/core/map_service.dart | 14 ++++++++------
 pubspec.yaml                  |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5a0f800..2f522884 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.5
+* `MapService` methods now explicitly return `Map<String, dynamic>`.
+
 # 2.0.0-alpha.4
 * Renamed `waterfall` to `chain`.
 * Renamed `Routable.service` to `Routable.findService`.
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index c7d5f93f..adcc854e 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -47,7 +47,7 @@ class MapService extends Service<String, Map<String, dynamic>> {
   }
 
   @override
-  Future<List> index([Map<String, dynamic> params]) {
+  Future<List<Map<String, dynamic>>> index([Map<String, dynamic> params]) {
     if (allowQuery == false || params == null || params['query'] is! Map)
       return new Future.value(items);
     else {
@@ -66,14 +66,15 @@ class MapService extends Service<String, Map<String, dynamic>> {
   }
 
   @override
-  Future<Map> read(String id, [Map<String, dynamic> params]) {
+  Future<Map<String, dynamic>> read(String id, [Map<String, dynamic> params]) {
     return new Future.value(items.firstWhere(_matchesId(id),
         orElse: () => throw new AngelHttpException.notFound(
             message: 'No record found for ID $id')));
   }
 
   @override
-  Future<Map> create(Map<String, dynamic> data, [Map<String, dynamic> params]) {
+  Future<Map<String, dynamic>> create(Map<String, dynamic> data,
+      [Map<String, dynamic> params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
           message:
@@ -92,7 +93,7 @@ class MapService extends Service<String, Map<String, dynamic>> {
   }
 
   @override
-  Future<Map> modify(String id, Map<String, dynamic> data,
+  Future<Map<String, dynamic>> modify(String id, Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
@@ -112,7 +113,7 @@ class MapService extends Service<String, Map<String, dynamic>> {
   }
 
   @override
-  Future<Map> update(String id, Map<String, dynamic> data,
+  Future<Map<String, dynamic>> update(String id, Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
     if (data is! Map)
       throw new AngelHttpException.badRequest(
@@ -140,7 +141,8 @@ class MapService extends Service<String, Map<String, dynamic>> {
   }
 
   @override
-  Future<Map> remove(String id, [Map<String, dynamic> params]) {
+  Future<Map<String, dynamic>> remove(String id,
+      [Map<String, dynamic> params]) {
     if (id == null ||
         id == 'null' &&
             (allowRemoveAll == true ||
diff --git a/pubspec.yaml b/pubspec.yaml
index 7f660f26..ff50f815 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.4
+version: 2.0.0-alpha.5
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From 0d64e101f44c2ca484c0f7b21f7a4ee19d52b3ca Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 21 Oct 2018 04:00:39 -0400
Subject: [PATCH 299/414] Custom container in handleContained

---
 CHANGELOG.md                |  3 +++
 lib/src/core/injection.dart | 17 ++++++++++-------
 lib/src/core/server.dart    | 16 +++++++++-------
 pubspec.yaml                |  2 +-
 test/di_test.dart           | 10 ++++++++++
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f522884..75feac3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.6
+* Allow passing a custom `Container` to `handleContained` and co.
+
 # 2.0.0-alpha.5
 * `MapService` methods now explicitly return `Map<String, dynamic>`.
 
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index ff086ee6..b4737273 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -23,8 +23,9 @@ RequestHandler ioc(Function handler, {Iterable<String> optional: const []}) {
 }
 
 resolveInjection(requirement, InjectionRequest injection, RequestContext req,
-    ResponseContext res, bool throwOnUnresolved) {
+    ResponseContext res, bool throwOnUnresolved, [Container container]) {
   var propFromApp;
+  container ??= req?.container ?? res?.app?.container;
 
   if (requirement == RequestContext) {
     return req;
@@ -56,11 +57,11 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     if (req.params.containsKey(key) ||
         req.app.configuration.containsKey(key) ||
         _primitiveTypes.contains(type)) {
-      return resolveInjection(key, injection, req, res, throwOnUnresolved);
+      return resolveInjection(key, injection, req, res, throwOnUnresolved, container);
     } else
-      return resolveInjection(type, injection, req, res, throwOnUnresolved);
+      return resolveInjection(type, injection, req, res, throwOnUnresolved, container);
   } else if (requirement is Type && requirement != dynamic) {
-    return req.app.container.make(requirement);
+    return container.make(requirement);
   } else if (throwOnUnresolved) {
     throw new ArgumentError(
         '$requirement cannot be injected into a request handler.');
@@ -78,7 +79,8 @@ bool suitableForInjection(
 }
 
 /// Handles a request with a DI-enabled handler.
-RequestHandler handleContained(Function handler, InjectionRequest injection) {
+RequestHandler handleContained(Function handler, InjectionRequest injection,
+    [Container container]) {
   return (RequestContext req, ResponseContext res) {
     if (injection.parameters.isNotEmpty &&
         injection.parameters.values.any((p) => p.match != null) &&
@@ -89,11 +91,12 @@ RequestHandler handleContained(Function handler, InjectionRequest injection) {
 
     Map<Symbol, dynamic> named = {};
     args.addAll(injection.required
-        .map((r) => resolveInjection(r, injection, req, res, true)));
+        .map((r) => resolveInjection(r, injection, req, res, true, container)));
 
     injection.named.forEach((k, v) {
       var name = new Symbol(k);
-      named[name] = resolveInjection([k, v], injection, req, res, false);
+      named[name] =
+          resolveInjection([k, v], injection, req, res, false, container);
     });
 
     return Function.apply(handler, args, named);
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 60d3c421..90167f65 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -306,24 +306,26 @@ class Angel extends Routable {
   /// Run a function after injecting from service container.
   /// If this function has been reflected before, then
   /// the execution will be faster, as the injection requirements were stored beforehand.
-  Future runContained(
-      Function handler, RequestContext req, ResponseContext res) {
+  Future runContained(Function handler, RequestContext req, ResponseContext res,
+      [Container container]) {
     return new Future.sync(() {
       if (_preContained.containsKey(handler)) {
-        return handleContained(handler, _preContained[handler])(req, res);
+        return handleContained(handler, _preContained[handler], container)(
+            req, res);
       }
 
-      return runReflected(handler, req, res);
+      return runReflected(handler, req, res, container);
     });
   }
 
   /// Runs with DI, and *always* reflects. Prefer [runContained].
-  Future runReflected(
-      Function handler, RequestContext req, ResponseContext res) {
+  Future runReflected(Function handler, RequestContext req, ResponseContext res,
+      [Container container]) {
     var h = handleContained(
         handler,
         _preContained[handler] =
-            preInject(handler, req.app.container.reflector));
+            preInject(handler, req.app.container.reflector),
+        container);
     return new Future.sync(() => h(req, res));
     // return   closureMirror.apply(args).reflectee;
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index ff50f815..3e8d1011 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.5
+version: 2.0.0-alpha.6
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this
diff --git a/test/di_test.dart b/test/di_test.dart
index 53bd5493..9d708273 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:angel_container/angel_container.dart';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
@@ -44,6 +45,15 @@ main() {
     await server.close(force: true);
   });
 
+  test('runContained with custom container', () async {
+    var app = new Angel();
+    var c = new Container(const EmptyReflector());
+    c.registerSingleton(new Todo(text: 'Hey!'));
+
+    var r = await app.runContained((Todo t) => t, null, null, c);
+    expect(r, c);
+  });
+
   test("singleton in route", () async {
     validateTodoSingleton(await client.get("$url/errands"));
   });

From f672b3062fe92f7d4179784ce1e6ea60fdd6d124 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 21 Oct 2018 04:00:49 -0400
Subject: [PATCH 300/414] Formatting

---
 lib/src/core/injection.dart | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index b4737273..98c4cb84 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -23,7 +23,8 @@ RequestHandler ioc(Function handler, {Iterable<String> optional: const []}) {
 }
 
 resolveInjection(requirement, InjectionRequest injection, RequestContext req,
-    ResponseContext res, bool throwOnUnresolved, [Container container]) {
+    ResponseContext res, bool throwOnUnresolved,
+    [Container container]) {
   var propFromApp;
   container ??= req?.container ?? res?.app?.container;
 
@@ -57,9 +58,11 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     if (req.params.containsKey(key) ||
         req.app.configuration.containsKey(key) ||
         _primitiveTypes.contains(type)) {
-      return resolveInjection(key, injection, req, res, throwOnUnresolved, container);
+      return resolveInjection(
+          key, injection, req, res, throwOnUnresolved, container);
     } else
-      return resolveInjection(type, injection, req, res, throwOnUnresolved, container);
+      return resolveInjection(
+          type, injection, req, res, throwOnUnresolved, container);
   } else if (requirement is Type && requirement != dynamic) {
     return container.make(requirement);
   } else if (throwOnUnresolved) {

From fc76540155bc30014518267a3dec820fe8fc069e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 21 Oct 2018 04:08:08 -0400
Subject: [PATCH 301/414] runContained custom container test

---
 lib/src/core/server.dart |  4 ++--
 test/di_test.dart        | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 90167f65..1bf3365a 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -321,10 +321,10 @@ class Angel extends Routable {
   /// Runs with DI, and *always* reflects. Prefer [runContained].
   Future runReflected(Function handler, RequestContext req, ResponseContext res,
       [Container container]) {
+    container ??= req?.container ?? res?.app?.container;
     var h = handleContained(
         handler,
-        _preContained[handler] =
-            preInject(handler, req.app.container.reflector),
+        _preContained[handler] = preInject(handler, container.reflector),
         container);
     return new Future.sync(() => h(req, res));
     // return   closureMirror.apply(args).reflectee;
diff --git a/test/di_test.dart b/test/di_test.dart
index 9d708273..e9cdbc97 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -5,6 +5,7 @@ import 'package:angel_container/angel_container.dart';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
+import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
 import 'common.dart';
@@ -47,11 +48,18 @@ main() {
 
   test('runContained with custom container', () async {
     var app = new Angel();
-    var c = new Container(const EmptyReflector());
+    var c = new Container(const MirrorsReflector());
     c.registerSingleton(new Todo(text: 'Hey!'));
 
-    var r = await app.runContained((Todo t) => t, null, null, c);
-    expect(r, c);
+    app.get('/', (req, res) async {
+      return app.runContained((Todo t) => t.text, req, res, c);
+    });
+
+    var rq = new MockHttpRequest('GET', new Uri(path: '/'))..close();
+    var rs = rq.response;
+    await new AngelHttp(app).handleRequest(rq);
+    var text = await rs.transform(utf8.decoder).join();
+    expect(text, json.encode('Hey!'));
   });
 
   test("singleton in route", () async {

From 411ff21dcabe19f4ef122032e9f6beb5b4bb051a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 21 Oct 2018 04:41:35 -0400
Subject: [PATCH 302/414] bump -> 2.0.0-alpha.7

---
 CHANGELOG.md | 4 ++++
 pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75feac3f..73d69b90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.7
+* Force a tigher contract on services. They now must return `Data` on all
+methods except for `index`, which returns a `List<Data>`.
+
 # 2.0.0-alpha.6
 * Allow passing a custom `Container` to `handleContained` and co.
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 3e8d1011..5f96b86f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.6
+version: 2.0.0-alpha.7
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From fab756cc17c2b444a83c87b4728884bcc803f6ba Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 21 Oct 2018 04:44:51 -0400
Subject: [PATCH 303/414] Refactor service contract

---
 lib/src/core/anonymous_service.dart | 20 ++++++++++----------
 lib/src/core/hooked_service.dart    | 12 ++++++------
 lib/src/core/service.dart           | 18 ++++++++----------
 test/anonymous_service_test.dart    |  4 ++--
 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index 408b5ca9..1d3117e2 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -6,18 +6,18 @@ import 'service.dart';
 ///
 /// Well-suited for testing.
 class AnonymousService<Id, Data> extends Service<Id, Data> {
-  FutureOr Function([Map<String, dynamic>]) _index;
-  FutureOr Function(Id, [Map<String, dynamic>]) _read, _remove;
-  FutureOr Function(Data, [Map<String, dynamic>]) _create;
-  Function(Id, Data, [Map<String, dynamic>]) _modify, _update;
+  FutureOr<List<Data>> Function([Map<String, dynamic>]) _index;
+  FutureOr<Data> Function(Id, [Map<String, dynamic>]) _read, _remove;
+  FutureOr<Data> Function(Data, [Map<String, dynamic>]) _create;
+  FutureOr<Data> Function(Id, Data, [Map<String, dynamic>]) _modify, _update;
 
   AnonymousService(
-      {FutureOr index([Map params]),
-      FutureOr read(Id id, [Map params]),
-      FutureOr create(Data data, [Map params]),
-      FutureOr modify(Id id, Data data, [Map params]),
-      FutureOr update(Id id, Data data, [Map params]),
-      FutureOr remove(Id id, [Map params])})
+      {FutureOr<List<Data>> index([Map params]),
+      FutureOr<Data> read(Id id, [Map params]),
+      FutureOr<Data> create(Data data, [Map params]),
+      FutureOr<Data> modify(Id id, Data data, [Map params]),
+      FutureOr<Data> update(Id id, Data data, [Map params]),
+      FutureOr<Data> remove(Id id, [Map params])})
       : super() {
     _index = index;
     _read = read;
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index a8cd6fa6..e6cc202b 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -264,7 +264,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future index([Map<String, dynamic> _params]) {
+  Future<List<Data>> index([Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeIndexed
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -290,7 +290,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future read(Id id, [Map<String, dynamic> _params]) {
+  Future<Data> read(Id id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRead
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -316,7 +316,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future create(Data data, [Map<String, dynamic> _params]) {
+  Future<Data> create(Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeCreated
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -342,7 +342,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future modify(Id id, Data data, [Map<String, dynamic> _params]) {
+  Future<Data> modify(Id id, Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeModified
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -368,7 +368,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future update(Id id, Data data, [Map<String, dynamic> _params]) {
+  Future<Data> update(Id id, Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeUpdated
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
@@ -394,7 +394,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   @override
-  Future remove(Id id, [Map<String, dynamic> _params]) {
+  Future<Data> remove(Id id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRemoved
         ._emit(new HookedServiceEvent(false, _getRequest(_params),
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 106be848..7f6cb952 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -78,51 +78,49 @@ class Service<Id, Data> extends Routable {
   /// If the result is a non-empty [Iterable], [findOne] will return `it.first`, where `it` is the aforementioned [Iterable].
   ///
   /// A custom [errorMessage] may be provided.
-  Future findOne(
+  Future<Data> findOne(
       [Map<String, dynamic> params,
       String errorMessage = 'No record was found matching the given query.']) {
     return index(params).then((result) {
       if (result == null) {
         throw new AngelHttpException.notFound(message: errorMessage);
-      } else if (result is Iterable) {
+      } else {
         if (result.isEmpty) {
           throw new AngelHttpException.notFound(message: errorMessage);
         } else {
           return result.first;
         }
-      } else {
-        return result;
       }
     });
   }
 
   /// Retrieves all resources.
-  Future index([Map<String, dynamic> params]) {
+  Future<List<Data>> index([Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Retrieves the desired resource.
-  Future read(Id id, [Map<String, dynamic> params]) {
+  Future<Data> read(Id id, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Creates a resource.
-  Future create(Data data, [Map<String, dynamic> params]) {
+  Future<Data> create(Data data, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Modifies a resource.
-  Future modify(Id id, Data data, [Map<String, dynamic> params]) {
+  Future<Data> modify(Id id, Data data, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Overwrites a resource.
-  Future update(Id id, Data data, [Map<String, dynamic> params]) {
+  Future<Data> update(Id id, Data data, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
   /// Removes the given resource.
-  Future remove(Id id, [Map<String, dynamic> params]) {
+  Future<Data> remove(Id id, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
   }
 
diff --git a/test/anonymous_service_test.dart b/test/anonymous_service_test.dart
index 7df3601b..3860f783 100644
--- a/test/anonymous_service_test.dart
+++ b/test/anonymous_service_test.dart
@@ -3,8 +3,8 @@ import 'package:test/test.dart';
 
 main() {
   test('custom methods', () async {
-    var svc = new AnonymousService(
-        index: ([p]) async => 'index',
+    var svc = new AnonymousService<String, String>(
+        index: ([p]) async => ['index'],
         read: (id, [p]) async => 'read',
         create: (data, [p]) async => 'create',
         modify: (id, data, [p]) async => 'modify',

From cd1255c670764783021ee80f2578a98902aa9f96 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 21 Oct 2018 04:53:09 -0400
Subject: [PATCH 304/414] Refactor

---
 lib/src/core/hooked_service.dart | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index e6cc202b..cfc2ad0d 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -276,7 +276,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.indexed,
                 params: params, result: before.result))
-            .then((after) => after.result);
+            .then((after) => after.result as List<Data>);
       }
 
       return inner.index(params).then((result) {
@@ -284,7 +284,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.indexed,
                 params: params, result: result))
-            .then((after) => after.result);
+            .then((after) => after.result as List<Data>);
       });
     });
   }
@@ -302,7 +302,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.read,
                 id: id, params: params, result: before.result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       }
 
       return inner.read(id, params).then((result) {
@@ -310,7 +310,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.read,
                 id: id, params: params, result: result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       });
     });
   }
@@ -328,7 +328,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
                 data: data, params: params, result: before.result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       }
 
       return inner.create(data, params).then((result) {
@@ -336,7 +336,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
                 data: data, params: params, result: result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       });
     });
   }
@@ -354,7 +354,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.modified,
                 id: id, data: data, params: params, result: before.result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       }
 
       return inner.modify(id, data, params).then((result) {
@@ -362,7 +362,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
                 id: id, data: data, params: params, result: result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       });
     });
   }
@@ -380,7 +380,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.updated,
                 id: id, data: data, params: params, result: before.result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       }
 
       return inner.update(id, data, params).then((result) {
@@ -388,7 +388,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.updated,
                 id: id, data: data, params: params, result: result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       });
     });
   }
@@ -406,7 +406,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.removed,
                 id: id, params: params, result: before.result))
-            .then((after) => after.result);
+            .then((after) => after.result) as Data;
       }
 
       return inner.remove(id, params).then((result) {
@@ -414,7 +414,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.removed,
                 id: id, params: params, result: result))
-            .then((after) => after.result);
+            .then((after) => after.result as Data);
       });
     });
   }

From 8cfa43229788731c8e4ed75833725aa7d0463514 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 21 Oct 2018 04:54:49 -0400
Subject: [PATCH 305/414] Patch test

---
 test/anonymous_service_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/anonymous_service_test.dart b/test/anonymous_service_test.dart
index 3860f783..8aa8321b 100644
--- a/test/anonymous_service_test.dart
+++ b/test/anonymous_service_test.dart
@@ -10,7 +10,7 @@ main() {
         modify: (id, data, [p]) async => 'modify',
         update: (id, data, [p]) async => 'update',
         remove: (id, [p]) async => 'remove');
-    expect(await svc.index(), 'index');
+    expect(await svc.index(), ['index']);
     expect(await svc.read(null), 'read');
     expect(await svc.create(null), 'create');
     expect(await svc.modify(null, null), 'modify');

From 28707ac2f781cb26f688cff0ad4fc8adf3b89030 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 11:49:41 -0400
Subject: [PATCH 306/414] Bump -> 2.0.0.alpha.8

---
 lib/src/core/hooked_service.dart | 1 -
 pubspec.yaml                     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index cfc2ad0d..658d822a 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -567,7 +567,6 @@ class HookedServiceEventDispatcher<Id, Data, T extends Service<Id, Data>> {
   /// *NOTE*: Callbacks on the returned [Stream] cannot be guaranteed to run before other [listeners].
   /// Use this only if you need a read-only stream of events.
   Stream<HookedServiceEvent<Id, Data, T>> asStream() {
-    // TODO: Close StreamController
     var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     listen(ctrl.add);
diff --git a/pubspec.yaml b/pubspec.yaml
index 5f96b86f..389a5bd6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.7
+version: 2.0.0-alpha.8
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From 0ad95600956fd9a223397c36b0aa0a18cdfb3a35 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 11:54:41 -0400
Subject: [PATCH 307/414] Strip out HTTP

---
 CHANGELOG.md                   | 4 ++++
 example/handle_error.dart      | 1 +
 example/json.dart              | 1 +
 example/main.dart              | 1 +
 example/view.dart              | 1 +
 lib/angel_framework.dart       | 5 ++++-
 lib/src/http/http.dart         | 4 ----
 performance/hello/main.dart    | 1 +
 test/accepts_test.dart         | 1 +
 test/controller_test.dart      | 1 +
 test/detach_test.dart          | 1 +
 test/di_test.dart              | 1 +
 test/encoders_buffer_test.dart | 1 +
 test/extension_test.dart       | 1 +
 test/general_test.dart         | 1 +
 test/hooked_test.dart          | 1 +
 test/parameter_meta_test.dart  | 1 +
 test/precontained_test.dart    | 1 +
 test/primitives_test.dart      | 1 +
 test/repeat_request_test.dart  | 1 +
 test/routing_test.dart         | 1 +
 test/serialize_test.dart       | 1 +
 test/server_test.dart          | 1 +
 test/services_test.dart        | 1 +
 test/streaming_test.dart       | 1 +
 25 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73d69b90..414c0706 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.8
+* No longer export HTTP-specific code from `angel_framework.dart`.
+An import of `import 'package:angel_framework/http.dart';` will be necessary in most cases now.
+
 # 2.0.0-alpha.7
 * Force a tigher contract on services. They now must return `Data` on all
 methods except for `index`, which returns a `List<Data>`.
diff --git a/example/handle_error.dart b/example/handle_error.dart
index 2e7fab11..d4e6a799 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
 
 main() async {
diff --git a/example/json.dart b/example/json.dart
index 0fc28946..1969f510 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -4,6 +4,7 @@ import 'dart:isolate';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 
 main() async {
   int x = 0;
diff --git a/example/main.dart b/example/main.dart
index d52378fc..8beb3aea 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -1,5 +1,6 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
 
 main() async {
diff --git a/example/view.dart b/example/view.dart
index b117993f..570d4a32 100644
--- a/example/view.dart
+++ b/example/view.dart
@@ -1,5 +1,6 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 
 main() async {
   var app = new Angel(reflector: MirrorsReflector());
diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
index b9713ff5..3f63c839 100644
--- a/lib/angel_framework.dart
+++ b/lib/angel_framework.dart
@@ -1,5 +1,8 @@
 /// An easily-extensible web server framework in Dart.
 library angel_framework;
 
+export 'package:angel_http_exception/angel_http_exception.dart';
+export 'package:angel_model/angel_model.dart';
+export 'package:angel_route/angel_route.dart';
+export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'src/core/core.dart';
-export 'src/http/http.dart';
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 3ccd949d..d5187841 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -3,10 +3,6 @@ library angel_framework.http;
 
 import 'dart:async';
 import 'dart:io';
-export 'package:angel_http_exception/angel_http_exception.dart';
-export 'package:angel_model/angel_model.dart';
-export 'package:angel_route/angel_route.dart';
-export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'angel_http.dart';
 export 'controller.dart';
 export 'http_request_context.dart';
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 717cc548..cb6a054f 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -6,6 +6,7 @@ import 'dart:io';
 import 'dart:isolate';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 
 main() async {
   var isolates = <Isolate>[];
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index a7752d0b..7503f816 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 35604b07..cc0f9f24 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:http/http.dart' as http;
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
diff --git a/test/detach_test.dart b/test/detach_test.dart
index eaa600d0..57f4d628 100644
--- a/test/detach_test.dart
+++ b/test/detach_test.dart
@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/di_test.dart b/test/di_test.dart
index e9cdbc97..70c2dc3e 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:angel_container/angel_container.dart';
+import 'package:angel_framework/http.dart';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:http/http.dart' as http;
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 66732c7a..0cc0ca09 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -5,6 +5,7 @@ import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/extension_test.dart b/test/extension_test.dart
index 1fce7b68..23f05d77 100644
--- a/test/extension_test.dart
+++ b/test/extension_test.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/general_test.dart b/test/general_test.dart
index 1692064b..129a3241 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index 2dbee135..bee62afb 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 import 'common.dart';
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index faa6e4b4..6b65ca70 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 22d38e79..dd2e42dd 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 5d503534..c91c19b9 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -3,6 +3,7 @@ import 'dart:io' show stderr;
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index 94d1e8a9..42af1ade 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
 
diff --git a/test/routing_test.dart b/test/routing_test.dart
index b841fd10..c81cfca7 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:http/http.dart' as http;
 import 'package:io/ansi.dart';
 import 'package:logging/logging.dart';
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index a800dc05..b3d3ccd5 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:http/http.dart' as http;
 import 'package:http_parser/http_parser.dart';
 import 'package:test/test.dart';
diff --git a/test/server_test.dart b/test/server_test.dart
index a084f2aa..e0717bf0 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:matcher/matcher.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';
diff --git a/test/services_test.dart b/test/services_test.dart
index 45c5c585..025441ec 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,5 +1,6 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:stack_trace/stack_trace.dart';
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 471c2283..a7d21d15 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -5,6 +5,7 @@ import 'dart:io';
 
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:test/test.dart';

From 8ef86f61a3b48a7598076644da01375e8893158a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 11:56:03 -0400
Subject: [PATCH 308/414] Move Controller to core

---
 lib/src/{http => core}/controller.dart | 0
 lib/src/core/core.dart                 | 1 +
 lib/src/core/response_context.dart     | 2 +-
 lib/src/core/server.dart               | 6 ++----
 lib/src/http/http.dart                 | 1 -
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename lib/src/{http => core}/controller.dart (100%)

diff --git a/lib/src/http/controller.dart b/lib/src/core/controller.dart
similarity index 100%
rename from lib/src/http/controller.dart
rename to lib/src/core/controller.dart
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index 91b03380..c1898302 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -1,4 +1,5 @@
 export 'anonymous_service.dart';
+export 'controller.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
 export 'metadata.dart';
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 9c0dd52f..a1011815 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -10,7 +10,7 @@ import 'package:file/file.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:mime/mime.dart';
 
-import '../http/http.dart';
+import 'controller.dart';
 import 'request_context.dart';
 import 'server.dart' show Angel;
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 1bf3365a..503bcf42 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -13,7 +13,7 @@ import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
 import 'package:tuple/tuple.dart';
 
-import '../http/http.dart';
+import 'controller.dart';
 import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -40,7 +40,6 @@ class Angel extends Routable {
       handlerCache = new HashMap();
 
   Router _flattened;
-  AngelHttp _http;
   bool _isProduction;
   Angel _parent;
 
@@ -212,8 +211,7 @@ class Angel extends Routable {
     shutdownHooks.clear();
     responseFinalizers.clear();
     _flattened = null;
-    _http?.close();
-    return new Future.value(_http?.httpServer);
+    return new Future.value();
   }
 
   @override
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index d5187841..3784acb8 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -4,7 +4,6 @@ library angel_framework.http;
 import 'dart:async';
 import 'dart:io';
 export 'angel_http.dart';
-export 'controller.dart';
 export 'http_request_context.dart';
 export 'http_response_context.dart';
 

From 82b32318e88f5b447d705543f6ea9890f110c589 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 12:18:10 -0400
Subject: [PATCH 309/414] Add service.map

---
 lib/src/core/anonymous_service.dart | 12 ++++++------
 lib/src/core/service.dart           | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index 1d3117e2..2da73870 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -12,12 +12,12 @@ class AnonymousService<Id, Data> extends Service<Id, Data> {
   FutureOr<Data> Function(Id, Data, [Map<String, dynamic>]) _modify, _update;
 
   AnonymousService(
-      {FutureOr<List<Data>> index([Map params]),
-      FutureOr<Data> read(Id id, [Map params]),
-      FutureOr<Data> create(Data data, [Map params]),
-      FutureOr<Data> modify(Id id, Data data, [Map params]),
-      FutureOr<Data> update(Id id, Data data, [Map params]),
-      FutureOr<Data> remove(Id id, [Map params])})
+      {FutureOr<List<Data>> index([Map<String, dynamic> params]),
+      FutureOr<Data> read(Id id, [Map<String, dynamic> params]),
+      FutureOr<Data> create(Data data, [Map<String, dynamic> params]),
+      FutureOr<Data> modify(Id id, Data data, [Map<String, dynamic> params]),
+      FutureOr<Data> update(Id id, Data data, [Map<String, dynamic> params]),
+      FutureOr<Data> remove(Id id, [Map<String, dynamic> params])})
       : super() {
     _index = index;
     _read = read;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 7f6cb952..b6fc9e29 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -6,6 +6,7 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
 
 import '../util.dart';
+import 'anonymous_service.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
 import 'response_context.dart';
@@ -124,6 +125,33 @@ class Service<Id, Data> extends Routable {
     throw new AngelHttpException.methodNotAllowed();
   }
 
+  /// Creates an [AnonymousService] that wraps over this one, and maps input and output
+  /// using two converter functions.
+  /// 
+  /// Handy utility for handling data in a type-safe manner.
+  Service<Id, U> map<U>(U Function(Data) encoder, Data Function(U) decoder) {
+    return new AnonymousService<Id, U>(
+      index: ([params]) {
+        return index(params).then((it) => it.map(encoder).toList());
+      },
+      read: (id, [params]) {
+        return read(id, params).then(encoder);
+      },
+      create: (data, [params]) {
+        return create(decoder(data), params).then(encoder);
+      },
+      modify: (id, data, [params]) {
+        return modify(id, decoder(data), params).then(encoder);
+      },
+      update: (id, data, [params]) {
+        return update(id, decoder(data), params).then(encoder);
+      },
+      remove: (id, [params]) {
+        return remove(id, params).then(encoder);
+      },
+    );
+  }
+
   /// Transforms an [id] (whether it is a String, num, etc.) into one acceptable by a service.
   ///
   /// The single type argument, [T], is used to determine how to parse the [id].

From 86152f7a04efdffeab3a87b6c4f6513840b9af14 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 12:29:09 -0400
Subject: [PATCH 310/414] service map tests

---
 CHANGELOG.md               |  3 ++
 lib/src/core/service.dart  |  2 +-
 test/service_map_test.dart | 80 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 test/service_map_test.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 414c0706..3bbbac2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.9
+* Add `Service.map`.
+
 # 2.0.0-alpha.8
 * No longer export HTTP-specific code from `angel_framework.dart`.
 An import of `import 'package:angel_framework/http.dart';` will be necessary in most cases now.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index b6fc9e29..16a40fad 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -127,7 +127,7 @@ class Service<Id, Data> extends Routable {
 
   /// Creates an [AnonymousService] that wraps over this one, and maps input and output
   /// using two converter functions.
-  /// 
+  ///
   /// Handy utility for handling data in a type-safe manner.
   Service<Id, U> map<U>(U Function(Data) encoder, Data Function(U) decoder) {
     return new AnonymousService<Id, U>(
diff --git a/test/service_map_test.dart b/test/service_map_test.dart
new file mode 100644
index 00000000..0694f128
--- /dev/null
+++ b/test/service_map_test.dart
@@ -0,0 +1,80 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:test/test.dart';
+
+void main() {
+  MapService inner;
+  Service<String, Todo> mapped;
+
+  setUp(() {
+    inner = new MapService();
+    mapped = inner.map<Todo>(Todo.fromMap, Todo.toMap);
+  });
+
+  test('create', () async {
+    var result = await mapped.create(
+      new Todo(text: 'hello', complete: false),
+    );
+    print(result);
+    expect(
+      result,
+      new Todo(text: 'hello', complete: false),
+    );
+  });
+
+  group('after create', () {
+    Todo result;
+    String id;
+
+    setUp(() async {
+      result = await mapped.create(new Todo(text: 'hello', complete: false));
+      id = result.id;
+    });
+
+    test('index', () async {
+      expect(await mapped.index(), [result]);
+    });
+
+    test('modify', () async {
+      var newTodo = new Todo(text: 'yes', complete: true);
+      expect(await mapped.update(id, newTodo), newTodo);
+    });
+
+    test('update', () async {
+      var newTodo = new Todo(id: 'hmmm', text: 'yes', complete: true);
+      expect(await mapped.update(id, newTodo), newTodo);
+    });
+
+    test('read', () async {
+      expect(await mapped.read(id), result);
+    });
+
+    test('remove', () async {
+      expect(await mapped.remove(id), result);
+    });
+  });
+}
+
+class Todo {
+  final String id, text;
+  final bool complete;
+
+  Todo({this.id, this.text, this.complete});
+
+  static Todo fromMap(Map<String, dynamic> json) {
+    return new Todo(
+        id: json['id'] as String,
+        text: json['text'] as String,
+        complete: json['complete'] as bool);
+  }
+
+  static Map<String, dynamic> toMap(Todo model) {
+    return {'id': model.id, 'text': model.text, 'complete': model.complete};
+  }
+
+  @override
+  bool operator ==(other) =>
+      other is Todo && other.text == text && other.complete == complete;
+
+  @override
+  String toString() => '$id:$text($complete)';
+}

From 576dc414e135d902fde694130fc2e357533ae0be Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 12:29:52 -0400
Subject: [PATCH 311/414] update all

---
 test/all.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/all.dart b/test/all.dart
index 21bd6803..10051ce7 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -19,6 +19,7 @@ import 'repeat_request_test.dart' as repeat_request;
 import 'routing_test.dart' as routing;
 import 'serialize_test.dart' as serialize;
 import 'server_test.dart' as server;
+import 'service_map_test.dart' as service_map;
 import 'services_test.dart' as services;
 import 'streaming_test.dart' as streaming;
 import 'view_generator_test.dart' as view_generator;
@@ -44,6 +45,7 @@ main() {
   group('routing', routing.main);
   group('serialize', serialize.main);
   group('server', server.main);
+  group('service_map', service_map.main);
   group('services', services.main);
   group('streaming', streaming.main);
   group('view generator', view_generator.main);

From 0a6b228040467e638df0bfe081b8fdf20370ce02 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 22 Oct 2018 12:30:17 -0400
Subject: [PATCH 312/414] bump

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 389a5bd6..fc696db1 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.8
+version: 2.0.0-alpha.9
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From 7bdf36acd511c5a53681d457ef383a1b4267fd16 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Nov 2018 14:24:38 -0500
Subject: [PATCH 313/414] Change parseId

---
 lib/src/core/service.dart | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 16a40fad..56e5eef3 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -235,7 +235,7 @@ class Service<Id, Data> extends Routable {
     get('/:id', (req, res) {
       return req.parseQuery().then((query) {
         return this.read(
-            parseId(req.params['id']),
+            parseId<Id>(req.params['id']),
             mergeMap([
               {'query': query},
               restProvider,
@@ -254,7 +254,7 @@ class Service<Id, Data> extends Routable {
         (req, res) => req.parseBody().then((body) {
               return req.parseQuery().then((query) {
                 return this.modify(
-                    parseId(req.params['id']),
+                    parseId<Id>(req.params['id']),
                     body as Data,
                     mergeMap([
                       {'query': query},
@@ -275,7 +275,7 @@ class Service<Id, Data> extends Routable {
         (req, res) => req.parseBody().then((body) {
               return req.parseQuery().then((query) {
                 return this.update(
-                    parseId(req.params['id']),
+                    parseId<Id>(req.params['id']),
                     body as Data,
                     mergeMap([
                       {'query': query},
@@ -293,7 +293,7 @@ class Service<Id, Data> extends Routable {
         (req, res) => req.parseBody().then((body) {
               return req.parseQuery().then((query) {
                 return this.update(
-                    parseId(req.params['id']),
+                    parseId<Id>(req.params['id']),
                     body as Data,
                     mergeMap([
                       {'query': query},
@@ -327,7 +327,7 @@ class Service<Id, Data> extends Routable {
     delete('/:id', (req, res) {
       return req.parseQuery().then((query) {
         return this.remove(
-            parseId(req.params['id']),
+            parseId<Id>(req.params['id']),
             mergeMap([
               {'query': query},
               restProvider,

From 8e08c1d85768b27e10b569e0a9a95418ccfa5529 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Nov 2018 14:26:45 -0500
Subject: [PATCH 314/414] Add AngelHttp.uri

---
 CHANGELOG.md                 | 4 ++++
 lib/src/http/angel_http.dart | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bbbac2f..3472afdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.10
+* All calls to `Service.parseId` are now affixed with the `<Id>` argument.
+* Added `uri` getter to `AngelHttp`.
+
 # 2.0.0-alpha.9
 * Add `Service.map`.
 
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 5623d6fe..e645d4c6 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -32,6 +32,10 @@ class AngelHttp {
 
   AngelHttp(this.app, {this.useZone: false});
 
+  /// The path at which this server is listening for requests.
+  Uri get uri => new Uri(
+      scheme: 'http', host: _server.address.address, port: _server.port);
+
   /// The function used to bind this instance to an HTTP server.
   Future<HttpServer> Function(dynamic, int) get serverGenerator =>
       _serverGenerator;

From 2cf10afb06c0a39016ea502c817d92021763ced7 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Nov 2018 14:28:09 -0500
Subject: [PATCH 315/414] Wrap parseQuery

---
 CHANGELOG.md                      | 2 ++
 lib/src/core/request_context.dart | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3472afdd..8986a106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # 2.0.0-alpha.10
 * All calls to `Service.parseId` are now affixed with the `<Id>` argument.
 * Added `uri` getter to `AngelHttp`.
+* The default for `parseQuery` now wraps query parameters in `new Map<String, dynamic>.from`.
+This resolves a bug in `package:angel_validate`.
 
 # 2.0.0-alpha.9
 * Add `Service.map`.
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 0ed60ae7..6f030f2a 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -134,7 +134,8 @@ abstract class RequestContext<RawRequest> {
   /// If [forceParse] is not `true`, then [uri].query will be returned, and no parsing will be performed.
   Future<Map<String, dynamic>> parseQuery({bool forceParse: false}) {
     if (_body == null && forceParse != true)
-      return new Future.value(uri.queryParameters);
+      return new Future.value(
+          new Map<String, dynamic>.from(uri.queryParameters));
     else
       return parse().then((b) => b.query);
   }

From a396f16de370c5d63494b4079edd147465bc7317 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 6 Nov 2018 14:28:56 -0500
Subject: [PATCH 316/414] Bump version

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index fc696db1..93a2d054 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.9
+version: 2.0.0-alpha.10
 description: >
   A high-powered HTTP server with DI, routing and more.
   When combined with the other packages in the Angel ecosystem, this

From 7fec4c243d8731cbe0778a3a2a88df40bdf23ab0 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Nov 2018 21:34:03 -0500
Subject: [PATCH 317/414] Add readMany

---
 CHANGELOG.md              |  3 +++
 lib/src/core/service.dart |  8 ++++++++
 test/services_test.dart   | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8986a106..b8545e00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.11
+* Add `readMany` to `Service`.
+
 # 2.0.0-alpha.10
 * All calls to `Service.parseId` are now affixed with the `<Id>` argument.
 * Added `uri` getter to `AngelHttp`.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 56e5eef3..a5c9306f 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -105,6 +105,14 @@ class Service<Id, Data> extends Routable {
     throw new AngelHttpException.methodNotAllowed();
   }
 
+  /// Reads multiple resources at once.
+  ///
+  /// Service implementations should override this to ensure data is fetched within a
+  /// single round trip.
+  Future<List<Data>> readMany(List<Id> ids, [Map<String, dynamic> params]) {
+    return Future.wait(ids.map((id) => read(id, params)));
+  }
+
   /// Creates a resource.
   Future<Data> create(Data data, [Map<String, dynamic> params]) {
     throw new AngelHttpException.methodNotAllowed();
diff --git a/test/services_test.dart b/test/services_test.dart
index 025441ec..4a8c601e 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
@@ -17,12 +19,13 @@ main() {
     'Content-Type': 'application/json'
   };
   Angel app;
+  MapService service;
   String url;
   http.Client client;
 
   setUp(() async {
     app = new Angel(reflector: MirrorsReflector())
-      ..use('/todos', new MapService())
+      ..use('/todos', service = new MapService())
       ..errorHandler = (e, req, res) {
         print('Whoops: ${e.error}');
         if (e.stackTrace != null) print(new Chain.forTrace(e.stackTrace).terse);
@@ -98,6 +101,17 @@ main() {
       expect(jsons['over'], equals('write'));
     });
 
+    test('readMany', () async {
+      var items = <Map>[
+        await service.create({'foo': 'bar'}),
+        await service.create({'bar': 'baz'}),
+        await service.create({'baz': 'quux'})
+      ];
+
+      var ids = items.map((m) => m['id'] as String).toList();
+      expect(await service.readMany(ids), items);
+    });
+
     test('can delete data', () async {
       String postData = json.encode({'text': 'Hello, world!'});
       var created = await client

From 76532f9509571d29ed84d973c53e9660ef76f6f4 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Nov 2018 21:37:00 -0500
Subject: [PATCH 318/414] Allow redir to Uri

---
 CHANGELOG.md                       | 1 +
 lib/src/core/response_context.dart | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8545e00..98e5ca69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 2.0.0-alpha.11
 * Add `readMany` to `Service`.
+* Allow `ResponseContext.redirect` to take a `Uri`.
 
 # 2.0.0-alpha.10
 * All calls to `Service.parseId` are now affixed with the `<Id>` argument.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index a1011815..a76aaccf 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -175,8 +175,8 @@ abstract class ResponseContext<RawResponse>
     if (!isOpen) throw closed();
     headers
       ..['content-type'] = 'text/html'
-      ..['location'] = url is String
-          ? url
+      ..['location'] = (url is String || url is Uri)
+          ? url.toString()
           : app.navigate(url as Iterable, absolute: absolute);
     statusCode = code ?? 302;
     write('''

From 10b6011abaa4235d7587177d46df5b32fbc56cec Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Nov 2018 21:50:04 -0500
Subject: [PATCH 319/414] Add mountController + test

---
 CHANGELOG.md                 |  1 +
 lib/src/core/controller.dart |  4 +++-
 lib/src/core/server.dart     | 10 ++++++++++
 test/controller_test.dart    |  8 +++++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98e5ca69..3fbe677b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 2.0.0-alpha.11
 * Add `readMany` to `Service`.
 * Allow `ResponseContext.redirect` to take a `Uri`.
+* Add `Angel.mountController`.
 
 # 2.0.0-alpha.10
 * All calls to `Service.parseId` are now affixed with the `<Id>` argument.
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 4d6f71a4..65cf262f 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -30,7 +30,9 @@ class Controller {
     _app = app;
 
     if (injectSingleton != false) {
-      _app.container.registerSingleton(this, as: runtimeType);
+      if (!app.container.has(runtimeType)) {
+        _app.container.registerSingleton(this, as: runtimeType);
+      }
     }
 
     // Load global expose decl
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 503bcf42..39ab2024 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -333,6 +333,16 @@ class Angel extends Routable {
     return new Future.sync(() => configurer(this));
   }
 
+  /// Shorthand for using the [container] to instantiate, and then mount a [Controller].
+  ///
+  /// Just like [Container].make, in contexts without properly-reified generics (dev releases of Dart 2),
+  /// provide a [type] argument as well.
+  ///
+  /// If you are on `Dart >=2.0.0`, simply call `mountController<T>()`..
+  Future mountController<T extends Controller>([Type type]) {
+    return configure(container.make<T>(type).configureServer);
+  }
+
   /// Shorthand for calling `all('*', handler)`.
   Route<RequestHandler> fallback(RequestHandler handler) {
     return all('*', handler);
diff --git a/test/controller_test.dart b/test/controller_test.dart
index cc0f9f24..1f1a42ba 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -59,7 +59,13 @@ main() {
         "/redirect",
         (req, res) async =>
             res.redirectToAction("TodoController@foo", {"foo": "world"}));
-    await app.configure((ctrl = new TodoController()).configureServer);
+
+    // Register as a singleton, just for the purpose of this test
+    if (!app.container.has<TodoController>())
+      app.container.registerSingleton(ctrl = new TodoController());
+
+    // Using mountController<T>();
+    await app.mountController<TodoController>();
 
     print(app.controllers);
     app.dumpTree();

From 681e2ac59626b192547f7cc2275e3dc0ae1088de Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Nov 2018 21:53:07 -0500
Subject: [PATCH 320/414] findServiceOf

---
 CHANGELOG.md               | 1 +
 lib/src/core/routable.dart | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fbe677b..b3410377 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 * Add `readMany` to `Service`.
 * Allow `ResponseContext.redirect` to take a `Uri`.
 * Add `Angel.mountController`.
+* Add `Angel.findServiceOf`.
 
 # 2.0.0-alpha.10
 * All calls to `Service.parseId` are now affixed with the `<Id>` argument.
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 782ac4f3..2a51f01a 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -81,7 +81,12 @@ class Routable extends Router<RequestHandler> {
     }) as T;
   }
 
-  /// Shorthand for finding a [HookedService] in a statically-typed
+  /// Shorthand for finding a [Service] in a statically-typed manner.
+  Service<Id, Data> findServiceOf<Id, Data>(Pattern path) {
+    return findService<Service<Id, Data>>(path);
+  }
+
+  /// Shorthand for finding a [HookedService] in a statically-typed manner.
   HookedService<dynamic, dynamic, T> findHookedService<T extends Service>(
       Pattern path) {
     return findService(path) as HookedService<dynamic, dynamic, T>;

From 2d168dd3aa5aa25be07eb00d54d26605864c77bb Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 7 Nov 2018 23:11:10 -0500
Subject: [PATCH 321/414] Begin rolling in http2

---
 example/http2/body_parsing.dart           |  43 +++
 example/http2/dev.key                     |  29 ++
 example/http2/dev.pem                     |  57 ++++
 example/http2/main.dart                   |  43 +++
 example/http2/pretty_logging.dart         |   9 +
 example/http2/public/app.js               |  27 ++
 example/http2/public/body_parsing.html    |  21 ++
 example/http2/public/index.html           |  12 +
 example/http2/public/style.css            |  20 ++
 example/http2/server_push.dart            |  59 ++++
 lib/http2.dart                            |   3 +
 lib/src/core/core.dart                    |   1 +
 lib/src/core/driver.dart                  | 357 +++++++++++++++++++
 lib/src/http/angel_http.dart              | 399 ++++------------------
 lib/src/http2/angel_http2.dart            | 132 +++++++
 lib/src/http2/http2_request_context.dart  | 174 ++++++++++
 lib/src/http2/http2_response_context.dart | 218 ++++++++++++
 pubspec.yaml                              |   2 +
 test/http2/adapter_test.dart              | 265 ++++++++++++++
 test/http2/http2_client.dart              | 101 ++++++
 test/services_test.dart                   |   2 -
 21 files changed, 1642 insertions(+), 332 deletions(-)
 create mode 100644 example/http2/body_parsing.dart
 create mode 100644 example/http2/dev.key
 create mode 100644 example/http2/dev.pem
 create mode 100644 example/http2/main.dart
 create mode 100644 example/http2/pretty_logging.dart
 create mode 100644 example/http2/public/app.js
 create mode 100644 example/http2/public/body_parsing.html
 create mode 100644 example/http2/public/index.html
 create mode 100644 example/http2/public/style.css
 create mode 100644 example/http2/server_push.dart
 create mode 100644 lib/http2.dart
 create mode 100644 lib/src/core/driver.dart
 create mode 100644 lib/src/http2/angel_http2.dart
 create mode 100644 lib/src/http2/http2_request_context.dart
 create mode 100644 lib/src/http2/http2_response_context.dart
 create mode 100644 test/http2/adapter_test.dart
 create mode 100644 test/http2/http2_client.dart

diff --git a/example/http2/body_parsing.dart b/example/http2/body_parsing.dart
new file mode 100644
index 00000000..b7d0fc77
--- /dev/null
+++ b/example/http2/body_parsing.dart
@@ -0,0 +1,43 @@
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:angel_framework/http2.dart';
+import 'package:file/local.dart';
+import 'package:logging/logging.dart';
+import 'pretty_logging.dart';
+
+main() async {
+  var app = new Angel();
+  app.logger = new Logger('angel')..onRecord.listen(prettyLog);
+
+  var publicDir = new Directory('example/public');
+  var indexHtml =
+      const LocalFileSystem().file(publicDir.uri.resolve('body_parsing.html'));
+
+  app.get('/', (req, res) => res.streamFile(indexHtml));
+
+  app.post('/', (req, res) => req.parseBody());
+
+  var ctx = new SecurityContext()
+    ..useCertificateChain('dev.pem')
+    ..usePrivateKey('dev.key', password: 'dartdart');
+
+  try {
+    ctx.setAlpnProtocols(['h2'], true);
+  } catch (e, st) {
+    app.logger.severe(
+      'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
+      e,
+      st,
+    );
+  }
+
+  var http1 = new AngelHttp(app);
+  var http2 = new AngelHttp2(app, ctx);
+
+  // HTTP/1.x requests will fallback to `AngelHttp`
+  http2.onHttp1.listen(http1.handleRequest);
+
+  var server = await http2.startServer('127.0.0.1', 3000);
+  print('Listening at https://${server.address.address}:${server.port}');
+}
diff --git a/example/http2/dev.key b/example/http2/dev.key
new file mode 100644
index 00000000..5d49ae7e
--- /dev/null
+++ b/example/http2/dev.key
@@ -0,0 +1,29 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE5DAcBgoqhkiG9w0BDAEBMA4ECL7L6rj6uEHGAgIIAASCBMLbucyfqAkgCbhP
+xNSHYllPMAv/dsIjtnsBwepCXPGkCBCuOAw/2FaCHjN9hBqL5V7fkrKeaemhm2YE
+ycPtlHJYPDf3kEkyMjdZ9rIY6kePGfQizs2uJPcXj4YPyQ4HsfVXpOicKfQrouf5
+Mze9bGzeMN065q3iP4dYUMwHAyZYteXCsanQNHlqvsWli0W+H8St8fdsXefZhnv1
+qVatKWdNdWQ9t5MuljgNU2Vv56sHKEYXI0yLxk2QUMk8KlJfnmt8foYUsnPUXHmc
+gIjLKwwVkpdololnEHSNu0cEOUPowjgJru+uMpn7vdNl7TPEQ9jbEgdNg4JwoYzU
+0nao8WzjaSp7kzvZz0VFwKnk5AjstGvvuAWckADdq23QElbn/mF7AG1m/TBpYxzF
+gTt37UdndS/AcvVznWVVrRP5iTSIawdIwvqI4s7rqsoE0GCcak+RhchgAz2gWKkS
+oODUo0JL6pPVbJ3l4ebbaO6c99nDVc8dViPtc1EkStJEJ2O4kI4xgLSCr4Y9ahKn
+oAaoSkX7Xxq3aQm+BzqSpLjdGL8atsqR/YVOIHYIl3gThvP0NfZGx1xHyvO5mCdZ
+kHxSA7tKWxauZ3eQ2clbnzeRsl4El0WMHy/5K1ovene4v7sunmoXVtghBC8hK6eh
+zMO9orex2PNQ/VQC7HCvtytunOVx1lkSBoNo7hR70igg6rW9H7UyoAoBOwMpT1xa
+J6V62nqruTKOqFNfur7aHJGpHGtDb5/ickHeYCyPTvmGp67u4wChzKReeg02oECe
+d1E5FKAcIa8s9TVOB6Z+HvTRNQZu2PsI6TJnjQRowvY9DAHiWTlJZBBY/pko3hxX
+TsIeybpvRdEHpDWv86/iqtw1hv9CUxS/8ZTWUgBo+osShHW79FeDASr9FC4/Zn76
+ZDERTgV4YWlW/klVWcG2lFo7jix+OPXAB+ZQavLhlN1xdWBcIz1AUWjAM4hdPylW
+HCX4PB9CQIPl2E7F+Y2p6nMcMWSJVBi5UIH7E9LfaBguXSzMmTk2Fw5p1aOQ6wfN
+goVAMVwi8ppAVs741PfHdZ295xMmK/1LCxz5DeAdD/tsA/SYfT753GotioDuC7im
+EyJ5JyvTr5I6RFFBuqt3NlUb3Hp16wP3B2x9DZiB6jxr0l341/NHgsyeBXkuIy9j
+ON2mvpBPCJhS8kgWo3G0UyyKnx64tcgpGuSvZhGwPz843B6AbYyE6pMRfSWRMkMS
+YZYa+VNKhR4ixdj07ocFZEWLVjCH7kxkE8JZXKt8jKYmkWd0lS1QVjgaKlO6lRa3
+q6SPJkhW6pvqobvcqVNXwi1XuzpZeEbuh0B7OTekFTTxx5g9XeDl56M8SVQ1KEhT
+Q1t7H2Nba18WCB7cf+6PN0F0K0Jz1Kq7ZWaqEI/grX1m4RQuvNF5807sB/QKMO/Z
+Gz3NXvHg5xTJRd/567lxPGkor0cE7qD1EZfmJ2HrBYXQ91bhgA7LToBuMZo6ZRXH
+QfsanjbP4FPLMiGdQigLjj3A35L/f4sQOOVac/sRaFnm7pzcxsMvyVU/YtvGcjYE
+xaOOVnamg661Wo0wksXoDjeSz/JIyyKO3Gwp1FSm2wGLjjy/Ehmqcqy8rvHuf07w
+AUukhVtTNn4=
+-----END ENCRYPTED PRIVATE KEY-----
\ No newline at end of file
diff --git a/example/http2/dev.pem b/example/http2/dev.pem
new file mode 100644
index 00000000..01756b25
--- /dev/null
+++ b/example/http2/dev.pem
@@ -0,0 +1,57 @@
+-----BEGIN CERTIFICATE-----
+MIIDKTCCAhGgAwIBAgIJAOWmjTS+OnTEMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMMDGludGVybWVkaWF0ZTAeFw0xNTA1MTgwOTAwNDBaFw0yMzA4MDQwOTAwNDBa
+MBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALlcwQJuzd+xH8QFgfJSn5tRlvhkldSX98cE7NiA602NBbnAVyUrkRXq
+Ni75lgt0kwjYfA9z674m8WSVbgpLPintPCla9CYky1TH0keIs8Rz6cGWHryWEHiu
+EDuljQynu2b3sAFuHu9nfWurbJwZnFakBKpdQ9m4EyOZCHC/jHYY7HacKSXg1Cki
+we2ca0BWDrcqy8kLy0dZ5oC6IZG8O8drAK8f3f44CRYw59D3sOKBrKXaabpvyEcb
+N7Wk2HDBVwHpUJo1reVwtbM8dhqQayYSD8oXnGpP3RQNu/e2rzlXRyq/BfcDY1JI
+7TbC4t/7/N4EcPSpGsTcSOC9A7FpzvECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFCnwiEMMFZh7NhCr+qA8K0w4Q+AOMB8GA1UdIwQYMBaAFB0h1Evsaw2vfrmS
+YuoCTmC4EE6ZMA0GCSqGSIb3DQEBCwUAA4IBAQAcFmHMaXRxyoNaeOowQ6iQWoZd
+AUbvG7SHr7I6Pi2aqdqofsKWts7Ytm5WsS0M2nN+sW504houu0iCPeJJX8RQw2q4
+CCcNOs9IXk+2uMzlpocHpv+yYoUiD5DxgWh7eghQMLyMpf8FX3Gy4VazeuXznHOM
+4gE4L417xkDzYOzqVTp0FTyAPUv6G2euhNCD6TMru9REcRhYul+K9kocjA5tt2KG
+MH6y28LXbLyq4YJUxSUU9gY/xlnbbZS48KDqEcdYC9zjW9nQ0qS+XQuQuFIcwjJ5
+V4kAUYxDu6FoTpyQjgsrmBbZlKNxH7Nj4NDlcdJhp/zeSKHqWa5hSWjjKIxp
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAeqgAwIBAgIJAOWmjTS+OnTDMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMMDXJvb3RhdXRob3JpdHkwHhcNMTUwNTE4MDkwMDQwWhcNMjMwODA0MDkwMDQw
+WjAXMRUwEwYDVQQDDAxpbnRlcm1lZGlhdGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDSrAO1CoPvUllgLOzDm5nG0skDF7vh1DUgAIDVGz0ecD0JFbQx
+EF79pju/6MbtpTW2FYvRp11t/G7rGtX923ybOHY/1MNFQrdIvPlO1VV7IGKjoMwP
+DNeb0fIGjHoE9QxaDxR8NX8xQbItpsw+TUtRfc9SLkR+jaYJfVRoM21BOncZbSHE
+YKiZlEbpecB/+EtwVpgvl+8mPD5U07Fi4fp/lza3WXInXQPyiTVllIEJCt4PKmlu
+MocNaJOW38bysL7i0PzDpVZtOxLHOTaW68yF3FckIHNCaA7k1ABEEEegjFMmIao7
+B9w7A0jvr4jZVvNmui5Djjn+oJxwEVVgyf8LAgMBAAGjUDBOMB0GA1UdDgQWBBQd
+IdRL7GsNr365kmLqAk5guBBOmTAfBgNVHSMEGDAWgBRk81s9d0ZbiZhh44KckwPb
+oTc0XzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBZQTK0plfdB5PC
+cC5icut4EmrByJa1RbU7ayuEE70e7hla6KVmVjVdCBGltI4jBYwfhKbRItHiAJ/8
+x+XZKBG8DLPFuDb7lAa1ObhAYF7YThUFPQYaBhfzKcWrdmWDBFpvNv6E0Mm364dZ
+e7Yxmbe5S4agkYPoxEzgEYmcUk9jbjdR6eTbs8laG169ljrECXfEU9RiAcqz5iSX
+NLSewqB47hn3B9qgKcQn+PsgO2j7M+rfklhNgeGJeWmy7j6clSOuCsIjWHU0RLQ4
+0W3SB/rpEAJ7fgQbYUPTIUNALSOWi/o1tDX2mXPRjBoxqAv7I+vYk1lZPmSzkyRh
+FKvRDxsW
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAeugAwIBAgIJAJ0MomS4Ck+8MA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMMDXJvb3RhdXRob3JpdHkwHhcNMTUwNTE4MDkwMDQwWhcNMjMwODA0MDkwMDQw
+WjAYMRYwFAYDVQQDDA1yb290YXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAts1ijtBV92S2cOvpUMOSTp9c6A34nIGr0T5Nhz6XiqRVT+gv
+dQgmkdKJQjbvR60y6jzltYFsI2MpGVXY8h/oAL81D/k7PDB2aREgyBfTPAhBHyGw
+siR+2xYt5b/Zs99q5RdRqQNzNpLPJriIKvUsRyQWy1UiG2s7pRXQeA8qB0XtJdCj
+kFIi+G2bDsaffspGeDOCqt7t+yqvRXfSES0c/l7DIHaiMbbp4//ZNML3RNgAjPz2
+hCezZ+wOYajOIyoSPK8IgICrhYFYxvgWxwbLDBEfC5B3jOQsySe10GoRAKZz1gBV
+DmgReu81tYJmdgkc9zknnQtIFdA0ex+GvZlfWQIDAQABo1AwTjAdBgNVHQ4EFgQU
+ZPNbPXdGW4mYYeOCnJMD26E3NF8wHwYDVR0jBBgwFoAUZPNbPXdGW4mYYeOCnJMD
+26E3NF8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEATzkZ97K777uZ
+lQcduNX3ey4IbCiEzFA2zO5Blj+ilfIwNbZXNOgm/lqNvVGDYs6J1apJJe30vL3X
+J+t2zsZWzzQzb9uIU37zYemt6m0fHrSrx/iy5lGNqt3HMfqEcOqSCOIK3PCTMz2/
+uyGe1iw33PVeWsm1JUybQ9IrU/huJjbgOHU4wab+8SJCM49ipArp68Fr6j4lcEaE
+4rfRg1ZsvxiOyUB3qPn6wyL/JB8kOJ+QCBe498376eaem8AEFk0kQRh6hDaWtq/k
+t6IIXQLjx+EBDVP/veK0UnVhKRP8YTOoV8ZiG1NcdlJmX/Uk7iAfevP7CkBfSN8W
+r6AL284qtw==
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/example/http2/main.dart b/example/http2/main.dart
new file mode 100644
index 00000000..cb37957a
--- /dev/null
+++ b/example/http2/main.dart
@@ -0,0 +1,43 @@
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:angel_framework/http2.dart';
+import 'package:logging/logging.dart';
+import 'pretty_logging.dart';
+
+main() async {
+  var app = new Angel()
+    ..encoders.addAll({
+      'gzip': gzip.encoder,
+      'deflate': zlib.encoder,
+    });
+  app.logger = new Logger('angel')..onRecord.listen(prettyLog);
+
+  app.get('/', (_, __) => 'Hello HTTP/2!!!');
+
+  app.fallback((req, res) => throw new AngelHttpException.notFound(
+      message: 'No file exists at ${req.uri.path}'));
+
+  var ctx = new SecurityContext()
+    ..useCertificateChain('dev.pem')
+    ..usePrivateKey('dev.key', password: 'dartdart');
+
+  try {
+    ctx.setAlpnProtocols(['h2'], true);
+  } catch (e, st) {
+    app.logger.severe(
+      'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
+      e,
+      st,
+    );
+  }
+
+  var http1 = new AngelHttp(app);
+  var http2 = new AngelHttp2(app, ctx);
+
+  // HTTP/1.x requests will fallback to `AngelHttp`
+  http2.onHttp1.listen(http1.handleRequest);
+
+  var server = await http2.startServer('127.0.0.1', 3000);
+  print('Listening at https://${server.address.address}:${server.port}');
+}
diff --git a/example/http2/pretty_logging.dart b/example/http2/pretty_logging.dart
new file mode 100644
index 00000000..14f55e3f
--- /dev/null
+++ b/example/http2/pretty_logging.dart
@@ -0,0 +1,9 @@
+import 'package:logging/logging.dart';
+
+/// Prints the contents of a [LogRecord] with pretty colors.
+void prettyLog(LogRecord record) {
+  print(record.toString());
+
+  if (record.error != null) print(record.error.toString());
+  if (record.stackTrace != null) print(record.stackTrace.toString());
+}
diff --git a/example/http2/public/app.js b/example/http2/public/app.js
new file mode 100644
index 00000000..036c6dc3
--- /dev/null
+++ b/example/http2/public/app.js
@@ -0,0 +1,27 @@
+window.onload = function() {
+  var $app = document.getElementById('app');
+  var $loading = document.getElementById('loading');
+  $app.removeChild($loading);
+  var $button = document.createElement('button');
+  var $h1 = document.createElement('h1');
+  $app.appendChild($h1);
+  $app.appendChild($button);
+
+  $h1.textContent = '~Angel HTTP/2 server push~';
+
+  $button.textContent = 'Change color';
+  $button.onclick = function() {
+    var color = Math.floor(Math.random() * 0xffffff);
+    $h1.style.color = '#' + color.toString(16);
+  };
+
+  $button.onclick();
+
+  window.setInterval($button.onclick, 2000);
+
+  var rotation = 0;
+  window.setInterval(function() {
+    rotation += .6;
+    $button.style.transform = 'rotate(' + rotation + 'deg)';
+  }, 10);
+};
\ No newline at end of file
diff --git a/example/http2/public/body_parsing.html b/example/http2/public/body_parsing.html
new file mode 100644
index 00000000..941d21c1
--- /dev/null
+++ b/example/http2/public/body_parsing.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Angel HTTP/2</title>
+    <style>
+        input:not([type="submit"]) {
+            margin-bottom: 2em;
+        }
+    </style>
+</head>
+<body>
+<form action="/" method="post">
+    <input name="name" placeholder="Your Name" type="text">
+    <input name="password" placeholder="Secret Field" type="password">
+    <input name="age" placeholder="Your Age" type="number">
+    <input name="birthday" placeholder="Your Birthday" type="datetime-local">
+    <input type="submit" value="Submit">
+</form>
+</body>
+</html>
\ No newline at end of file
diff --git a/example/http2/public/index.html b/example/http2/public/index.html
new file mode 100644
index 00000000..f0fe7160
--- /dev/null
+++ b/example/http2/public/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Angel HTTP/2</title>
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+<div id="app"><span id="loading">Loading...</span></div>
+<script src="app.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/example/http2/public/style.css b/example/http2/public/style.css
new file mode 100644
index 00000000..e4348132
--- /dev/null
+++ b/example/http2/public/style.css
@@ -0,0 +1,20 @@
+button {
+    margin-top: 2em;
+}
+
+html, body {
+    background-color: #000;
+}
+
+#app {
+    text-align: center;
+}
+
+#app h1 {
+    font-style: italic;
+    text-decoration: underline;
+}
+
+#loading {
+    color: red;
+}
\ No newline at end of file
diff --git a/example/http2/server_push.dart b/example/http2/server_push.dart
new file mode 100644
index 00000000..814acf4f
--- /dev/null
+++ b/example/http2/server_push.dart
@@ -0,0 +1,59 @@
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:angel_framework/http2.dart';
+import 'package:file/local.dart';
+import 'package:logging/logging.dart';
+import 'pretty_logging.dart';
+
+main() async {
+  var app = new Angel();
+  app.logger = new Logger('angel')..onRecord.listen(prettyLog);
+
+  var publicDir = new Directory('example/public');
+  var indexHtml =
+      const LocalFileSystem().file(publicDir.uri.resolve('index.html'));
+  var styleCss =
+      const LocalFileSystem().file(publicDir.uri.resolve('style.css'));
+  var appJs = const LocalFileSystem().file(publicDir.uri.resolve('app.js'));
+
+  // Send files when requested
+  app
+    ..get('/style.css', (req, res) => res.streamFile(styleCss))
+    ..get('/app.js', (req, res) => res.streamFile(appJs));
+
+  app.get('/', (req, res) async {
+    // Regardless of whether we pushed other resources, let's still send /index.html.
+    await res.streamFile(indexHtml);
+
+    // If the client is HTTP/2 and supports server push, let's
+    // send down /style.css and /app.js as well, to improve initial load time.
+    if (res is Http2ResponseContext && res.canPush) {
+      await res.push('/style.css').streamFile(styleCss);
+      await res.push('/app.js').streamFile(appJs);
+    }
+  });
+
+  var ctx = new SecurityContext()
+    ..useCertificateChain('dev.pem')
+    ..usePrivateKey('dev.key', password: 'dartdart');
+
+  try {
+    ctx.setAlpnProtocols(['h2'], true);
+  } catch (e, st) {
+    app.logger.severe(
+      'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
+      e,
+      st,
+    );
+  }
+
+  var http1 = new AngelHttp(app);
+  var http2 = new AngelHttp2(app, ctx);
+
+  // HTTP/1.x requests will fallback to `AngelHttp`
+  http2.onHttp1.listen(http1.handleRequest);
+
+  var server = await http2.startServer('127.0.0.1', 3000);
+  print('Listening at https://${server.address.address}:${server.port}');
+}
diff --git a/lib/http2.dart b/lib/http2.dart
new file mode 100644
index 00000000..e21891f2
--- /dev/null
+++ b/lib/http2.dart
@@ -0,0 +1,3 @@
+export 'src/http2/angel_http2.dart';
+export 'src/http2/http2_request_context.dart';
+export 'src/http2/http2_response_context.dart';
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index c1898302..3822463a 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -1,5 +1,6 @@
 export 'anonymous_service.dart';
 export 'controller.dart';
+export 'driver.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
 export 'metadata.dart';
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
new file mode 100644
index 00000000..2f2acca2
--- /dev/null
+++ b/lib/src/core/driver.dart
@@ -0,0 +1,357 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io' show stderr, Cookie;
+import 'package:angel_http_exception/angel_http_exception.dart';
+import 'package:angel_route/angel_route.dart';
+import 'package:combinator/combinator.dart';
+import 'package:stack_trace/stack_trace.dart';
+import 'package:tuple/tuple.dart';
+import 'core.dart';
+
+/// Base driver class for Angel implementations.
+///
+/// Powers both AngelHttp and AngelHttp2.
+abstract class Driver<
+    Request,
+    Response,
+    Server extends Stream<Request>,
+    RequestContextType extends RequestContext,
+    ResponseContextType extends ResponseContext> {
+  final Angel app;
+  final bool useZone;
+  bool _closed = false;
+  Server _server;
+  StreamSubscription<Request> _sub;
+
+  /// The function used to bind this instance to a server..
+  final Future<Server> Function(dynamic, int) serverGenerator;
+
+  Driver(this.app, this.serverGenerator, {this.useZone: true});
+
+  /// The path at which this server is listening for requests.
+  Uri get uri;
+
+  /// The native server running this instance.
+  Server get server => _server;
+
+  /// Starts, and returns the server.
+  Future<Server> startServer([address, int port]) {
+    var host = address ?? '127.0.0.1';
+    return serverGenerator(host, port ?? 0).then((server) {
+      _server = server;
+      return Future.wait(app.startupHooks.map(app.configure)).then((_) {
+        app.optimizeForProduction();
+        _sub = server.listen((request) =>
+            handleRawRequest(request, createResponseFromRawRequest(request)));
+        return _server;
+      });
+    });
+  }
+
+  /// Shuts down the underlying server.
+  Future<Server> close() {
+    if (_closed) return new Future.value(_server);
+    _closed = true;
+    _sub?.cancel();
+    return app.close().then((_) =>
+        Future.wait(app.shutdownHooks.map(app.configure)).then((_) => _server));
+  }
+
+  Future<RequestContextType> createRequestContext(
+      Request request, Response response);
+
+  Future<ResponseContextType> createResponseContext(
+      Request request, Response response,
+      [RequestContextType correspondingRequest]);
+
+  void setHeader(Response response, String key, String value);
+
+  void setContentLength(Response response, int length);
+
+  void setChunkedEncoding(Response response, bool value);
+
+  void setStatusCode(Response response, int value);
+
+  void addCookies(Response response, Iterable<Cookie> cookies);
+
+  void writeStringToResponse(Response response, String value);
+
+  void writeToResponse(Response response, List<int> data);
+
+  Uri getUriFromRequest(Request request);
+
+  Future closeResponse(Response response);
+
+  Response createResponseFromRawRequest(Request request);
+
+  /// Handles a single request.
+  Future handleRawRequest(Request request, Response response) {
+    return createRequestContext(request, response).then((req) {
+      return createResponseContext(request, response, req).then((res) {
+        handle() {
+          var path = req.path;
+          if (path == '/') path = '';
+
+          Tuple3<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>>
+              resolveTuple() {
+            Router r = app.optimizedRouter;
+            var resolved =
+                r.resolveAbsolute(path, method: req.method, strip: false);
+
+            return new Tuple3(
+              new MiddlewarePipeline(resolved).handlers,
+              resolved.fold<Map<String, dynamic>>(
+                  <String, dynamic>{}, (out, r) => out..addAll(r.allParams)),
+              resolved.isEmpty ? null : resolved.first.parseResult,
+            );
+          }
+
+          var cacheKey = req.method + path;
+          var tuple = app.isProduction
+              ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
+              : resolveTuple();
+
+          req.params.addAll(tuple.item2);
+
+          req.container.registerSingleton<ParseResult<Map<String, dynamic>>>(
+              tuple.item3);
+          req.container.registerSingleton<ParseResult>(tuple.item3);
+
+          if (!app.isProduction && app.logger != null) {
+            req.container
+                .registerSingleton<Stopwatch>(new Stopwatch()..start());
+          }
+
+          var pipeline = tuple.item1;
+
+          Future Function() runPipeline;
+
+          for (var handler in pipeline) {
+            if (handler == null) break;
+
+            if (runPipeline == null)
+              runPipeline = () =>
+                  Future.sync(() => app.executeHandler(handler, req, res));
+            else {
+              var current = runPipeline;
+              runPipeline = () => current().then((result) => !res.isOpen
+                  ? new Future.value(result)
+                  : app.executeHandler(handler, req, res));
+            }
+          }
+
+          return runPipeline == null
+              ? sendResponse(request, response, req, res)
+              : runPipeline()
+                  .then((_) => sendResponse(request, response, req, res));
+        }
+
+        if (useZone == false) {
+          Future f;
+
+          try {
+            f = handle();
+          } catch (e, st) {
+            f = Future.error(e, st);
+          }
+
+          return f.catchError((e, StackTrace st) {
+            if (e is FormatException)
+              throw new AngelHttpException.badRequest(message: e.message)
+                ..stackTrace = st;
+            throw new AngelHttpException(e,
+                stackTrace: st,
+                statusCode: 500,
+                message: e?.toString() ?? '500 Internal Server Error');
+          }, test: (e) => e is! AngelHttpException).catchError(
+              (ee, StackTrace st) {
+            var e = ee as AngelHttpException;
+
+            if (app.logger != null) {
+              var error = e.error ?? e;
+              var trace =
+                  new Trace.from(e.stackTrace ?? StackTrace.current).terse;
+              app.logger.severe(e.message ?? e.toString(), error, trace);
+            }
+
+            return handleAngelHttpException(
+                e, e.stackTrace ?? st, req, res, request, response);
+          });
+        } else {
+          var zoneSpec = new ZoneSpecification(
+            print: (self, parent, zone, line) {
+              if (app.logger != null)
+                app.logger.info(line);
+              else
+                parent.print(zone, line);
+            },
+            handleUncaughtError: (self, parent, zone, error, stackTrace) {
+              var trace =
+                  new Trace.from(stackTrace ?? StackTrace.current).terse;
+
+              return new Future(() {
+                AngelHttpException e;
+
+                if (error is FormatException) {
+                  e = new AngelHttpException.badRequest(message: error.message);
+                } else if (error is AngelHttpException) {
+                  e = error;
+                } else {
+                  e = new AngelHttpException(error,
+                      stackTrace: stackTrace,
+                      message:
+                          error?.toString() ?? '500 Internal Server Error');
+                }
+
+                if (app.logger != null) {
+                  app.logger.severe(e.message ?? e.toString(), error, trace);
+                }
+
+                return handleAngelHttpException(
+                    e, trace, req, res, request, response);
+              }).catchError((e, StackTrace st) {
+                var trace = new Trace.from(st ?? StackTrace.current).terse;
+                var uri = getUriFromRequest(request);
+                closeResponse(response);
+                // Ideally, we won't be in a position where an absolutely fatal error occurs,
+                // but if so, we'll need to log it.
+                if (app.logger != null) {
+                  app.logger.severe(
+                      'Fatal error occurred when processing $uri.', e, trace);
+                } else {
+                  stderr
+                    ..writeln('Fatal error occurred when processing '
+                        '$uri:')
+                    ..writeln(e)
+                    ..writeln(trace);
+                }
+              });
+            },
+          );
+
+          var zone = Zone.current.fork(specification: zoneSpec);
+          req.container.registerSingleton<Zone>(zone);
+          req.container.registerSingleton<ZoneSpecification>(zoneSpec);
+
+          // If a synchronous error is thrown, it's not caught by `zone.run`,
+          // so use a try/catch, and recover when need be.
+
+          try {
+            return zone.run(handle);
+          } catch (e, st) {
+            zone.handleUncaughtError(e, st);
+            return Future.value();
+          }
+        }
+      });
+    });
+  }
+
+  /// Handles an [AngelHttpException].
+  Future handleAngelHttpException(
+      AngelHttpException e,
+      StackTrace st,
+      RequestContext req,
+      ResponseContext res,
+      Request request,
+      Response response,
+      {bool ignoreFinalizers: false}) {
+    if (req == null || res == null) {
+      try {
+        app.logger?.severe(e, st);
+        setStatusCode(response, 500);
+        writeStringToResponse(response, '500 Internal Server Error');
+        closeResponse(response);
+      } finally {
+        return null;
+      }
+    }
+
+    Future handleError;
+
+    if (!res.isOpen)
+      handleError = new Future.value();
+    else {
+      res.statusCode = e.statusCode;
+      handleError =
+          new Future.sync(() => app.errorHandler(e, req, res)).then((result) {
+        return app.executeHandler(result, req, res).then((_) => res.close());
+      });
+    }
+
+    return handleError.then((_) => sendResponse(request, response, req, res,
+        ignoreFinalizers: ignoreFinalizers == true));
+  }
+
+  /// Sends a response.
+  Future sendResponse(Request request, Response response, RequestContext req,
+      ResponseContext res,
+      {bool ignoreFinalizers: false}) {
+    void _cleanup(_) {
+      if (!app.isProduction && app.logger != null) {
+        var sw = req.container.make<Stopwatch>();
+        app.logger.info(
+            "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
+      }
+    }
+
+    if (!res.isBuffered) return res.close().then(_cleanup);
+
+    Future finalizers = ignoreFinalizers == true
+        ? new Future.value()
+        : app.responseFinalizers.fold<Future>(
+            new Future.value(), (out, f) => out.then((_) => f(req, res)));
+
+    return finalizers.then((_) {
+      if (res.isOpen) res.close();
+
+      for (var key in res.headers.keys) {
+        setHeader(response, key, res.headers[key]);
+      }
+
+      setContentLength(response, res.buffer.length);
+      setChunkedEncoding(response, res.chunked ?? true);
+
+      List<int> outputBuffer = res.buffer.toBytes();
+
+      if (res.encoders.isNotEmpty) {
+        var allowedEncodings = req.headers
+            .value('accept-encoding')
+            ?.split(',')
+            ?.map((s) => s.trim())
+            ?.where((s) => s.isNotEmpty)
+            ?.map((str) {
+          // Ignore quality specifications in accept-encoding
+          // ex. gzip;q=0.8
+          if (!str.contains(';')) return str;
+          return str.split(';')[0];
+        });
+
+        if (allowedEncodings != null) {
+          for (var encodingName in allowedEncodings) {
+            Converter<List<int>, List<int>> encoder;
+            String key = encodingName;
+
+            if (res.encoders.containsKey(encodingName))
+              encoder = res.encoders[encodingName];
+            else if (encodingName == '*') {
+              encoder = res.encoders[key = res.encoders.keys.first];
+            }
+
+            if (encoder != null) {
+              setHeader(response, 'content-encoding', key);
+              outputBuffer = res.encoders[key].convert(outputBuffer);
+              setContentLength(response, outputBuffer.length);
+              break;
+            }
+          }
+        }
+      }
+
+      setStatusCode(response, res.statusCode);
+      addCookies(response, res.cookies);
+      writeToResponse(response, outputBuffer);
+      return closeResponse(response).then(_cleanup);
+    });
+  }
+}
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index e645d4c6..678356cd 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -2,19 +2,13 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io'
     show
-        stderr,
+        Cookie,
         HttpRequest,
         HttpResponse,
         HttpServer,
         Platform,
         SecurityContext;
-
-import 'package:angel_http_exception/angel_http_exception.dart';
-import 'package:angel_route/angel_route.dart';
-import 'package:combinator/combinator.dart';
-import 'package:stack_trace/stack_trace.dart';
-import 'package:tuple/tuple.dart';
-
+import 'package:angel_framework/angel_framework.dart';
 import '../core/core.dart';
 import 'http_request_context.dart';
 import 'http_response_context.dart';
@@ -22,41 +16,32 @@ import 'http_response_context.dart';
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// Adapts `dart:io`'s [HttpServer] to serve Angel.
-class AngelHttp {
-  final Angel app;
-  final bool useZone;
-  bool _closed = false;
-  HttpServer _server;
-  Future<HttpServer> Function(dynamic, int) _serverGenerator = HttpServer.bind;
-  StreamSubscription<HttpRequest> _sub;
+class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
+    HttpRequestContext, HttpResponseContext> {
+  @override
+  Uri get uri =>
+      new Uri(scheme: 'http', host: server.address.address, port: server.port);
 
-  AngelHttp(this.app, {this.useZone: false});
+  AngelHttp._(Angel app,
+      Future<HttpServer> Function(dynamic, int) serverGenerator, bool useZone)
+      : super(app, serverGenerator, useZone: useZone);
 
-  /// The path at which this server is listening for requests.
-  Uri get uri => new Uri(
-      scheme: 'http', host: _server.address.address, port: _server.port);
-
-  /// The function used to bind this instance to an HTTP server.
-  Future<HttpServer> Function(dynamic, int) get serverGenerator =>
-      _serverGenerator;
+  factory AngelHttp(Angel app, {bool useZone: true}) {
+    return new AngelHttp._(app, HttpServer.bind, useZone);
+  }
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory AngelHttp.custom(
       Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator,
       {bool useZone: true}) {
-    return new AngelHttp(app, useZone: useZone)
-      .._serverGenerator = serverGenerator;
+    return new AngelHttp._(app, serverGenerator, useZone);
   }
 
   factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context,
       {bool useZone: true}) {
-    var http = new AngelHttp(app, useZone: useZone);
-
-    http._serverGenerator = (address, int port) {
+    return new AngelHttp._(app, (address, int port) {
       return HttpServer.bindSecure(address, port, context);
-    };
-
-    return http;
+    }, useZone);
   }
 
   /// Creates an HTTPS server.
@@ -73,316 +58,70 @@ class AngelHttp {
     var serverContext = new SecurityContext();
     serverContext.useCertificateChain(certificateChain, password: password);
     serverContext.usePrivateKey(serverKey, password: password);
-
     return new AngelHttp.fromSecurityContext(app, serverContext,
         useZone: useZone);
   }
 
-  /// The native HttpServer running this instance.
-  HttpServer get httpServer => _server;
+  /// Use [server] instead.
+  @deprecated
+  HttpServer get httpServer => server;
 
-  /// Starts the server.
-  ///
-  /// Returns false on failure; otherwise, returns the HttpServer.
-  Future<HttpServer> startServer([address, int port]) {
-    var host = address ?? '127.0.0.1';
-    return _serverGenerator(host, port ?? 0).then((server) {
-      _server = server;
-      return Future.wait(app.startupHooks.map(app.configure)).then((_) {
-        app.optimizeForProduction();
-        _sub = _server.listen(handleRequest);
-        return _server;
-      });
-    });
-  }
+  Future handleRequest(HttpRequest request) =>
+      handleRawRequest(request, request.response);
 
-  /// Shuts down the underlying server.
-  Future<HttpServer> close() {
-    if (_closed) return new Future.value(_server);
-    _closed = true;
-    _sub?.cancel();
-    return app.close().then((_) =>
-        Future.wait(app.shutdownHooks.map(app.configure)).then((_) => _server));
-  }
+  @override
+  void addCookies(HttpResponse response, Iterable<Cookie> cookies) =>
+      response.cookies.addAll(cookies);
 
-  /// Handles a single request.
-  Future handleRequest(HttpRequest request) {
-    return createRequestContext(request).then((req) {
-      return createResponseContext(request.response, req).then((res) {
-        handle() {
-          var path = req.path;
-          if (path == '/') path = '';
+  @override
+  Future closeResponse(HttpResponse response) => response.close();
 
-          Tuple3<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>>
-              resolveTuple() {
-            Router r = app.optimizedRouter;
-            var resolved =
-                r.resolveAbsolute(path, method: req.method, strip: false);
-
-            return new Tuple3(
-              new MiddlewarePipeline(resolved).handlers,
-              resolved.fold<Map<String, dynamic>>(
-                  <String, dynamic>{}, (out, r) => out..addAll(r.allParams)),
-              resolved.isEmpty ? null : resolved.first.parseResult,
-            );
-          }
-
-          var cacheKey = req.method + path;
-          var tuple = app.isProduction
-              ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
-              : resolveTuple();
-
-          req.params.addAll(tuple.item2);
-
-          req.container.registerSingleton<ParseResult<Map<String, dynamic>>>(
-              tuple.item3);
-          req.container.registerSingleton<ParseResult>(tuple.item3);
-
-          if (!app.isProduction && app.logger != null) {
-            req.container
-                .registerSingleton<Stopwatch>(new Stopwatch()..start());
-          }
-
-          var pipeline = tuple.item1;
-
-          Future Function() runPipeline;
-
-          for (var handler in pipeline) {
-            if (handler == null) break;
-
-            if (runPipeline == null)
-              runPipeline = () =>
-                  Future.sync(() => app.executeHandler(handler, req, res));
-            else {
-              var current = runPipeline;
-              runPipeline = () => current().then((result) => !res.isOpen
-                  ? new Future.value(result)
-                  : app.executeHandler(handler, req, res));
-            }
-          }
-
-          return runPipeline == null
-              ? sendResponse(request, req, res)
-              : runPipeline().then((_) => sendResponse(request, req, res));
-        }
-
-        if (useZone == false) {
-          Future f;
-
-          try {
-            f = handle();
-          } catch (e, st) {
-            f = Future.error(e, st);
-          }
-
-          return f.catchError((e, StackTrace st) {
-            if (e is FormatException)
-              throw new AngelHttpException.badRequest(message: e.message)
-                ..stackTrace = st;
-            throw new AngelHttpException(e,
-                stackTrace: st,
-                statusCode: 500,
-                message: e?.toString() ?? '500 Internal Server Error');
-          }, test: (e) => e is! AngelHttpException).catchError(
-              (ee, StackTrace st) {
-            var e = ee as AngelHttpException;
-
-            if (app.logger != null) {
-              var error = e.error ?? e;
-              var trace =
-                  new Trace.from(e.stackTrace ?? StackTrace.current).terse;
-              app.logger.severe(e.message ?? e.toString(), error, trace);
-            }
-
-            return handleAngelHttpException(
-                e, e.stackTrace ?? st, req, res, request);
-          });
-        } else {
-          var zoneSpec = new ZoneSpecification(
-            print: (self, parent, zone, line) {
-              if (app.logger != null)
-                app.logger.info(line);
-              else
-                parent.print(zone, line);
-            },
-            handleUncaughtError: (self, parent, zone, error, stackTrace) {
-              var trace =
-                  new Trace.from(stackTrace ?? StackTrace.current).terse;
-
-              return new Future(() {
-                AngelHttpException e;
-
-                if (error is FormatException) {
-                  e = new AngelHttpException.badRequest(message: error.message);
-                } else if (error is AngelHttpException) {
-                  e = error;
-                } else {
-                  e = new AngelHttpException(error,
-                      stackTrace: stackTrace,
-                      message:
-                          error?.toString() ?? '500 Internal Server Error');
-                }
-
-                if (app.logger != null) {
-                  app.logger.severe(e.message ?? e.toString(), error, trace);
-                }
-
-                return handleAngelHttpException(e, trace, req, res, request);
-              }).catchError((e, StackTrace st) {
-                var trace = new Trace.from(st ?? StackTrace.current).terse;
-                request.response.close();
-                // Ideally, we won't be in a position where an absolutely fatal error occurs,
-                // but if so, we'll need to log it.
-                if (app.logger != null) {
-                  app.logger.severe(
-                      'Fatal error occurred when processing ${request.uri}.',
-                      e,
-                      trace);
-                } else {
-                  stderr
-                    ..writeln('Fatal error occurred when processing '
-                        '${request.uri}:')
-                    ..writeln(e)
-                    ..writeln(trace);
-                }
-              });
-            },
-          );
-
-          var zone = Zone.current.fork(specification: zoneSpec);
-          req.container.registerSingleton<Zone>(zone);
-          req.container.registerSingleton<ZoneSpecification>(zoneSpec);
-
-          // If a synchronous error is thrown, it's not caught by `zone.run`,
-          // so use a try/catch, and recover when need be.
-
-          try {
-            return zone.run(handle);
-          } catch (e, st) {
-            zone.handleUncaughtError(e, st);
-            return Future.value();
-          }
-        }
-      });
-    });
-  }
-
-  /// Handles an [AngelHttpException].
-  Future handleAngelHttpException(AngelHttpException e, StackTrace st,
-      RequestContext req, ResponseContext res, HttpRequest request,
-      {bool ignoreFinalizers: false}) {
-    if (req == null || res == null) {
-      try {
-        app.logger?.severe(e, st);
-        request.response
-          ..statusCode = 500
-          ..write('500 Internal Server Error')
-          ..close();
-      } finally {
-        return null;
-      }
-    }
-
-    Future handleError;
-
-    if (!res.isOpen)
-      handleError = new Future.value();
-    else {
-      res.statusCode = e.statusCode;
-      handleError =
-          new Future.sync(() => app.errorHandler(e, req, res)).then((result) {
-        return app.executeHandler(result, req, res).then((_) => res.close());
-      });
-    }
-
-    return handleError.then((_) => sendResponse(request, req, res,
-        ignoreFinalizers: ignoreFinalizers == true));
-  }
-
-  /// Sends a response.
-  Future sendResponse(
-      HttpRequest request, RequestContext req, ResponseContext res,
-      {bool ignoreFinalizers: false}) {
-    void _cleanup(_) {
-      if (!app.isProduction && app.logger != null) {
-        var sw = req.container.make<Stopwatch>();
-        app.logger.info(
-            "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
-      }
-    }
-
-    if (!res.isBuffered) return res.close().then(_cleanup);
-
-    Future finalizers = ignoreFinalizers == true
-        ? new Future.value()
-        : app.responseFinalizers.fold<Future>(
-            new Future.value(), (out, f) => out.then((_) => f(req, res)));
-
-    return finalizers.then((_) {
-      if (res.isOpen) res.close();
-
-      for (var key in res.headers.keys) {
-        request.response.headers.add(key, res.headers[key]);
-      }
-
-      request.response.contentLength = res.buffer.length;
-      request.response.headers.chunkedTransferEncoding = res.chunked ?? true;
-
-      List<int> outputBuffer = res.buffer.toBytes();
-
-      if (res.encoders.isNotEmpty) {
-        var allowedEncodings = req.headers
-            .value('accept-encoding')
-            ?.split(',')
-            ?.map((s) => s.trim())
-            ?.where((s) => s.isNotEmpty)
-            ?.map((str) {
-          // Ignore quality specifications in accept-encoding
-          // ex. gzip;q=0.8
-          if (!str.contains(';')) return str;
-          return str.split(';')[0];
-        });
-
-        if (allowedEncodings != null) {
-          for (var encodingName in allowedEncodings) {
-            Converter<List<int>, List<int>> encoder;
-            String key = encodingName;
-
-            if (res.encoders.containsKey(encodingName))
-              encoder = res.encoders[encodingName];
-            else if (encodingName == '*') {
-              encoder = res.encoders[key = res.encoders.keys.first];
-            }
-
-            if (encoder != null) {
-              request.response.headers.set('content-encoding', key);
-              outputBuffer = res.encoders[key].convert(outputBuffer);
-              request.response.contentLength = outputBuffer.length;
-              break;
-            }
-          }
-        }
-      }
-
-      request.response
-        ..statusCode = res.statusCode
-        ..cookies.addAll(res.cookies)
-        ..add(outputBuffer);
-
-      return request.response.close().then(_cleanup);
-    });
-  }
-
-  Future<HttpRequestContext> createRequestContext(HttpRequest request) {
+  @override
+  Future<HttpRequestContext> createRequestContext(
+      HttpRequest request, HttpResponse response) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
     if (path.length == 0) path = '/';
     return HttpRequestContext.from(request, app, path);
   }
 
-  Future<ResponseContext> createResponseContext(HttpResponse response,
-          [RequestContext correspondingRequest]) =>
-      new Future<ResponseContext>.value(new HttpResponseContext(
-          response, app, correspondingRequest as HttpRequestContext)
-        ..serializer = (app.serializer ?? json.encode)
-        ..encoders.addAll(app.encoders ?? {}));
+  @override
+  Future<HttpResponseContext> createResponseContext(
+      HttpRequest request, HttpResponse response,
+      [HttpRequestContext correspondingRequest]) {
+    return new Future<HttpResponseContext>.value(
+        new HttpResponseContext(response, app, correspondingRequest)
+          ..serializer = (app.serializer ?? json.encode)
+          ..encoders.addAll(app.encoders ?? {}));
+  }
+
+  @override
+  HttpResponse createResponseFromRawRequest(HttpRequest request) =>
+      request.response;
+
+  @override
+  Uri getUriFromRequest(HttpRequest request) => request.uri;
+
+  @override
+  void setChunkedEncoding(HttpResponse response, bool value) =>
+      response.headers.chunkedTransferEncoding = value;
+
+  @override
+  void setContentLength(HttpResponse response, int length) =>
+      response.headers.contentLength = length;
+
+  @override
+  void setHeader(HttpResponse response, String key, String value) =>
+      response.headers.set(key, value);
+
+  @override
+  void setStatusCode(HttpResponse response, int value) =>
+      response.statusCode = value;
+
+  @override
+  void writeStringToResponse(HttpResponse response, String value) =>
+      response.write(value);
+
+  @override
+  void writeToResponse(HttpResponse response, List<int> data) =>
+      response.add(data);
 }
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
new file mode 100644
index 00000000..e96c1f62
--- /dev/null
+++ b/lib/src/http2/angel_http2.dart
@@ -0,0 +1,132 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart' hide Header;
+import 'package:combinator/combinator.dart';
+import 'package:http2/src/artificial_server_socket.dart';
+import 'package:http2/transport.dart';
+import 'package:mock_request/mock_request.dart';
+import 'http2_request_context.dart';
+import 'http2_response_context.dart';
+import 'package:pool/pool.dart';
+import 'package:uuid/uuid.dart';
+import 'package:tuple/tuple.dart';
+
+class AngelHttp2 extends Driver<Socket, ServerTransportStream,
+    ArtificialServerSocket, Http2RequestContext, Http2ResponseContext> {
+  final ServerSettings settings;
+  final StreamController<HttpRequest> _onHttp1 = new StreamController();
+  final Map<String, MockHttpSession> _sessions = {};
+  final Uuid _uuid = new Uuid();
+  ArtificialServerSocket _artificial;
+  HttpServer _httpServer;
+  StreamController<SecureSocket> _http1;
+  SecureServerSocket _socket;
+  StreamSubscription _sub;
+
+  AngelHttp2._(
+      Angel app,
+      Future<ArtificialServerSocket> Function(dynamic, int) serverGenerator,
+      bool useZone,
+      this.settings)
+      : super(app, serverGenerator, useZone: useZone);
+
+  factory AngelHttp2(Angel app, SecurityContext securityContext,
+      {bool useZone: true, ServerSettings settings}) {
+    return new AngelHttp2.custom(app, securityContext, SecureServerSocket.bind,
+        settings: settings);
+  }
+
+  factory AngelHttp2.custom(
+      Angel app,
+      SecurityContext ctx,
+      Future<SecureServerSocket> serverGenerator(
+          address, int port, SecurityContext ctx),
+      {bool useZone: true,
+      ServerSettings settings}) {
+    return new AngelHttp2._(app, (address, port) {
+      var addr = address is InternetAddress
+          ? address
+          : new InternetAddress(address.toString());
+      return SecureServerSocket.bind(addr, port, ctx)
+          .then((s) => ArtificialServerSocket(addr, port, s));
+    }, useZone, settings);
+  }
+
+  /// Fires when an HTTP/1.x request is received.
+  Stream<HttpRequest> get onHttp1 => _onHttp1.stream;
+
+  @override
+  void addCookies(ServerTransportStream response, Iterable<Cookie> cookies) {
+    var headers = cookies
+        .map((cookie) => new Header.ascii('set-cookie', cookie.toString()));
+    response.sendHeaders(headers.toList());
+  }
+
+  @override
+  Future closeResponse(ServerTransportStream response) {
+    response.terminate();
+    return new Future.value();
+  }
+
+  @override
+  Future<Http2RequestContext> createRequestContext(
+      Socket request, ServerTransportStream response) {
+    return Http2RequestContext.from(response, request, app, _sessions, _uuid);
+  }
+
+  @override
+  Future<Http2ResponseContext> createResponseContext(
+      Socket request, ServerTransportStream response,
+      [Http2RequestContext correspondingRequest]) async {
+    return new Http2ResponseContext(app, response, correspondingRequest)
+      ..encoders.addAll(app.encoders);
+  }
+
+  @override
+  ServerTransportStream createResponseFromRawRequest(Socket request) {
+    var connection =
+        new ServerTransportConnection.viaSocket(request, settings: settings);
+  }
+
+  @override
+  Uri getUriFromRequest(Socket request) {
+    // TODO: implement getUriFromRequest
+  }
+
+  @override
+  void setChunkedEncoding(ServerTransportStream response, bool value) {
+    // Do nothing in HTTP/2
+  }
+
+  @override
+  void setContentLength(ServerTransportStream response, int length) {
+    setHeader(response, 'content-length', length.toString());
+  }
+
+  @override
+  void setHeader(ServerTransportStream response, String key, String value) {
+    response.sendHeaders([new Header.ascii(key, value)]);
+  }
+
+  @override
+  void setStatusCode(ServerTransportStream response, int value) {
+    response.sendHeaders([new Header.ascii(':status', value.toString())]);
+  }
+
+  @override
+  Uri get uri => Uri(
+      scheme: 'https',
+      host: server.address.address,
+      port: server.port != 443 ? server.port : null);
+
+  @override
+  void writeStringToResponse(ServerTransportStream response, String value) {
+    writeToResponse(response, utf8.encode(value));
+  }
+
+  @override
+  void writeToResponse(ServerTransportStream response, List<int> data) {
+    response.sendData(data);
+  }
+}
diff --git a/lib/src/http2/http2_request_context.dart b/lib/src/http2/http2_request_context.dart
new file mode 100644
index 00000000..f207067b
--- /dev/null
+++ b/lib/src/http2/http2_request_context.dart
@@ -0,0 +1,174 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:body_parser/body_parser.dart';
+import 'package:http_parser/http_parser.dart';
+import 'package:http2/transport.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:uuid/uuid.dart';
+
+final RegExp _comma = new RegExp(r',\s*');
+final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+
+class Http2RequestContext extends RequestContext {
+  BytesBuilder _buf;
+  ContentType _contentType;
+  List<Cookie> _cookies;
+  HttpHeaders _headers;
+  String _method, _override, _path;
+  HttpSession _session;
+  Socket _socket;
+  ServerTransportStream _stream;
+  Uri _uri;
+
+  static Future<Http2RequestContext> from(
+      ServerTransportStream stream,
+      Socket socket,
+      Angel app,
+      Map<String, MockHttpSession> sessions,
+      Uuid uuid) async {
+    var req = new Http2RequestContext()
+      ..app = app
+      .._socket = socket
+      .._stream = stream;
+
+    var buf = req._buf = new BytesBuilder();
+    var headers = req._headers = new MockHttpHeaders();
+    String scheme = 'https',
+        authority = '${socket.address.address}:${socket.port}',
+        path = '';
+    var cookies = <Cookie>[];
+
+    await for (var msg in stream.incomingMessages) {
+      if (msg is DataStreamMessage) {
+        buf.add(msg.bytes);
+      } else if (msg is HeadersStreamMessage) {
+        for (var header in msg.headers) {
+          var name = ascii.decode(header.name).toLowerCase();
+          var value = ascii.decode(header.value);
+
+          switch (name) {
+            case ':method':
+              req._method = value;
+              break;
+            case ':path':
+              path = value.replaceAll(_straySlashes, '');
+              req._path = path;
+              if (path.isEmpty) req._path = '/';
+              break;
+            case ':scheme':
+              scheme = value;
+              break;
+            case ':authority':
+              authority = value;
+              break;
+            case 'cookie':
+              var cookieStrings = value.split(';').map((s) => s.trim());
+
+              for (var cookieString in cookieStrings) {
+                try {
+                  cookies.add(new Cookie.fromSetCookieValue(cookieString));
+                } catch (_) {
+                  // Ignore malformed cookies, and just don't add them to the container.
+                }
+              }
+              break;
+            default:
+              headers.add(ascii.decode(header.name), value.split(_comma));
+              break;
+          }
+        }
+      }
+
+      //if (msg.endStream) break;
+    }
+
+    req
+      .._cookies = new List.unmodifiable(cookies)
+      .._uri = Uri.parse('$scheme://$authority').replace(path: path);
+
+    // Apply session
+    var dartSessId =
+        cookies.firstWhere((c) => c.name == 'DARTSESSID', orElse: () => null);
+
+    if (dartSessId == null) {
+      dartSessId = new Cookie('DARTSESSID', uuid.v4());
+    }
+
+    req._session = sessions.putIfAbsent(
+      dartSessId.value,
+      () => new MockHttpSession(id: dartSessId.value),
+    );
+
+    return req;
+  }
+
+  @override
+  List<Cookie> get cookies => _cookies;
+
+  /// The underlying HTTP/2 [ServerTransportStream].
+  ServerTransportStream get stream => _stream;
+
+  @override
+  bool get xhr {
+    return headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
+        'xmlhttprequest';
+  }
+
+  @override
+  Uri get uri => _uri;
+
+  @override
+  HttpSession get session {
+    return _session;
+  }
+
+  @override
+  InternetAddress get remoteAddress => _socket.remoteAddress;
+
+  @override
+  String get path {
+    return _path;
+  }
+
+  @override
+  ContentType get contentType =>
+      _contentType ??= (headers['content-type'] == null
+          ? null
+          : ContentType.parse(headers.value('content-type')));
+
+  @override
+  String get originalMethod {
+    return _method;
+  }
+
+  @override
+  String get method {
+    return _override ?? _method;
+  }
+
+  @override
+  HttpRequest get io => null;
+
+  @override
+  String get hostname => _headers.value('host');
+
+  @override
+  HttpHeaders get headers => _headers;
+
+  @override
+  Future close() {
+    return super.close();
+  }
+
+  @override
+  Future<BodyParseResult> parseOnce() {
+    return parseBodyFromStream(
+      new Stream.fromIterable([_buf.takeBytes()]),
+      contentType == null ? null : new MediaType.parse(contentType.toString()),
+      uri,
+      storeOriginalBuffer: app.storeOriginalBuffer,
+    );
+  }
+}
diff --git a/lib/src/http2/http2_response_context.dart b/lib/src/http2/http2_response_context.dart
new file mode 100644
index 00000000..05cf07b5
--- /dev/null
+++ b/lib/src/http2/http2_response_context.dart
@@ -0,0 +1,218 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart' hide Header;
+import 'package:http2/transport.dart';
+import 'http2_request_context.dart';
+
+class Http2ResponseContext extends ResponseContext {
+  final Angel app;
+  final ServerTransportStream stream;
+  final Http2RequestContext _req;
+  bool _useStream = false, _isClosed = false, _isPush = false;
+  Uri _targetUri;
+
+  Http2ResponseContext(this.app, this.stream, this._req) {
+    _targetUri = _req.uri;
+  }
+
+  final List<Http2ResponseContext> _pushes = [];
+
+  /// Returns `true` if an attempt to [push] a resource will succeed.
+  ///
+  /// See [ServerTransportStream].`push`.
+  bool get canPush => stream.canPush;
+
+  /// Returns a [List] of all resources that have [push]ed to the client.
+  List<Http2ResponseContext> get pushes => new List.unmodifiable(_pushes);
+
+  @override
+  RequestContext get correspondingRequest => _req;
+
+  Uri get targetUri => _targetUri;
+
+  @override
+  HttpResponse get io => null;
+
+  @override
+  bool get streaming => _useStream;
+
+  @override
+  bool get isOpen => !_isClosed;
+
+  /// Write headers, status, etc. to the underlying [stream].
+  void finalize() {
+    if (_isPush) return;
+
+    var headers = <Header>[
+      new Header.ascii(':status', statusCode.toString()),
+    ];
+
+    if (encoders.isNotEmpty && correspondingRequest != null) {
+      var allowedEncodings =
+          (correspondingRequest.headers['accept-encoding'] ?? []).map((str) {
+        // Ignore quality specifications in accept-encoding
+        // ex. gzip;q=0.8
+        if (!str.contains(';')) return str;
+        return str.split(';')[0];
+      });
+
+      for (var encodingName in allowedEncodings) {
+        String key = encodingName;
+
+        if (encoders.containsKey(encodingName)) {
+          this.headers['content-encoding'] = key;
+          break;
+        }
+      }
+    }
+
+    // Add all normal headers
+    for (var key in this.headers.keys) {
+      headers.add(new Header.ascii(key.toLowerCase(), this.headers[key]));
+    }
+
+    // Persist session ID
+    cookies.add(new Cookie('DARTSESSID', _req.session.id));
+
+    // Send all cookies
+    for (var cookie in cookies) {
+      headers.add(new Header.ascii('set-cookie', cookie.toString()));
+    }
+
+    stream.sendHeaders(headers);
+  }
+
+  @override
+  void addError(Object error, [StackTrace stackTrace]) {
+    Zone.current.handleUncaughtError(error, stackTrace);
+    super.addError(error, stackTrace);
+  }
+
+  @override
+  bool useStream() {
+    if (!_useStream) {
+      // If this is the first stream added to this response,
+      // then add headers, status code, etc.
+      finalize();
+
+      willCloseItself = _useStream = _isClosed = true;
+      releaseCorrespondingRequest();
+      return true;
+    }
+
+    return false;
+  }
+
+  @override
+  void end() {
+    _isClosed = true;
+    super.end();
+  }
+
+  @override
+  Future addStream(Stream<List<int>> stream) {
+    if (_isClosed && !_useStream) throw ResponseContext.closed();
+    var firstStream = useStream();
+
+    Stream<List<int>> output = stream;
+
+    if ((firstStream || !headers.containsKey('content-encoding')) &&
+        encoders.isNotEmpty &&
+        correspondingRequest != null) {
+      var allowedEncodings =
+          (correspondingRequest.headers['accept-encoding'] ?? []).map((str) {
+        // Ignore quality specifications in accept-encoding
+        // ex. gzip;q=0.8
+        if (!str.contains(';')) return str;
+        return str.split(';')[0];
+      });
+
+      for (var encodingName in allowedEncodings) {
+        Converter<List<int>, List<int>> encoder;
+        String key = encodingName;
+
+        if (encoders.containsKey(encodingName))
+          encoder = encoders[encodingName];
+        else if (encodingName == '*') {
+          encoder = encoders[key = encoders.keys.first];
+        }
+
+        if (encoder != null) {
+          /*
+          if (firstStream) {
+            this.stream.sendHeaders([
+              new Header.ascii(
+                  'content-encoding', headers['content-encoding'] = key)
+            ]);
+          }
+          */
+
+          output = encoders[key].bind(output);
+          break;
+        }
+      }
+    }
+
+    return output.forEach(this.stream.sendData);
+  }
+
+  @override
+  void add(List<int> data) {
+    if (_isClosed && !_useStream)
+      throw ResponseContext.closed();
+    else if (_useStream)
+      //stream.sendData(data);
+      addStream(new Stream.fromIterable([data]));
+    else
+      buffer.add(data);
+  }
+
+  @override
+  Future close() async {
+    if (_useStream) {
+      try {
+        await stream.outgoingMessages.close();
+      } catch (_) {
+        // This only seems to occur on `MockHttpRequest`, but
+        // this try/catch prevents a crash.
+      }
+    }
+
+    _isClosed = true;
+    await super.close();
+    _useStream = false;
+  }
+
+  /// Pushes a resource to the client.
+  Http2ResponseContext push(String path,
+      {Map<String, String> headers: const {}, String method: 'GET'}) {
+    if (isOpen)
+      throw new StateError(
+          'You can only push resources after the main response context is closed. You will need to use streaming methods, i.e. `addStream`.');
+
+    var targetUri = _req.uri.replace(path: path);
+
+    var h = <Header>[
+      new Header.ascii(':authority', targetUri.authority),
+      new Header.ascii(':method', method),
+      new Header.ascii(':path', targetUri.path),
+      new Header.ascii(':scheme', targetUri.scheme),
+    ];
+
+    for (var key in headers.keys) {
+      h.add(new Header.ascii(key, headers[key]));
+    }
+
+    var s = stream.push(h);
+    var r = new Http2ResponseContext(app, s, _req)
+      .._isPush = true
+      .._targetUri = targetUri;
+    _pushes.add(r);
+    return r;
+  }
+
+  void internalReopen() {
+    _isClosed = false;
+  }
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index 93a2d054..a9b080fb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -21,6 +21,7 @@ dependencies:
   dart2_constant: ^1.0.0
   file: ^5.0.0
   http_parser: ^3.0.0
+  http2: ">=0.1.7 <2.0.0"
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
   merge_map: ^1.0.0
@@ -29,6 +30,7 @@ dependencies:
   path: ^1.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0
+  uuid: ^1.0.0
 dev_dependencies:
   http: ^0.11.3
   io: ^0.3.0
diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
new file mode 100644
index 00000000..1543516a
--- /dev/null
+++ b/test/http2/adapter_test.dart
@@ -0,0 +1,265 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart' hide Header;
+import 'package:angel_framework/http2.dart';
+import 'package:http/src/multipart_file.dart' as http;
+import 'package:http/src/multipart_request.dart' as http;
+import 'package:http/http.dart' as http;
+import 'package:http2/transport.dart';
+import 'package:http_parser/http_parser.dart';
+import 'package:test/test.dart';
+import 'http2_client.dart';
+
+const String jfk =
+    'Ask not what your country can do for you, but what you can do for your country.';
+
+Stream<List<int>> jfkStream() {
+  return new Stream.fromIterable([utf8.encode(jfk)]);
+}
+
+void main() {
+  var client = new Http2Client();
+  Angel app;
+  AngelHttp2 http2;
+  Uri serverRoot;
+
+  setUp(() async {
+    app = new Angel()
+      ..keepRawRequestBuffers = true
+      ..encoders['gzip'] = gzip.encoder;
+
+    app.get('/', (req, res) {
+      res
+        ..write('Hello world')
+        ..close();
+    });
+
+    app.all('/method', (req, res) => req.method);
+
+    app.get('/json', (_, __) => {'foo': 'bar'});
+
+    app.get('/stream', (req, res) => jfkStream().pipe(res));
+
+    app.get('/headers', (req, res) {
+      res
+        ..headers.addAll({'foo': 'bar', 'x-angel': 'http2'})
+        ..close();
+    });
+
+    app.get('/status', (req, res) {
+      res
+        ..statusCode = 1337
+        ..close();
+    });
+
+    app.post('/body', (req, res) => req.parseBody());
+
+    app.post('/upload', (req, res) async {
+      var body = await req.parseBody(), files = await req.parseUploadedFiles();
+      stdout.add(await req.parseRawRequestBuffer());
+      var file = files.firstWhere((f) => f.name == 'file');
+      return [file.data.length, file.mimeType, body];
+    });
+
+    app.get('/push', (req, res) async {
+      res
+        ..write('ok')
+        ..close();
+
+      if (res is Http2ResponseContext && res.canPush) {
+        res.push('a')
+          ..write('a')
+          ..close();
+
+        res.push('b')
+          ..write('b')
+          ..close();
+      }
+    });
+
+    var ctx = new SecurityContext()
+      ..useCertificateChain('dev.pem')
+      ..usePrivateKey('dev.key', password: 'dartdart')
+      ..setAlpnProtocols(['h2'], true);
+
+    http2 = new AngelHttp2(app, ctx);
+
+    var server = await http2.startServer();
+    serverRoot = Uri.parse('https://127.0.0.1:${server.port}');
+  });
+
+  tearDown(() async {
+    await http2.close();
+  });
+
+  test('buffered response', () async {
+    var response = await client.get(serverRoot);
+    expect(response.body, 'Hello world');
+  });
+
+  test('streamed response', () async {
+    var response = await client.get(serverRoot.replace(path: '/stream'));
+    expect(response.body, jfk);
+  });
+
+  group('gzip', () {
+    test('buffered response', () async {
+      var response = await client
+          .get(serverRoot, headers: {'accept-encoding': 'gzip, deflate, br'});
+      expect(response.headers['content-encoding'], 'gzip');
+      var decoded = gzip.decode(response.bodyBytes);
+      expect(utf8.decode(decoded), 'Hello world');
+    });
+
+    test('streamed response', () async {
+      var response = await client.get(serverRoot.replace(path: '/stream'),
+          headers: {'accept-encoding': 'gzip'});
+      expect(response.headers['content-encoding'], 'gzip');
+      //print(response.body);
+      var decoded = gzip.decode(response.bodyBytes);
+      expect(utf8.decode(decoded), jfk);
+    });
+  });
+
+  test('method parsed', () async {
+    var response = await client.delete(serverRoot.replace(path: '/method'));
+    expect(response.body, json.encode('DELETE'));
+  });
+
+  test('json response', () async {
+    var response = await client.get(serverRoot.replace(path: '/json'));
+    expect(response.body, json.encode({'foo': 'bar'}));
+    expect(ContentType.parse(response.headers['content-type']).mimeType,
+        ContentType.json.mimeType);
+  });
+
+  test('status sent', () async {
+    var response = await client.get(serverRoot.replace(path: '/status'));
+    expect(response.statusCode, 1337);
+  });
+
+  test('headers sent', () async {
+    var response = await client.get(serverRoot.replace(path: '/headers'));
+    expect(response.headers['foo'], 'bar');
+    expect(response.headers['x-angel'], 'http2');
+  });
+
+  test('server push', () async {
+    var socket = await SecureSocket.connect(
+      serverRoot.host,
+      serverRoot.port ?? 443,
+      onBadCertificate: (_) => true,
+      supportedProtocols: ['h2'],
+    );
+
+    var connection = new ClientTransportConnection.viaSocket(
+      socket,
+      settings: new ClientSettings(allowServerPushes: true),
+    );
+
+    var headers = <Header>[
+      new Header.ascii(':authority', serverRoot.authority),
+      new Header.ascii(':method', 'GET'),
+      new Header.ascii(':path', serverRoot.replace(path: '/push').path),
+      new Header.ascii(':scheme', serverRoot.scheme),
+    ];
+
+    var stream = await connection.makeRequest(headers, endStream: true);
+
+    var bb = await stream.incomingMessages
+        .where((s) => s is DataStreamMessage)
+        .cast<DataStreamMessage>()
+        .fold<BytesBuilder>(
+            new BytesBuilder(), (out, msg) => out..add(msg.bytes));
+
+    // Check that main body was sent
+    expect(utf8.decode(bb.takeBytes()), 'ok');
+
+    var pushes = await stream.peerPushes.toList();
+    expect(pushes, hasLength(2));
+
+    var pushA = pushes[0], pushB = pushes[1];
+
+    String getPath(TransportStreamPush p) => ascii.decode(p.requestHeaders
+        .firstWhere((h) => ascii.decode(h.name) == ':path')
+        .value);
+
+    /*
+    Future<String> getBody(ClientTransportStream stream) async {
+      await stream.outgoingMessages.close();
+      var bb = await stream.incomingMessages
+          .map((s) {
+            if (s is HeadersStreamMessage) {
+              for (var h in s.headers) {
+                print('${ASCII.decode(h.name)}: ${ASCII.decode(h.value)}');
+              }
+            } else if (s is DataStreamMessage) {
+              print(UTF8.decode(s.bytes));
+            }
+
+            return s;
+          })
+          .where((s) => s is DataStreamMessage)
+          .cast<DataStreamMessage>()
+          .fold<BytesBuilder>(
+              new BytesBuilder(), (out, msg) => out..add(msg.bytes));
+      return UTF8.decode(bb.takeBytes());
+    }
+    */
+
+    expect(getPath(pushA), '/a');
+    expect(getPath(pushB), '/b');
+
+    // TODO: Dart http/2 client seems to not be able to get body
+    // However, Chrome, Firefox, Edge all can
+    //expect(await getBody(pushA.stream), 'a');
+    //expect(await getBody(pushB.stream), 'b');
+  });
+
+  group('body parsing', () {
+    test('urlencoded body parsed', () async {
+      var response = await client.post(
+        serverRoot.replace(path: '/body'),
+        headers: {
+          'accept': 'application/json',
+          'content-type': 'application/x-www-form-urlencoded'
+        },
+        body: 'foo=bar',
+      );
+      expect(response.body, json.encode({'foo': 'bar'}));
+    });
+
+    test('json body parsed', () async {
+      var response = await client.post(serverRoot.replace(path: '/body'),
+          headers: {
+            'accept': 'application/json',
+            'content-type': 'application/json'
+          },
+          body: json.encode({'foo': 'bar'}));
+      expect(response.body, json.encode({'foo': 'bar'}));
+    });
+
+    test('multipart body parsed', () async {
+      var rq = new http.MultipartRequest(
+          'POST', serverRoot.replace(path: '/upload'));
+      rq.headers.addAll({'accept': 'application/json'});
+
+      rq.fields['foo'] = 'bar';
+      rq.files.add(new http.MultipartFile(
+          'file', new Stream.fromIterable([utf8.encode('hello world')]), 11,
+          contentType: new MediaType('angel', 'framework')));
+
+      var response = await client.send(rq);
+      var responseBody = await response.stream.transform(utf8.decoder).join();
+
+      expect(
+          responseBody,
+          json.encode([
+            11,
+            'angel/framework',
+            {'foo': 'bar'}
+          ]));
+    });
+  });
+}
diff --git a/test/http2/http2_client.dart b/test/http2/http2_client.dart
new file mode 100644
index 00000000..5263d2b7
--- /dev/null
+++ b/test/http2/http2_client.dart
@@ -0,0 +1,101 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:http/http.dart';
+import 'package:http2/transport.dart';
+
+/// Simple HTTP/2 client
+class Http2Client extends BaseClient {
+  static Future<ClientTransportStream> convertRequestToStream(
+      BaseRequest request) async {
+    // Connect a socket
+    var socket = await SecureSocket.connect(
+      request.url.host,
+      request.url.port ?? 443,
+      onBadCertificate: (_) => true,
+      supportedProtocols: ['h2'],
+    );
+
+    var connection = new ClientTransportConnection.viaSocket(socket);
+
+    var headers = <Header>[
+      new Header.ascii(':authority', request.url.authority),
+      new Header.ascii(':method', request.method),
+      new Header.ascii(':path', request.url.path),
+      new Header.ascii(':scheme', request.url.scheme),
+    ];
+
+    var bb = await request
+        .finalize()
+        .fold<BytesBuilder>(new BytesBuilder(), (out, list) => out..add(list));
+    var body = bb.takeBytes();
+
+    if (body.isNotEmpty) {
+      headers.add(new Header.ascii('content-length', body.length.toString()));
+    }
+
+    request.headers.forEach((k, v) {
+      headers.add(new Header.ascii(k, v));
+    });
+
+    var stream = await connection.makeRequest(headers);
+
+    if (body.isNotEmpty) {
+      stream.sendData(body, endStream: true);
+    } else {
+      stream.outgoingMessages.close();
+    }
+
+    return stream;
+  }
+
+  /// Returns `true` if the response stream was closed.
+  static Future<bool> readResponse(ClientTransportStream stream,
+      Map<String, String> headers, BytesBuilder body) {
+    var c = new Completer<bool>();
+    var closed = false;
+
+    stream.incomingMessages.listen(
+      (msg) {
+        if (msg is HeadersStreamMessage) {
+          for (var header in msg.headers) {
+            var name = ascii.decode(header.name).toLowerCase(),
+                value = ascii.decode(header.value);
+            headers[name] = value;
+            //print('$name: $value');
+          }
+        } else if (msg is DataStreamMessage) {
+          body.add(msg.bytes);
+        }
+
+        if (!closed && msg.endStream) closed = true;
+      },
+      cancelOnError: true,
+      onError: c.completeError,
+      onDone: () => c.complete(closed),
+    );
+
+    return c.future;
+  }
+
+  @override
+  Future<StreamedResponse> send(BaseRequest request) async {
+    var stream = await convertRequestToStream(request);
+    var headers = <String, String>{};
+    var body = new BytesBuilder();
+    var closed = await readResponse(stream, headers, body);
+    return new StreamedResponse(
+      new Stream.fromIterable([body.takeBytes()]),
+      int.parse(headers[':status']),
+      headers: headers,
+      isRedirect: headers.containsKey('location'),
+      contentLength: headers.containsKey('content-length')
+          ? int.parse(headers['content-length'])
+          : null,
+      request: request,
+      reasonPhrase: null,
+      // doesn't exist in HTTP/2
+      persistentConnection: !closed,
+    );
+  }
+}
diff --git a/test/services_test.dart b/test/services_test.dart
index 4a8c601e..d5e4e7d0 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -1,5 +1,3 @@
-import 'dart:async';
-
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';

From bf0f01a5b905b9377eee733356548f1d90e7108b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 10 Nov 2018 20:07:09 -0500
Subject: [PATCH 322/414] 2.0.0-alpha.11

---
 dev.key                                   |  29 ++++
 dev.pem                                   |  57 ++++++
 example/http2/main.dart                   |   6 +-
 example/main.dart                         |   2 +-
 lib/src/core/driver.dart                  |  48 +++--
 lib/src/core/request_context.dart         |  12 +-
 lib/src/core/response_context.dart        |  30 +++-
 lib/src/http/angel_http.dart              |  14 +-
 lib/src/http/http_request_context.dart    |   9 -
 lib/src/http/http_response_context.dart   |  10 ++
 lib/src/http2/angel_http2.dart            | 128 +++++++++++---
 lib/src/http2/http2_request_context.dart  |  31 ++--
 lib/src/http2/http2_response_context.dart | 202 ++++++++++++----------
 pubspec.yaml                              |   9 +-
 test/accepts_test.dart                    |   2 +-
 test/controller_test.dart                 |   6 +-
 test/encoders_buffer_test.dart            |   2 +-
 test/extension_test.dart                  |   2 +-
 test/http2/adapter_test.dart              |  28 ++-
 test/primitives_test.dart                 |   4 +-
 test/routing_test.dart                    |   6 +-
 test/server_test.dart                     |  10 +-
 tool/travis.sh                            |   4 +-
 23 files changed, 418 insertions(+), 233 deletions(-)
 create mode 100644 dev.key
 create mode 100644 dev.pem

diff --git a/dev.key b/dev.key
new file mode 100644
index 00000000..5d49ae7e
--- /dev/null
+++ b/dev.key
@@ -0,0 +1,29 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIE5DAcBgoqhkiG9w0BDAEBMA4ECL7L6rj6uEHGAgIIAASCBMLbucyfqAkgCbhP
+xNSHYllPMAv/dsIjtnsBwepCXPGkCBCuOAw/2FaCHjN9hBqL5V7fkrKeaemhm2YE
+ycPtlHJYPDf3kEkyMjdZ9rIY6kePGfQizs2uJPcXj4YPyQ4HsfVXpOicKfQrouf5
+Mze9bGzeMN065q3iP4dYUMwHAyZYteXCsanQNHlqvsWli0W+H8St8fdsXefZhnv1
+qVatKWdNdWQ9t5MuljgNU2Vv56sHKEYXI0yLxk2QUMk8KlJfnmt8foYUsnPUXHmc
+gIjLKwwVkpdololnEHSNu0cEOUPowjgJru+uMpn7vdNl7TPEQ9jbEgdNg4JwoYzU
+0nao8WzjaSp7kzvZz0VFwKnk5AjstGvvuAWckADdq23QElbn/mF7AG1m/TBpYxzF
+gTt37UdndS/AcvVznWVVrRP5iTSIawdIwvqI4s7rqsoE0GCcak+RhchgAz2gWKkS
+oODUo0JL6pPVbJ3l4ebbaO6c99nDVc8dViPtc1EkStJEJ2O4kI4xgLSCr4Y9ahKn
+oAaoSkX7Xxq3aQm+BzqSpLjdGL8atsqR/YVOIHYIl3gThvP0NfZGx1xHyvO5mCdZ
+kHxSA7tKWxauZ3eQ2clbnzeRsl4El0WMHy/5K1ovene4v7sunmoXVtghBC8hK6eh
+zMO9orex2PNQ/VQC7HCvtytunOVx1lkSBoNo7hR70igg6rW9H7UyoAoBOwMpT1xa
+J6V62nqruTKOqFNfur7aHJGpHGtDb5/ickHeYCyPTvmGp67u4wChzKReeg02oECe
+d1E5FKAcIa8s9TVOB6Z+HvTRNQZu2PsI6TJnjQRowvY9DAHiWTlJZBBY/pko3hxX
+TsIeybpvRdEHpDWv86/iqtw1hv9CUxS/8ZTWUgBo+osShHW79FeDASr9FC4/Zn76
+ZDERTgV4YWlW/klVWcG2lFo7jix+OPXAB+ZQavLhlN1xdWBcIz1AUWjAM4hdPylW
+HCX4PB9CQIPl2E7F+Y2p6nMcMWSJVBi5UIH7E9LfaBguXSzMmTk2Fw5p1aOQ6wfN
+goVAMVwi8ppAVs741PfHdZ295xMmK/1LCxz5DeAdD/tsA/SYfT753GotioDuC7im
+EyJ5JyvTr5I6RFFBuqt3NlUb3Hp16wP3B2x9DZiB6jxr0l341/NHgsyeBXkuIy9j
+ON2mvpBPCJhS8kgWo3G0UyyKnx64tcgpGuSvZhGwPz843B6AbYyE6pMRfSWRMkMS
+YZYa+VNKhR4ixdj07ocFZEWLVjCH7kxkE8JZXKt8jKYmkWd0lS1QVjgaKlO6lRa3
+q6SPJkhW6pvqobvcqVNXwi1XuzpZeEbuh0B7OTekFTTxx5g9XeDl56M8SVQ1KEhT
+Q1t7H2Nba18WCB7cf+6PN0F0K0Jz1Kq7ZWaqEI/grX1m4RQuvNF5807sB/QKMO/Z
+Gz3NXvHg5xTJRd/567lxPGkor0cE7qD1EZfmJ2HrBYXQ91bhgA7LToBuMZo6ZRXH
+QfsanjbP4FPLMiGdQigLjj3A35L/f4sQOOVac/sRaFnm7pzcxsMvyVU/YtvGcjYE
+xaOOVnamg661Wo0wksXoDjeSz/JIyyKO3Gwp1FSm2wGLjjy/Ehmqcqy8rvHuf07w
+AUukhVtTNn4=
+-----END ENCRYPTED PRIVATE KEY-----
\ No newline at end of file
diff --git a/dev.pem b/dev.pem
new file mode 100644
index 00000000..01756b25
--- /dev/null
+++ b/dev.pem
@@ -0,0 +1,57 @@
+-----BEGIN CERTIFICATE-----
+MIIDKTCCAhGgAwIBAgIJAOWmjTS+OnTEMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
+BAMMDGludGVybWVkaWF0ZTAeFw0xNTA1MTgwOTAwNDBaFw0yMzA4MDQwOTAwNDBa
+MBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALlcwQJuzd+xH8QFgfJSn5tRlvhkldSX98cE7NiA602NBbnAVyUrkRXq
+Ni75lgt0kwjYfA9z674m8WSVbgpLPintPCla9CYky1TH0keIs8Rz6cGWHryWEHiu
+EDuljQynu2b3sAFuHu9nfWurbJwZnFakBKpdQ9m4EyOZCHC/jHYY7HacKSXg1Cki
+we2ca0BWDrcqy8kLy0dZ5oC6IZG8O8drAK8f3f44CRYw59D3sOKBrKXaabpvyEcb
+N7Wk2HDBVwHpUJo1reVwtbM8dhqQayYSD8oXnGpP3RQNu/e2rzlXRyq/BfcDY1JI
+7TbC4t/7/N4EcPSpGsTcSOC9A7FpzvECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFCnwiEMMFZh7NhCr+qA8K0w4Q+AOMB8GA1UdIwQYMBaAFB0h1Evsaw2vfrmS
+YuoCTmC4EE6ZMA0GCSqGSIb3DQEBCwUAA4IBAQAcFmHMaXRxyoNaeOowQ6iQWoZd
+AUbvG7SHr7I6Pi2aqdqofsKWts7Ytm5WsS0M2nN+sW504houu0iCPeJJX8RQw2q4
+CCcNOs9IXk+2uMzlpocHpv+yYoUiD5DxgWh7eghQMLyMpf8FX3Gy4VazeuXznHOM
+4gE4L417xkDzYOzqVTp0FTyAPUv6G2euhNCD6TMru9REcRhYul+K9kocjA5tt2KG
+MH6y28LXbLyq4YJUxSUU9gY/xlnbbZS48KDqEcdYC9zjW9nQ0qS+XQuQuFIcwjJ5
+V4kAUYxDu6FoTpyQjgsrmBbZlKNxH7Nj4NDlcdJhp/zeSKHqWa5hSWjjKIxp
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAeqgAwIBAgIJAOWmjTS+OnTDMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMMDXJvb3RhdXRob3JpdHkwHhcNMTUwNTE4MDkwMDQwWhcNMjMwODA0MDkwMDQw
+WjAXMRUwEwYDVQQDDAxpbnRlcm1lZGlhdGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDSrAO1CoPvUllgLOzDm5nG0skDF7vh1DUgAIDVGz0ecD0JFbQx
+EF79pju/6MbtpTW2FYvRp11t/G7rGtX923ybOHY/1MNFQrdIvPlO1VV7IGKjoMwP
+DNeb0fIGjHoE9QxaDxR8NX8xQbItpsw+TUtRfc9SLkR+jaYJfVRoM21BOncZbSHE
+YKiZlEbpecB/+EtwVpgvl+8mPD5U07Fi4fp/lza3WXInXQPyiTVllIEJCt4PKmlu
+MocNaJOW38bysL7i0PzDpVZtOxLHOTaW68yF3FckIHNCaA7k1ABEEEegjFMmIao7
+B9w7A0jvr4jZVvNmui5Djjn+oJxwEVVgyf8LAgMBAAGjUDBOMB0GA1UdDgQWBBQd
+IdRL7GsNr365kmLqAk5guBBOmTAfBgNVHSMEGDAWgBRk81s9d0ZbiZhh44KckwPb
+oTc0XzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBZQTK0plfdB5PC
+cC5icut4EmrByJa1RbU7ayuEE70e7hla6KVmVjVdCBGltI4jBYwfhKbRItHiAJ/8
+x+XZKBG8DLPFuDb7lAa1ObhAYF7YThUFPQYaBhfzKcWrdmWDBFpvNv6E0Mm364dZ
+e7Yxmbe5S4agkYPoxEzgEYmcUk9jbjdR6eTbs8laG169ljrECXfEU9RiAcqz5iSX
+NLSewqB47hn3B9qgKcQn+PsgO2j7M+rfklhNgeGJeWmy7j6clSOuCsIjWHU0RLQ4
+0W3SB/rpEAJ7fgQbYUPTIUNALSOWi/o1tDX2mXPRjBoxqAv7I+vYk1lZPmSzkyRh
+FKvRDxsW
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAeugAwIBAgIJAJ0MomS4Ck+8MA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
+BAMMDXJvb3RhdXRob3JpdHkwHhcNMTUwNTE4MDkwMDQwWhcNMjMwODA0MDkwMDQw
+WjAYMRYwFAYDVQQDDA1yb290YXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAts1ijtBV92S2cOvpUMOSTp9c6A34nIGr0T5Nhz6XiqRVT+gv
+dQgmkdKJQjbvR60y6jzltYFsI2MpGVXY8h/oAL81D/k7PDB2aREgyBfTPAhBHyGw
+siR+2xYt5b/Zs99q5RdRqQNzNpLPJriIKvUsRyQWy1UiG2s7pRXQeA8qB0XtJdCj
+kFIi+G2bDsaffspGeDOCqt7t+yqvRXfSES0c/l7DIHaiMbbp4//ZNML3RNgAjPz2
+hCezZ+wOYajOIyoSPK8IgICrhYFYxvgWxwbLDBEfC5B3jOQsySe10GoRAKZz1gBV
+DmgReu81tYJmdgkc9zknnQtIFdA0ex+GvZlfWQIDAQABo1AwTjAdBgNVHQ4EFgQU
+ZPNbPXdGW4mYYeOCnJMD26E3NF8wHwYDVR0jBBgwFoAUZPNbPXdGW4mYYeOCnJMD
+26E3NF8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEATzkZ97K777uZ
+lQcduNX3ey4IbCiEzFA2zO5Blj+ilfIwNbZXNOgm/lqNvVGDYs6J1apJJe30vL3X
+J+t2zsZWzzQzb9uIU37zYemt6m0fHrSrx/iy5lGNqt3HMfqEcOqSCOIK3PCTMz2/
+uyGe1iw33PVeWsm1JUybQ9IrU/huJjbgOHU4wab+8SJCM49ipArp68Fr6j4lcEaE
+4rfRg1ZsvxiOyUB3qPn6wyL/JB8kOJ+QCBe498376eaem8AEFk0kQRh6hDaWtq/k
+t6IIXQLjx+EBDVP/veK0UnVhKRP8YTOoV8ZiG1NcdlJmX/Uk7iAfevP7CkBfSN8W
+r6AL284qtw==
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/example/http2/main.dart b/example/http2/main.dart
index cb37957a..04a3ed98 100644
--- a/example/http2/main.dart
+++ b/example/http2/main.dart
@@ -13,7 +13,7 @@ main() async {
     });
   app.logger = new Logger('angel')..onRecord.listen(prettyLog);
 
-  app.get('/', (_, __) => 'Hello HTTP/2!!!');
+  app.get('/', (req, res) => 'Hello HTTP/2!!!');
 
   app.fallback((req, res) => throw new AngelHttpException.notFound(
       message: 'No file exists at ${req.uri.path}'));
@@ -38,6 +38,6 @@ main() async {
   // HTTP/1.x requests will fallback to `AngelHttp`
   http2.onHttp1.listen(http1.handleRequest);
 
-  var server = await http2.startServer('127.0.0.1', 3000);
-  print('Listening at https://${server.address.address}:${server.port}');
+  await http2.startServer('127.0.0.1', 3000);
+  print('Listening at ${http2.uri}');
 }
diff --git a/example/main.dart b/example/main.dart
index 8beb3aea..6d0934eb 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -18,7 +18,7 @@ main() async {
   });
 
   // Index route. Returns JSON.
-  app.get('/', (req, res) => res.write('Welcome to Angel!'));
+  app.get('/', (req, res) => 'Welcome to Angel!');
 
   // Accepts a URL like /greet/foo or /greet/bob.
   app.get(
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index 2f2acca2..1bb9d50b 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -34,15 +34,22 @@ abstract class Driver<
   /// The native server running this instance.
   Server get server => _server;
 
+  Future<Server> generateServer(address, int port) =>
+      serverGenerator(address, port);
+
   /// Starts, and returns the server.
   Future<Server> startServer([address, int port]) {
     var host = address ?? '127.0.0.1';
-    return serverGenerator(host, port ?? 0).then((server) {
+    return generateServer(host, port ?? 0).then((server) {
       _server = server;
       return Future.wait(app.startupHooks.map(app.configure)).then((_) {
         app.optimizeForProduction();
-        _sub = server.listen((request) =>
-            handleRawRequest(request, createResponseFromRawRequest(request)));
+        _sub = server.listen((request) {
+          var stream = createResponseStreamFromRawRequest(request);
+          stream.listen((response) {
+            return handleRawRequest(request, response);
+          });
+        });
         return _server;
       });
     });
@@ -78,11 +85,9 @@ abstract class Driver<
 
   void writeToResponse(Response response, List<int> data);
 
-  Uri getUriFromRequest(Request request);
-
   Future closeResponse(Response response);
 
-  Response createResponseFromRawRequest(Request request);
+  Stream<Response> createResponseStreamFromRawRequest(Request request);
 
   /// Handles a single request.
   Future handleRawRequest(Request request, Response response) {
@@ -123,26 +128,17 @@ abstract class Driver<
           }
 
           var pipeline = tuple.item1;
+          var it = pipeline.iterator;
 
-          Future Function() runPipeline;
-
-          for (var handler in pipeline) {
-            if (handler == null) break;
-
-            if (runPipeline == null)
-              runPipeline = () =>
-                  Future.sync(() => app.executeHandler(handler, req, res));
-            else {
-              var current = runPipeline;
-              runPipeline = () => current().then((result) => !res.isOpen
-                  ? new Future.value(result)
-                  : app.executeHandler(handler, req, res));
-            }
-          }
+          var runPipeline = pipeline.isEmpty
+              ? null
+              : Future.doWhile(() => !it.moveNext()
+                  ? new Future.value(false)
+                  : app.executeHandler(it.current, req, res));
 
           return runPipeline == null
               ? sendResponse(request, response, req, res)
-              : runPipeline()
+              : runPipeline
                   .then((_) => sendResponse(request, response, req, res));
         }
 
@@ -211,7 +207,6 @@ abstract class Driver<
                     e, trace, req, res, request, response);
               }).catchError((e, StackTrace st) {
                 var trace = new Trace.from(st ?? StackTrace.current).terse;
-                var uri = getUriFromRequest(request);
                 closeResponse(response);
                 // Ideally, we won't be in a position where an absolutely fatal error occurs,
                 // but if so, we'll need to log it.
@@ -221,7 +216,7 @@ abstract class Driver<
                 } else {
                   stderr
                     ..writeln('Fatal error occurred when processing '
-                        '$uri:')
+                        '${req.uri}:')
                     ..writeln(e)
                     ..writeln(trace);
                 }
@@ -299,11 +294,10 @@ abstract class Driver<
 
     Future finalizers = ignoreFinalizers == true
         ? new Future.value()
-        : app.responseFinalizers.fold<Future>(
-            new Future.value(), (out, f) => out.then((_) => f(req, res)));
+        : Future.forEach(app.responseFinalizers, (f) => f(req, res));
 
     return finalizers.then((_) {
-      if (res.isOpen) res.close();
+      //if (res.isOpen) res.close();
 
       for (var key in res.headers.keys) {
         setHeader(response, key, res.headers[key]);
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 6f030f2a..b0e1fac1 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -59,7 +59,8 @@ abstract class RequestContext<RawRequest> {
   String get originalMethod;
 
   /// The content type of an incoming request.
-  MediaType get contentType;
+  MediaType get contentType =>
+      new MediaType.parse(headers.contentType.toString());
 
   /// The URL parameters extracted from the request URI.
   Map<String, dynamic> params = <String, dynamic>{};
@@ -67,6 +68,12 @@ abstract class RequestContext<RawRequest> {
   /// The requested path.
   String get path;
 
+  /// Is this an **XMLHttpRequest**?
+  bool get isXhr {
+    return headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
+        'xmlhttprequest';
+  }
+
   /// The remote address requesting this resource.
   InternetAddress get remoteAddress;
 
@@ -76,9 +83,6 @@ abstract class RequestContext<RawRequest> {
   /// The [Uri] instance representing the path this request is responding to.
   Uri get uri;
 
-  /// Is this an **XMLHttpRequest**?
-  bool get xhr;
-
   /// Returns the file extension of the requested path, if any.
   ///
   /// Includes the leading `.`, if there is one.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index a76aaccf..8ad806f3 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -20,7 +20,10 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 abstract class ResponseContext<RawResponse>
     implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
-  final Map<String, String> _headers = {'server': 'angel'};
+  final Map<String, String> _headers = new CaseInsensitiveMap.from({
+    'content-type': 'text/plain',
+    'server': 'angel',
+  });
 
   Completer _done;
   int _statusCode = 200;
@@ -101,7 +104,18 @@ abstract class ResponseContext<RawResponse>
   FutureOr<RawResponse> detach();
 
   /// Gets or sets the content type to send back to a client.
-  MediaType contentType = new MediaType('text', 'plain');
+  MediaType get contentType {
+    try {
+      return new MediaType.parse(headers['content-type']);
+    } catch (_) {
+      return new MediaType('text', 'plain');
+    }
+  }
+
+  /// Gets or sets the content type to send back to a client.
+  void set contentType(MediaType value) {
+    headers['content-type'] = value.toString();
+  }
 
   static StateError closed() =>
       new StateError('Cannot modify a closed response.');
@@ -124,8 +138,6 @@ abstract class ResponseContext<RawResponse>
   }
 
   /// Prevents more data from being written to the response, and locks it entire from further editing.
-  ///
-  /// This method should be overwritten, setting [streaming] to `false`, **after** a `super` call.
   Future close() {
     if (buffer is LockableBytesBuilder) {
       (buffer as LockableBytesBuilder).lock();
@@ -145,21 +157,21 @@ abstract class ResponseContext<RawResponse>
   /// You can override the [contentType] sent; by default it is `application/javascript`.
   void jsonp(value, {String callbackName: "callback", MediaType contentType}) {
     if (!isOpen) throw closed();
-    write("$callbackName(${serializer(value)})");
     this.contentType =
         contentType ?? new MediaType('application', 'javascript');
+    write("$callbackName(${serializer(value)})");
     close();
   }
 
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map<String, dynamic> data]) {
     if (!isOpen) throw closed();
+    contentType = new MediaType('text', 'html');
     return Future<String>.sync(() => app.viewGenerator(
         view,
         new Map<String, dynamic>.from(renderParams)
           ..addAll(data ?? <String, dynamic>{}))).then((content) {
       write(content);
-      contentType = new MediaType('text', 'html');
       close();
     });
   }
@@ -296,8 +308,6 @@ abstract class ResponseContext<RawResponse>
 
   /// Adds a stream directly the underlying response.
   ///
-  /// This will also set [willCloseItself] to `true`, thus canceling out response finalizers.
-  ///
   /// If this instance has access to a [correspondingRequest], then it will attempt to transform
   /// the content using at most one of the response [encoders].
   @override
@@ -305,7 +315,9 @@ abstract class ResponseContext<RawResponse>
 
   @override
   void addError(Object error, [StackTrace stackTrace]) {
-    if (_done?.isCompleted == false) _done.completeError(error, stackTrace);
+    if (_done?.isCompleted == false)
+      _done.completeError(error, stackTrace);
+    else if (_done == null) Zone.current.handleUncaughtError(error, stackTrace);
   }
 
   /// Writes data to the response.
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 678356cd..cb6ff71a 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -73,6 +73,12 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
   void addCookies(HttpResponse response, Iterable<Cookie> cookies) =>
       response.cookies.addAll(cookies);
 
+  @override
+  Future<HttpServer> close() async {
+    await server?.close();
+    return await super.close();
+  }
+
   @override
   Future closeResponse(HttpResponse response) => response.close();
 
@@ -95,11 +101,9 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
   }
 
   @override
-  HttpResponse createResponseFromRawRequest(HttpRequest request) =>
-      request.response;
-
-  @override
-  Uri getUriFromRequest(HttpRequest request) => request.uri;
+  Stream<HttpResponse> createResponseStreamFromRawRequest(
+          HttpRequest request) =>
+      new Stream.fromIterable([request.response]);
 
   @override
   void setChunkedEncoding(HttpResponse response, bool value) =>
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index c9f210f2..e8d21c0d 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -70,15 +70,6 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
     return rawRequest.uri;
   }
 
-  @override
-  bool get xhr {
-    return rawRequest.headers
-            .value("X-Requested-With")
-            ?.trim()
-            ?.toLowerCase() ==
-        'xmlhttprequest';
-  }
-
   /// Magically transforms an [HttpRequest] into a [RequestContext].
   static Future<HttpRequestContext> from(
       HttpRequest request, Angel app, String path) {
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 4438282f..1f48c686 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -2,6 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:http_parser/http_parser.dart';
+
 import '../core/core.dart';
 import 'http_request_context.dart';
 
@@ -68,6 +70,14 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
     });
   }
 
+  @override
+  void set contentType(MediaType value) {
+    super.contentType = value;
+    if (!_streamInitialized)
+      rawResponse.headers.contentType =
+          ContentType(value.type, value.subtype, parameters: value.parameters);
+  }
+
   bool _openStream() {
     if (!_streamInitialized) {
       // If this is the first stream added to this response,
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index e96c1f62..3a90e58f 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -2,34 +2,32 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart' hide Header;
-import 'package:combinator/combinator.dart';
-import 'package:http2/src/artificial_server_socket.dart';
 import 'package:http2/transport.dart';
 import 'package:mock_request/mock_request.dart';
 import 'http2_request_context.dart';
 import 'http2_response_context.dart';
-import 'package:pool/pool.dart';
 import 'package:uuid/uuid.dart';
-import 'package:tuple/tuple.dart';
 
 class AngelHttp2 extends Driver<Socket, ServerTransportStream,
-    ArtificialServerSocket, Http2RequestContext, Http2ResponseContext> {
+    SecureServerSocket, Http2RequestContext, Http2ResponseContext> {
   final ServerSettings settings;
   final StreamController<HttpRequest> _onHttp1 = new StreamController();
   final Map<String, MockHttpSession> _sessions = {};
   final Uuid _uuid = new Uuid();
-  ArtificialServerSocket _artificial;
-  HttpServer _httpServer;
-  StreamController<SecureSocket> _http1;
-  SecureServerSocket _socket;
-  StreamSubscription _sub;
+  _AngelHttp2ServerSocket _artificial;
+
+  SecureServerSocket get socket => _artificial;
 
   AngelHttp2._(
       Angel app,
-      Future<ArtificialServerSocket> Function(dynamic, int) serverGenerator,
+      Future<SecureServerSocket> Function(dynamic, int) serverGenerator,
       bool useZone,
       this.settings)
-      : super(app, serverGenerator, useZone: useZone);
+      : super(
+          app,
+          serverGenerator,
+          useZone: useZone,
+        );
 
   factory AngelHttp2(Angel app, SecurityContext securityContext,
       {bool useZone: true, ServerSettings settings}) {
@@ -48,14 +46,25 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
       var addr = address is InternetAddress
           ? address
           : new InternetAddress(address.toString());
-      return SecureServerSocket.bind(addr, port, ctx)
-          .then((s) => ArtificialServerSocket(addr, port, s));
+      return SecureServerSocket.bind(addr, port, ctx);
     }, useZone, settings);
   }
 
   /// Fires when an HTTP/1.x request is received.
   Stream<HttpRequest> get onHttp1 => _onHttp1.stream;
 
+  @override
+  Future<SecureServerSocket> generateServer([address, int port]) async {
+    var s = await serverGenerator(address ?? '127.0.0.1', port ?? 0);
+    return _artificial = new _AngelHttp2ServerSocket(s, this);
+  }
+
+  @override
+  Future<SecureServerSocket> close() async {
+    await _artificial.close();
+    return await super.close();
+  }
+
   @override
   void addCookies(ServerTransportStream response, Iterable<Cookie> cookies) {
     var headers = cookies
@@ -84,14 +93,11 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
   }
 
   @override
-  ServerTransportStream createResponseFromRawRequest(Socket request) {
+  Stream<ServerTransportStream> createResponseStreamFromRawRequest(
+      Socket request) {
     var connection =
         new ServerTransportConnection.viaSocket(request, settings: settings);
-  }
-
-  @override
-  Uri getUriFromRequest(Socket request) {
-    // TODO: implement getUriFromRequest
+    return connection.incomingStreams;
   }
 
   @override
@@ -130,3 +136,85 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
     response.sendData(data);
   }
 }
+
+class _FakeServerSocket extends Stream<Socket> implements ServerSocket {
+  final _AngelHttp2ServerSocket angel;
+  final _ctrl = new StreamController<Socket>();
+
+  _FakeServerSocket(this.angel);
+
+  @override
+  InternetAddress get address => angel.address;
+
+  @override
+  Future<ServerSocket> close() async {
+    _ctrl.close();
+    return this;
+  }
+
+  @override
+  int get port => angel.port;
+
+  @override
+  StreamSubscription<Socket> listen(void Function(Socket event) onData,
+      {Function onError, void Function() onDone, bool cancelOnError}) {
+    return _ctrl.stream.listen(onData,
+        cancelOnError: cancelOnError, onError: onError, onDone: onDone);
+  }
+}
+
+class _AngelHttp2ServerSocket extends Stream<SecureSocket>
+    implements SecureServerSocket {
+  final SecureServerSocket socket;
+  final AngelHttp2 driver;
+  final _ctrl = new StreamController<SecureSocket>();
+  _FakeServerSocket _fake;
+  StreamSubscription _sub;
+
+  _AngelHttp2ServerSocket(this.socket, this.driver) {
+    _fake = new _FakeServerSocket(this);
+    new HttpServer.listenOn(_fake).pipe(driver._onHttp1);
+    _sub = socket.listen(
+      (socket) {
+        if (socket.selectedProtocol == null ||
+            socket.selectedProtocol == 'http/1.0' ||
+            socket.selectedProtocol == 'http/1.1') {
+          _fake._ctrl.add(socket);
+        } else if (socket.selectedProtocol == 'h2' ||
+            socket.selectedProtocol == 'h2-14') {
+          _ctrl.add(socket);
+        } else {
+          socket.destroy();
+          throw new Exception(
+              'AngelHttp2 does not support ${socket.selectedProtocol} as an ALPN protocol.');
+        }
+      },
+      onDone: _ctrl.close,
+      onError: (e, st) {
+        driver.app.logger.warning(
+            'HTTP/2 incoming connection failure: ', e, st as StackTrace);
+      },
+    );
+  }
+
+  InternetAddress get address => socket.address;
+
+  int get port => socket.port;
+
+  Future<SecureServerSocket> close() async {
+    _sub?.cancel();
+    _fake.close();
+    _ctrl.close();
+    return await socket.close();
+  }
+
+  @override
+  StreamSubscription<SecureSocket> listen(
+      void Function(SecureSocket event) onData,
+      {Function onError,
+      void Function() onDone,
+      bool cancelOnError}) {
+    return _ctrl.stream.listen(onData,
+        cancelOnError: cancelOnError, onError: onError, onDone: onDone);
+  }
+}
diff --git a/lib/src/http2/http2_request_context.dart b/lib/src/http2/http2_request_context.dart
index f207067b..f15b247e 100644
--- a/lib/src/http2/http2_request_context.dart
+++ b/lib/src/http2/http2_request_context.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'package:angel_container/src/container.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:body_parser/body_parser.dart';
 import 'package:http_parser/http_parser.dart';
@@ -11,9 +12,9 @@ import 'package:uuid/uuid.dart';
 final RegExp _comma = new RegExp(r',\s*');
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
-class Http2RequestContext extends RequestContext {
+class Http2RequestContext extends RequestContext<ServerTransportStream> {
+  final Container container;
   BytesBuilder _buf;
-  ContentType _contentType;
   List<Cookie> _cookies;
   HttpHeaders _headers;
   String _method, _override, _path;
@@ -22,13 +23,15 @@ class Http2RequestContext extends RequestContext {
   ServerTransportStream _stream;
   Uri _uri;
 
+  Http2RequestContext._(this.container);
+
   static Future<Http2RequestContext> from(
       ServerTransportStream stream,
       Socket socket,
       Angel app,
       Map<String, MockHttpSession> sessions,
       Uuid uuid) async {
-    var req = new Http2RequestContext()
+    var req = new Http2RequestContext._(app.container.createChild())
       ..app = app
       .._socket = socket
       .._stream = stream;
@@ -93,7 +96,7 @@ class Http2RequestContext extends RequestContext {
         cookies.firstWhere((c) => c.name == 'DARTSESSID', orElse: () => null);
 
     if (dartSessId == null) {
-      dartSessId = new Cookie('DARTSESSID', uuid.v4());
+      dartSessId = new Cookie('DARTSESSID', uuid.v4() as String);
     }
 
     req._session = sessions.putIfAbsent(
@@ -110,12 +113,6 @@ class Http2RequestContext extends RequestContext {
   /// The underlying HTTP/2 [ServerTransportStream].
   ServerTransportStream get stream => _stream;
 
-  @override
-  bool get xhr {
-    return headers.value("X-Requested-With")?.trim()?.toLowerCase() ==
-        'xmlhttprequest';
-  }
-
   @override
   Uri get uri => _uri;
 
@@ -132,12 +129,6 @@ class Http2RequestContext extends RequestContext {
     return _path;
   }
 
-  @override
-  ContentType get contentType =>
-      _contentType ??= (headers['content-type'] == null
-          ? null
-          : ContentType.parse(headers.value('content-type')));
-
   @override
   String get originalMethod {
     return _method;
@@ -148,9 +139,6 @@ class Http2RequestContext extends RequestContext {
     return _override ?? _method;
   }
 
-  @override
-  HttpRequest get io => null;
-
   @override
   String get hostname => _headers.value('host');
 
@@ -168,7 +156,10 @@ class Http2RequestContext extends RequestContext {
       new Stream.fromIterable([_buf.takeBytes()]),
       contentType == null ? null : new MediaType.parse(contentType.toString()),
       uri,
-      storeOriginalBuffer: app.storeOriginalBuffer,
+      storeOriginalBuffer: app.keepRawRequestBuffers == true,
     );
   }
+
+  @override
+  ServerTransportStream get rawRequest => _stream;
 }
diff --git a/lib/src/http2/http2_response_context.dart b/lib/src/http2/http2_response_context.dart
index 05cf07b5..0e1224db 100644
--- a/lib/src/http2/http2_response_context.dart
+++ b/lib/src/http2/http2_response_context.dart
@@ -5,11 +5,21 @@ import 'package:angel_framework/angel_framework.dart' hide Header;
 import 'package:http2/transport.dart';
 import 'http2_request_context.dart';
 
-class Http2ResponseContext extends ResponseContext {
+class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
   final Angel app;
   final ServerTransportStream stream;
+
+  ServerTransportStream get rawResponse => stream;
+
+  LockableBytesBuilder _buffer;
+
   final Http2RequestContext _req;
-  bool _useStream = false, _isClosed = false, _isPush = false;
+
+  bool _isDetached = false,
+      _isClosed = false,
+      _streamInitialized = false,
+      _isPush = false;
+
   Uri _targetUri;
 
   Http2ResponseContext(this.app, this.stream, this._req) {
@@ -26,43 +36,62 @@ class Http2ResponseContext extends ResponseContext {
   /// Returns a [List] of all resources that have [push]ed to the client.
   List<Http2ResponseContext> get pushes => new List.unmodifiable(_pushes);
 
+  @override
+  ServerTransportStream detach() {
+    _isDetached = true;
+    return stream;
+  }
+
   @override
   RequestContext get correspondingRequest => _req;
 
   Uri get targetUri => _targetUri;
 
   @override
-  HttpResponse get io => null;
+  bool get isOpen {
+    return !_isClosed && !_isDetached;
+  }
 
   @override
-  bool get streaming => _useStream;
+  bool get isBuffered => _buffer != null;
 
   @override
-  bool get isOpen => !_isClosed;
+  BytesBuilder get buffer => _buffer;
+
+  @override
+  void addError(Object error, [StackTrace stackTrace]) {
+    super.addError(error, stackTrace);
+  }
+
+  @override
+  void useBuffer() {
+    _buffer = new LockableBytesBuilder();
+  }
 
   /// Write headers, status, etc. to the underlying [stream].
-  void finalize() {
-    if (_isPush) return;
+  bool _openStream() {
+    if (_isPush || _streamInitialized) return false;
 
     var headers = <Header>[
       new Header.ascii(':status', statusCode.toString()),
     ];
 
     if (encoders.isNotEmpty && correspondingRequest != null) {
-      var allowedEncodings =
-          (correspondingRequest.headers['accept-encoding'] ?? []).map((str) {
-        // Ignore quality specifications in accept-encoding
-        // ex. gzip;q=0.8
-        if (!str.contains(';')) return str;
-        return str.split(';')[0];
-      });
+      if (_allowedEncodings != null) {
+        for (var encodingName in _allowedEncodings) {
+          Converter<List<int>, List<int>> encoder;
+          String key = encodingName;
 
-      for (var encodingName in allowedEncodings) {
-        String key = encodingName;
+          if (encoders.containsKey(encodingName))
+            encoder = encoders[encodingName];
+          else if (encodingName == '*') {
+            encoder = encoders[key = encoders.keys.first];
+          }
 
-        if (encoders.containsKey(encodingName)) {
-          this.headers['content-encoding'] = key;
-          break;
+          if (encoder != null) {
+            this.headers['content-encoding'] = key;
+            break;
+          }
         }
       }
     }
@@ -81,75 +110,48 @@ class Http2ResponseContext extends ResponseContext {
     }
 
     stream.sendHeaders(headers);
+    return _streamInitialized = true;
   }
 
-  @override
-  void addError(Object error, [StackTrace stackTrace]) {
-    Zone.current.handleUncaughtError(error, stackTrace);
-    super.addError(error, stackTrace);
-  }
+  Iterable<String> __allowedEncodings;
 
-  @override
-  bool useStream() {
-    if (!_useStream) {
-      // If this is the first stream added to this response,
-      // then add headers, status code, etc.
-      finalize();
-
-      willCloseItself = _useStream = _isClosed = true;
-      releaseCorrespondingRequest();
-      return true;
-    }
-
-    return false;
-  }
-
-  @override
-  void end() {
-    _isClosed = true;
-    super.end();
+  Iterable<String> get _allowedEncodings {
+    return __allowedEncodings ??= correspondingRequest.headers
+        .value('accept-encoding')
+        ?.split(',')
+        ?.map((s) => s.trim())
+        ?.where((s) => s.isNotEmpty)
+        ?.map((str) {
+      // Ignore quality specifications in accept-encoding
+      // ex. gzip;q=0.8
+      if (!str.contains(';')) return str;
+      return str.split(';')[0];
+    });
   }
 
   @override
   Future addStream(Stream<List<int>> stream) {
-    if (_isClosed && !_useStream) throw ResponseContext.closed();
-    var firstStream = useStream();
+    if (!isOpen && isBuffered) throw ResponseContext.closed();
+    _openStream();
 
     Stream<List<int>> output = stream;
 
-    if ((firstStream || !headers.containsKey('content-encoding')) &&
-        encoders.isNotEmpty &&
-        correspondingRequest != null) {
-      var allowedEncodings =
-          (correspondingRequest.headers['accept-encoding'] ?? []).map((str) {
-        // Ignore quality specifications in accept-encoding
-        // ex. gzip;q=0.8
-        if (!str.contains(';')) return str;
-        return str.split(';')[0];
-      });
+    if (encoders.isNotEmpty && correspondingRequest != null) {
+      if (_allowedEncodings != null) {
+        for (var encodingName in _allowedEncodings) {
+          Converter<List<int>, List<int>> encoder;
+          String key = encodingName;
 
-      for (var encodingName in allowedEncodings) {
-        Converter<List<int>, List<int>> encoder;
-        String key = encodingName;
-
-        if (encoders.containsKey(encodingName))
-          encoder = encoders[encodingName];
-        else if (encodingName == '*') {
-          encoder = encoders[key = encoders.keys.first];
-        }
-
-        if (encoder != null) {
-          /*
-          if (firstStream) {
-            this.stream.sendHeaders([
-              new Header.ascii(
-                  'content-encoding', headers['content-encoding'] = key)
-            ]);
+          if (encoders.containsKey(encodingName))
+            encoder = encoders[encodingName];
+          else if (encodingName == '*') {
+            encoder = encoders[key = encoders.keys.first];
           }
-          */
 
-          output = encoders[key].bind(output);
-          break;
+          if (encoder != null) {
+            output = encoders[key].bind(output);
+            break;
+          }
         }
       }
     }
@@ -159,38 +161,50 @@ class Http2ResponseContext extends ResponseContext {
 
   @override
   void add(List<int> data) {
-    if (_isClosed && !_useStream)
+    if (!isOpen && isBuffered)
       throw ResponseContext.closed();
-    else if (_useStream)
-      //stream.sendData(data);
-      addStream(new Stream.fromIterable([data]));
-    else
+    else if (!isBuffered) {
+      _openStream();
+
+      if (encoders.isNotEmpty && correspondingRequest != null) {
+        if (_allowedEncodings != null) {
+          for (var encodingName in _allowedEncodings) {
+            Converter<List<int>, List<int>> encoder;
+            String key = encodingName;
+
+            if (encoders.containsKey(encodingName))
+              encoder = encoders[encodingName];
+            else if (encodingName == '*') {
+              encoder = encoders[key = encoders.keys.first];
+            }
+
+            if (encoder != null) {
+              data = encoders[key].convert(data);
+              break;
+            }
+          }
+        }
+      }
+
+      stream.sendData(data);
+    } else
       buffer.add(data);
   }
 
   @override
   Future close() async {
-    if (_useStream) {
-      try {
-        await stream.outgoingMessages.close();
-      } catch (_) {
-        // This only seems to occur on `MockHttpRequest`, but
-        // this try/catch prevents a crash.
-      }
+    if (!_isDetached && !_isClosed && !isBuffered) {
+      _openStream();
+      await stream.outgoingMessages.close();
     }
 
     _isClosed = true;
     await super.close();
-    _useStream = false;
   }
 
   /// Pushes a resource to the client.
   Http2ResponseContext push(String path,
       {Map<String, String> headers: const {}, String method: 'GET'}) {
-    if (isOpen)
-      throw new StateError(
-          'You can only push resources after the main response context is closed. You will need to use streaming methods, i.e. `addStream`.');
-
     var targetUri = _req.uri.replace(path: path);
 
     var h = <Header>[
@@ -211,8 +225,4 @@ class Http2ResponseContext extends ResponseContext {
     _pushes.add(r);
     return r;
   }
-
-  void internalReopen() {
-    _isClosed = false;
-  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index a9b080fb..6259aead 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,6 @@
 name: angel_framework
-version: 2.0.0-alpha.10
-description: >
-  A high-powered HTTP server with DI, routing and more.
-  When combined with the other packages in the Angel ecosystem, this
-  package can be used to make robust application servers for API's,
-  traditional server-side applications, and much more, along with
-  a rich client API.
+version: 2.0.0-alpha.11
+description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
 environment:
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index 7503f816..72cd4aae 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -64,5 +64,5 @@ Future<RequestContext> acceptContentTypes(
   rq.close();
   var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp(app);
-  return http.createRequestContext(rq);
+  return http.createRequestContext(rq, rq.response);
 }
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 1f1a42ba..72277a20 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -38,12 +38,14 @@ class NamedController extends Controller {
   optional() => 2;
 }
 
-void foo(RequestContext req, ResponseContext res) {
+bool foo(RequestContext req, ResponseContext res) {
   res.write("Hello, ");
+  return true;
 }
 
-void bar(RequestContext req, ResponseContext res) {
+bool bar(RequestContext req, ResponseContext res) {
   res.write("world!");
+  return true;
 }
 
 main() {
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 0cc0ca09..09fa887d 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -67,7 +67,7 @@ void encodingTests(Angel getApp()) {
       await http.handleRequest(rq);
 
       var body = await getBody(rs);
-      print(rs.headers);
+      //print(rs.headers);
       expect(rs.headers.value('content-encoding'), 'deflate');
       expect(body, zlib.encode(utf8.encode('Hello, world!')));
     });
diff --git a/test/extension_test.dart b/test/extension_test.dart
index 23f05d77..0ef019a7 100644
--- a/test/extension_test.dart
+++ b/test/extension_test.dart
@@ -28,5 +28,5 @@ Future<RequestContext> makeRequest(String path) {
   var rq = new MockHttpRequest('GET', ENDPOINT.replace(path: path))..close();
   var app = new Angel(reflector: MirrorsReflector());
   var http = new AngelHttp(app);
-  return http.createRequestContext(rq);
+  return http.createRequestContext(rq, rq.response);
 }
diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
index 1543516a..547a7878 100644
--- a/test/http2/adapter_test.dart
+++ b/test/http2/adapter_test.dart
@@ -29,10 +29,9 @@ void main() {
       ..keepRawRequestBuffers = true
       ..encoders['gzip'] = gzip.encoder;
 
-    app.get('/', (req, res) {
-      res
-        ..write('Hello world')
-        ..close();
+    app.get('/', (req, res) async {
+      res.write('Hello world');
+      await res.close();
     });
 
     app.all('/method', (req, res) => req.method);
@@ -41,16 +40,14 @@ void main() {
 
     app.get('/stream', (req, res) => jfkStream().pipe(res));
 
-    app.get('/headers', (req, res) {
-      res
-        ..headers.addAll({'foo': 'bar', 'x-angel': 'http2'})
-        ..close();
+    app.get('/headers', (req, res) async {
+      res.headers.addAll({'foo': 'bar', 'x-angel': 'http2'});
+      await res.close();
     });
 
-    app.get('/status', (req, res) {
-      res
-        ..statusCode = 1337
-        ..close();
+    app.get('/status', (req, res) async {
+      res.statusCode = 1337;
+      await res.close();
     });
 
     app.post('/body', (req, res) => req.parseBody());
@@ -63,9 +60,7 @@ void main() {
     });
 
     app.get('/push', (req, res) async {
-      res
-        ..write('ok')
-        ..close();
+      res.write('ok');
 
       if (res is Http2ResponseContext && res.canPush) {
         res.push('a')
@@ -76,6 +71,8 @@ void main() {
           ..write('b')
           ..close();
       }
+
+      await res.close();
     });
 
     var ctx = new SecurityContext()
@@ -211,7 +208,6 @@ void main() {
     expect(getPath(pushA), '/a');
     expect(getPath(pushB), '/b');
 
-    // TODO: Dart http/2 client seems to not be able to get body
     // However, Chrome, Firefox, Edge all can
     //expect(await getBody(pushA.stream), 'a');
     //expect(await getBody(pushB.stream), 'b');
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index c91c19b9..200fd8eb 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -62,8 +62,8 @@ main() {
     try {
       var rq = new MockHttpRequest('GET', Uri.parse('/num/unparsed/32'))
         ..close();
-      var req = await http.createRequestContext(rq);
-      var res = await http.createResponseContext(rq.response, req);
+      var req = await http.createRequestContext(rq, rq.response);
+      var res = await http.createResponseContext(rq, rq.response, req);
       await app.runContained((num unparsed) => unparsed, req, res);
       throw new StateError(
           'ArgumentError should be thrown if a parameter cannot be resolved.');
diff --git a/test/routing_test.dart b/test/routing_test.dart
index c81cfca7..e283d708 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -29,8 +29,9 @@ void interceptor(RequestContext req, ResponseContext res) {
     ..close();
 }
 
-void interceptService(RequestContext req, ResponseContext res) {
+bool interceptService(RequestContext req, ResponseContext res) {
   res.write("Service with ");
+  return true;
 }
 
 main() {
@@ -96,6 +97,7 @@ main() {
     RequestHandler write(String message) {
       return (req, res) {
         res.write(message);
+        return true;
       };
     }
 
@@ -104,7 +106,7 @@ main() {
 
     app.fallback((req, res) => 'MJ');
 
-    app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
+    //app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
     client = new http.Client();
     var server = await new AngelHttp(app).startServer('127.0.0.1', 0);
diff --git a/test/server_test.dart b/test/server_test.dart
index e0717bf0..079cf1e5 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -44,12 +44,12 @@ main() {
     var rq = new MockHttpRequest('GET', $foo);
     rq.close();
     var rs = rq.response;
-    var req = await http.createRequestContext(rq);
-    var res = await http.createResponseContext(rs);
+    var req = await http.createRequestContext(rq, rs);
+    var res = await http.createResponseContext(rq, rs);
     var e = new AngelHttpException(null,
         statusCode: 321, message: 'Hello', errors: ['foo', 'bar']);
     await app.errorHandler(e, req, res);
-    await http.sendResponse(rq, req, res);
+    await http.sendResponse(rq, rs, req, res);
     expect(
       ContentType.parse(rs.headers.value('content-type')).mimeType,
       'text/html',
@@ -120,8 +120,8 @@ main() {
 
     setUp(() async {
       var rq = new MockHttpRequest('GET', $foo)..close();
-      req = await http.createRequestContext(rq);
-      res = await http.createResponseContext(rq.response);
+      req = await http.createRequestContext(rq, rq.response);
+      res = await http.createResponseContext(rq, rq.response);
     });
 
     group('getHandlerResult', () {
diff --git a/tool/travis.sh b/tool/travis.sh
index bac6b671..ac63f578 100644
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
-pub run test
-ANGEL_ENV=production pub run test
\ No newline at end of file
+pub run test --timeout 5s
+ANGEL_ENV=production pub run test --timeout 5s
\ No newline at end of file

From e8a5a61c1ad4954d4ea29027b57d78f52e760559 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 10 Nov 2018 20:07:44 -0500
Subject: [PATCH 323/414] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3410377..1f148a10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Allow `ResponseContext.redirect` to take a `Uri`.
 * Add `Angel.mountController`.
 * Add `Angel.findServiceOf`.
+* Roll in HTTP/2. See `pkg:angel_framework/http2.dart`.
 
 # 2.0.0-alpha.10
 * All calls to `Service.parseId` are now affixed with the `<Id>` argument.

From f7efe480aaacca5247651b2a91ecc951b907d465 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 10 Nov 2018 20:09:16 -0500
Subject: [PATCH 324/414] remove dart2_constant dep

---
 pubspec.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 6259aead..ba60df13 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,7 +13,6 @@ dependencies:
   body_parser: ^1.0.0
   charcode: ^1.0.0
   combinator: ^1.0.0
-  dart2_constant: ^1.0.0
   file: ^5.0.0
   http_parser: ^3.0.0
   http2: ">=0.1.7 <2.0.0"

From 930c2629af28b3203e89a77893180381f811136d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 10 Nov 2018 20:11:14 -0500
Subject: [PATCH 325/414] promote mock_request to real dep, because of http2
 usage

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index ba60df13..a8816027 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -21,6 +21,7 @@ dependencies:
   merge_map: ^1.0.0
   meta: ^1.0.0
   mime: ^0.9.3
+  mock_request: ^1.0.0
   path: ^1.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0
@@ -28,5 +29,4 @@ dependencies:
 dev_dependencies:
   http: ^0.11.3
   io: ^0.3.0
-  mock_request: ^1.0.0
   test: ^1.0.0
\ No newline at end of file

From 8f8bc6cf2054652a8942f6a0d1947b5334e50f8a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 13 Nov 2018 13:07:27 -0500
Subject: [PATCH 326/414] 2.0.0-alpha.12

---
 CHANGELOG.md                       | 205 ++++++++++++++++-------------
 lib/src/core/response_context.dart |  14 +-
 lib/src/core/server.dart           |   4 +
 pubspec.yaml                       |   2 +-
 4 files changed, 120 insertions(+), 105 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f148a10..775285b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,117 +1,134 @@
+# 2.0.0-alpha.12
+
+- Remove `ResponseContext.sendFile`.
+- Add `Angel.mimeTypeResolver`.
+- Fix a bug where an unknown MIME type on `streamFile` would return a 500.
+
 # 2.0.0-alpha.11
-* Add `readMany` to `Service`.
-* Allow `ResponseContext.redirect` to take a `Uri`.
-* Add `Angel.mountController`.
-* Add `Angel.findServiceOf`.
-* Roll in HTTP/2. See `pkg:angel_framework/http2.dart`.
+
+- Add `readMany` to `Service`.
+- Allow `ResponseContext.redirect` to take a `Uri`.
+- Add `Angel.mountController`.
+- Add `Angel.findServiceOf`.
+- Roll in HTTP/2. See `pkg:angel_framework/http2.dart`.
 
 # 2.0.0-alpha.10
-* All calls to `Service.parseId` are now affixed with the `<Id>` argument.
-* Added `uri` getter to `AngelHttp`.
-* The default for `parseQuery` now wraps query parameters in `new Map<String, dynamic>.from`.
-This resolves a bug in `package:angel_validate`.
+
+- All calls to `Service.parseId` are now affixed with the `<Id>` argument.
+- Added `uri` getter to `AngelHttp`.
+- The default for `parseQuery` now wraps query parameters in `new Map<String, dynamic>.from`.
+  This resolves a bug in `package:angel_validate`.
 
 # 2.0.0-alpha.9
-* Add `Service.map`.
+
+- Add `Service.map`.
 
 # 2.0.0-alpha.8
-* No longer export HTTP-specific code from `angel_framework.dart`.
-An import of `import 'package:angel_framework/http.dart';` will be necessary in most cases now.
+
+- No longer export HTTP-specific code from `angel_framework.dart`.
+  An import of `import 'package:angel_framework/http.dart';` will be necessary in most cases now.
 
 # 2.0.0-alpha.7
-* Force a tigher contract on services. They now must return `Data` on all
-methods except for `index`, which returns a `List<Data>`.
+
+- Force a tigher contract on services. They now must return `Data` on all
+  methods except for `index`, which returns a `List<Data>`.
 
 # 2.0.0-alpha.6
-* Allow passing a custom `Container` to `handleContained` and co.
+
+- Allow passing a custom `Container` to `handleContained` and co.
 
 # 2.0.0-alpha.5
-* `MapService` methods now explicitly return `Map<String, dynamic>`.
+
+- `MapService` methods now explicitly return `Map<String, dynamic>`.
 
 # 2.0.0-alpha.4
-* Renamed `waterfall` to `chain`.
-* Renamed `Routable.service` to `Routable.findService`.
-    * Also `Routable.findHookedService`.
+
+- Renamed `waterfall` to `chain`.
+- Renamed `Routable.service` to `Routable.findService`.
+  - Also `Routable.findHookedService`.
 
 # 2.0.0-alpha.3
-* Added `<Id, Data>` type parameters to `Service`.
-* `HookedService` now follows suit, and takes a third parameter, pointing to the inner service.
-* `Routable.use` now uses the generic parameters added to `Service`.
-* Added generic usage to `HookedServiceListener`, etc.
-* All service methods take `Map<String, dynamic>` as `params` now.
+
+- Added `<Id, Data>` type parameters to `Service`.
+- `HookedService` now follows suit, and takes a third parameter, pointing to the inner service.
+- `Routable.use` now uses the generic parameters added to `Service`.
+- Added generic usage to `HookedServiceListener`, etc.
+- All service methods take `Map<String, dynamic>` as `params` now.
 
 # 2.0.0-alpha.2
-* Added `ResponseContext.detach`.
+
+- Added `ResponseContext.detach`.
 
 # 2.0.0-alpha.1
-* Removed `Angel.injectEncoders`.
-* Added `Providers.toJson`.
-* Moved `Providers.graphql` to `Providers.graphQL`.
-* `Angel.optimizeForProduction` no longer calls `preInject`,
-as it does not need to.
-* Rename `ResponseContext.enableBuffer` to `ResponseContext.useBuffer`.
+
+- Removed `Angel.injectEncoders`.
+- Added `Providers.toJson`.
+- Moved `Providers.graphql` to `Providers.graphQL`.
+- `Angel.optimizeForProduction` no longer calls `preInject`,
+  as it does not need to.
+- Rename `ResponseContext.enableBuffer` to `ResponseContext.useBuffer`.
 
 # 2.0.0-alpha
-* Removed `random_string` dependency.
-* Moved reflection to `package:angel_container`.
-* Upgraded `package:file` to `5.0.0`.
-* `ResponseContext.sendFile` now uses `package:file`.
-* Abandon `ContentType` in favor of `MediaType`.
-* Changed view engine to use `Map<String, dynamic>`.
-* Remove dependency on `package:json_god` by default.
-* Remove dependency on `package:dart2_constant`.
-* Moved `lib/hooks.dart` into `package:angel_hooks`.
-* Moved `TypedService` into `package:angel_typed_service`.
-* Completely removed the `AngelBase` class.
-* Removed all `@deprecated` symbols.
-* `Service.toId` was renamed to `Service.parseId`; it also now uses its
-single type argument to determine how to parse a value.
-    * In addition, this method was also made `static`.
-* `RequestContext` and `ResponseContext` are now generic, and take a
-single type argument pointing to the underlying request/response type,
-respectively.
-* `RequestContext.io` and `ResponseContext.io` are now permanently
-gone.
-* `HttpRequestContextImpl` and `HttpResponseContextImpl` were renamed to
-`HttpRequestContext` and `HttpResponseContext`.
-* Lazy-parsing request bodies is now the default; `Angel.lazyParseBodies` was replaced
-with `Angel.eagerParseRequestBodies`.
-* `Angel.storeOriginalBuffer` -> `Angel.storeRawRequestBuffers`.
-* The methods `lazyBody`, `lazyFiles`, and `lazyOriginalBuffer` on `ResponseContext` were all
-replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
-* Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`),
-as well as `query`.
-* Removed `Angel.injections` and `RequestContext.injections`.
-* Removed `Angel.inject` and `RequestContext.inject`.
-* Removed a dependency on `package:pool`, which also meant removing `AngelHttp.throttle`.
-* Remove the `RequestMiddleware` typedef; from now on, one should use `ResponseContext.end`
-exclusively to close responses.
-* `waterfall` will now only accept `RequestHandler`.
-* `Routable`, and all of its subclasses, now extend `Router<RequestHandler>`, and therefore only
-take routes in the form of `FutureOr myFunc(RequestContext, ResponseContext res)`.
-* `@Middleware` now takes an `Iterable` of `RequestHandler`s.
-* `@Expose.path` now *must* be a `String`, not just any `Pattern`.
-* `@Expose.middleware` now takes `Iterable<RequestHandler>`, instead of just `List`.
-* `createDynamicHandler` was renamed to `ioc`, and is now used to run IoC-aware handlers in a
-type-safe manner.
-* `RequestContext.params` is now a `Map<String, dynamic>`, rather than just a `Map`.
-* Removed `RequestContext.grab`.
-* Removed `RequestContext.properties`.
-* Removed the defunct `debug` property where it still existed.
-* `Routable.use` now only accepts a `Service`.
-* Removed `Angel.createZoneForRequest`.
-* Removed `Angel.defaultZoneCreator`.
-* Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
-* Fix a bug where synchronous errors in `handleRequest` would not be caught.
-* `AngelHttp.useZone` now defaults to `false`.
-* `ResponseContext` now starts in streaming mode by default; the response buffer is opt-in,
-as in many cases it is unnecessary and slows down response time.
-* `ResponseContext.streaming` was replaced by `ResponseContext.isBuffered`.
-* Made `LockableBytesBuilder` public.
-* Removed the now-obsolete `ResponseContext.willCloseItself`.
-* Removed `ResponseContext.dispose`.
-* Removed the now-obsolete `ResponseContext.end`.
-* Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
-* `preInject` now takes a `Reflector` as its second argument.
-* `Angel.reflector` defaults to `const EmptyReflector()`, disabling
-reflection out-of-the-box.
\ No newline at end of file
+
+- Removed `random_string` dependency.
+- Moved reflection to `package:angel_container`.
+- Upgraded `package:file` to `5.0.0`.
+- `ResponseContext.sendFile` now uses `package:file`.
+- Abandon `ContentType` in favor of `MediaType`.
+- Changed view engine to use `Map<String, dynamic>`.
+- Remove dependency on `package:json_god` by default.
+- Remove dependency on `package:dart2_constant`.
+- Moved `lib/hooks.dart` into `package:angel_hooks`.
+- Moved `TypedService` into `package:angel_typed_service`.
+- Completely removed the `AngelBase` class.
+- Removed all `@deprecated` symbols.
+- `Service.toId` was renamed to `Service.parseId`; it also now uses its
+  single type argument to determine how to parse a value. \* In addition, this method was also made `static`.
+- `RequestContext` and `ResponseContext` are now generic, and take a
+  single type argument pointing to the underlying request/response type,
+  respectively.
+- `RequestContext.io` and `ResponseContext.io` are now permanently
+  gone.
+- `HttpRequestContextImpl` and `HttpResponseContextImpl` were renamed to
+  `HttpRequestContext` and `HttpResponseContext`.
+- Lazy-parsing request bodies is now the default; `Angel.lazyParseBodies` was replaced
+  with `Angel.eagerParseRequestBodies`.
+- `Angel.storeOriginalBuffer` -> `Angel.storeRawRequestBuffers`.
+- The methods `lazyBody`, `lazyFiles`, and `lazyOriginalBuffer` on `ResponseContext` were all
+  replaced with `parseBody`, `parseUploadedFiles`, and `parseRawRequestBuffer`, respectively.
+- Removed the synchronous equivalents of the above methods (`body`, `files`, and `originalBuffer`),
+  as well as `query`.
+- Removed `Angel.injections` and `RequestContext.injections`.
+- Removed `Angel.inject` and `RequestContext.inject`.
+- Removed a dependency on `package:pool`, which also meant removing `AngelHttp.throttle`.
+- Remove the `RequestMiddleware` typedef; from now on, one should use `ResponseContext.end`
+  exclusively to close responses.
+- `waterfall` will now only accept `RequestHandler`.
+- `Routable`, and all of its subclasses, now extend `Router<RequestHandler>`, and therefore only
+  take routes in the form of `FutureOr myFunc(RequestContext, ResponseContext res)`.
+- `@Middleware` now takes an `Iterable` of `RequestHandler`s.
+- `@Expose.path` now _must_ be a `String`, not just any `Pattern`.
+- `@Expose.middleware` now takes `Iterable<RequestHandler>`, instead of just `List`.
+- `createDynamicHandler` was renamed to `ioc`, and is now used to run IoC-aware handlers in a
+  type-safe manner.
+- `RequestContext.params` is now a `Map<String, dynamic>`, rather than just a `Map`.
+- Removed `RequestContext.grab`.
+- Removed `RequestContext.properties`.
+- Removed the defunct `debug` property where it still existed.
+- `Routable.use` now only accepts a `Service`.
+- Removed `Angel.createZoneForRequest`.
+- Removed `Angel.defaultZoneCreator`.
+- Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
+- Fix a bug where synchronous errors in `handleRequest` would not be caught.
+- `AngelHttp.useZone` now defaults to `false`.
+- `ResponseContext` now starts in streaming mode by default; the response buffer is opt-in,
+  as in many cases it is unnecessary and slows down response time.
+- `ResponseContext.streaming` was replaced by `ResponseContext.isBuffered`.
+- Made `LockableBytesBuilder` public.
+- Removed the now-obsolete `ResponseContext.willCloseItself`.
+- Removed `ResponseContext.dispose`.
+- Removed the now-obsolete `ResponseContext.end`.
+- Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
+- `preInject` now takes a `Reflector` as its second argument.
+- `Angel.reflector` defaults to `const EmptyReflector()`, disabling
+  reflection out-of-the-box.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 8ad806f3..9a858717 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -276,15 +276,6 @@ abstract class ResponseContext<RawResponse>
     redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
   }
 
-  /// Copies a file's contents into the response buffer.
-  void sendFile(File file) {
-    if (!isOpen) throw closed();
-
-    contentType = MediaType.parse(lookupMimeType(file.path));
-    buffer.add(file.readAsBytesSync());
-    close();
-  }
-
   /// Serializes data to the response.
   bool serialize(value, {MediaType contentType}) {
     if (!isOpen) throw closed();
@@ -299,7 +290,10 @@ abstract class ResponseContext<RawResponse>
   /// Streams a file to this response.
   Future streamFile(File file) {
     if (!isOpen) throw closed();
-    contentType = MediaType.parse(lookupMimeType(file.path));
+    var mimeType = app.mimeTypeResolver.lookup(file.path);
+    contentType = mimeType == null
+        ? new MediaType('application', 'octet-stream')
+        : MediaType.parse(mimeType);
     return file.openRead().pipe(this);
   }
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 39ab2024..0dd00111 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -11,6 +11,7 @@ import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
+import 'package:mime/mime.dart';
 import 'package:tuple/tuple.dart';
 
 import 'controller.dart';
@@ -48,6 +49,9 @@ class Angel extends Routable {
 
   final Map<dynamic, InjectionRequest> _preContained = {};
 
+  /// A [MimeTypeResolver] that can be used to specify the MIME types of files not known by `package:mime`.
+  final MimeTypeResolver mimeTypeResolver = new MimeTypeResolver();
+
   /// A middleware to inject a serialize on every request.
   String Function(dynamic) serializer;
 
diff --git a/pubspec.yaml b/pubspec.yaml
index a8816027..7ea4473e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.11
+version: 2.0.0-alpha.12
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From dde983245ded911a2bad2e554de652f12c8c6635 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 13 Nov 2018 16:17:31 -0500
Subject: [PATCH 327/414] 2.0.0-alpha.13

---
 CHANGELOG.md                            |  4 ++++
 example/json.dart                       |  6 ++----
 example/status.dart                     | 14 ++++++++++++++
 lib/src/http/http_response_context.dart |  1 +
 pubspec.yaml                            |  2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 example/status.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 775285b9..ef7ad449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.13
+
+- Fixed a logic error in `HttpResponseContext` that prevented status codes from being sent.
+
 # 2.0.0-alpha.12
 
 - Remove `ResponseContext.sendFile`.
diff --git a/example/json.dart b/example/json.dart
index 1969f510..b273b803 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -1,8 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
-
-import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 
@@ -33,11 +31,11 @@ main() async {
 }
 
 serverMain(_) async {
-  var app = new Angel(reflector: MirrorsReflector());
+  var app = new Angel();
   var http = new AngelHttp.custom(app, startShared); // Run a cluster
 
   app.get('/', (req, res) {
-    res.serialize({
+    return res.serialize({
       "foo": "bar",
       "one": [2, "three"],
       "bar": {"baz": "quux"}
diff --git a/example/status.dart b/example/status.dart
new file mode 100644
index 00000000..fb15fd4e
--- /dev/null
+++ b/example/status.dart
@@ -0,0 +1,14 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+
+main() async {
+  var app = new Angel();
+  var http = new AngelHttp(app);
+
+  app.fallback((req, res) {
+    res.statusCode = 304;
+  });
+
+  await http.startServer('127.0.0.1', 3000);
+  print('Listening at ${http.uri}');
+}
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 1f48c686..87a9d3fd 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -186,6 +186,7 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
       if (!_isClosed) {
         if (!isBuffered) {
           try {
+            _openStream();
             rawResponse.close();
           } catch (_) {
             // This only seems to occur on `MockHttpRequest`, but
diff --git a/pubspec.yaml b/pubspec.yaml
index 7ea4473e..42f0c2c8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.12
+version: 2.0.0-alpha.13
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 8ca8a9af3febb5fa63ac09e47c91f74873aa6680 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Tue, 13 Nov 2018 18:33:44 -0500
Subject: [PATCH 328/414] 2.0.0-alpha.14

---
 CHANGELOG.md                            | 3 +++
 lib/src/core/response_context.dart      | 5 +++--
 lib/src/http/http_response_context.dart | 6 ++++++
 pubspec.yaml                            | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef7ad449..e618a19a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.14
+* Patch `HttpResponseContext._openStream` to send content-length.
+
 # 2.0.0-alpha.13
 
 - Fixed a logic error in `HttpResponseContext` that prevented status codes from being sent.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 9a858717..eccea030 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -20,7 +20,8 @@ final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 abstract class ResponseContext<RawResponse>
     implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
-  final Map<String, String> _headers = new CaseInsensitiveMap.from({
+  final CaseInsensitiveMap<String> _headers =
+      new CaseInsensitiveMap<String>.from({
     'content-type': 'text/plain',
     'server': 'angel',
   });
@@ -56,7 +57,7 @@ abstract class ResponseContext<RawResponse>
   /// Headers that will be sent to the user.
   ///
   /// Note that if you have already started writing to the underlying stream, headers will not persist.
-  Map<String, String> get headers => _headers;
+  CaseInsensitiveMap<String> get headers => _headers;
 
   /// Serializes response data into a String.
   ///
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 87a9d3fd..50e3c546 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -86,6 +86,12 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
         ..statusCode = statusCode
         ..cookies.addAll(cookies);
       headers.forEach(rawResponse.headers.set);
+
+      if (headers.containsKey('content-length')) {
+        rawResponse.contentLength = int.tryParse(headers['content-length']) ??
+            rawResponse.contentLength;
+      }
+
       rawResponse.headers.contentType = new ContentType(
           contentType.type, contentType.subtype,
           charset: contentType.parameters['charset'],
diff --git a/pubspec.yaml b/pubspec.yaml
index 42f0c2c8..ee352e0f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.13
+version: 2.0.0-alpha.14
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 42fd60249231c87fb9283464efbdc5d07d1cb06d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 15 Nov 2018 16:21:46 -0500
Subject: [PATCH 329/414] Remove mirrors reflector in perf

---
 example/json.dart           | 2 +-
 performance/hello/main.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/json.dart b/example/json.dart
index b273b803..e5e6dcbe 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -32,7 +32,7 @@ main() async {
 
 serverMain(_) async {
   var app = new Angel();
-  var http = new AngelHttp.custom(app, startShared); // Run a cluster
+  var http = new AngelHttp.custom(app, startShared, useZone: false); // Run a cluster
 
   app.get('/', (req, res) {
     return res.serialize({
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index cb6a054f..f05aa073 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -24,7 +24,7 @@ main() async {
 }
 
 void start(int id) {
-  var app = new Angel(reflector: MirrorsReflector());
+  var app = new Angel();
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
   app.get('/', (req, res) => res.write('Hello, world!'));

From c20c25fc040613b7ec956a972f99c6b1d0b845fb Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 15 Nov 2018 16:22:45 -0500
Subject: [PATCH 330/414] opt4p

---
 performance/hello/main.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index f05aa073..bd7d96db 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -28,6 +28,7 @@ void start(int id) {
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
   app.get('/', (req, res) => res.write('Hello, world!'));
+  app.optimizeForProduction(force: true);
 
   var oldHandler = app.errorHandler;
   app.errorHandler = (e, req, res) {

From d3c21920425a86d805695a37cf58a0abb6d46559 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 8 Dec 2018 23:18:31 -0500
Subject: [PATCH 331/414] change body parsing

---
 lib/angel_framework.dart          |   1 -
 lib/src/core/request_context.dart | 150 ++++++++++++++++++++++--------
 lib/src/core/server.dart          |   5 -
 performance/hello/main.dart       |  25 +----
 performance/hello/raw.dart        |  12 +--
 pubspec.yaml                      |   2 +-
 6 files changed, 114 insertions(+), 81 deletions(-)

diff --git a/lib/angel_framework.dart b/lib/angel_framework.dart
index 3f63c839..60a495e6 100644
--- a/lib/angel_framework.dart
+++ b/lib/angel_framework.dart
@@ -4,5 +4,4 @@ library angel_framework;
 export 'package:angel_http_exception/angel_http_exception.dart';
 export 'package:angel_model/angel_model.dart';
 export 'package:angel_route/angel_route.dart';
-export 'package:body_parser/body_parser.dart' show FileUploadInfo;
 export 'src/core/core.dart';
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index b0e1fac1..57e12673 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -1,12 +1,14 @@
 library angel_framework.http.request_context;
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io' show Cookie, HttpHeaders, HttpSession, InternetAddress;
 
 import 'package:angel_container/angel_container.dart';
-import 'package:body_parser/body_parser.dart';
 import 'package:http_parser/http_parser.dart';
+import 'package:http_server/http_server.dart';
 import 'package:meta/meta.dart';
+import 'package:mime/mime.dart';
 import 'package:path/path.dart' as p;
 
 import 'metadata.dart';
@@ -19,9 +21,12 @@ part 'injection.dart';
 /// A convenience wrapper around an incoming [RawRequest].
 abstract class RequestContext<RawRequest> {
   String _acceptHeaderCache, _extensionCache;
-  bool _acceptsAllCache;
-  BodyParseResult _body;
-  Map _provisionalQuery;
+  bool _acceptsAllCache, _hasParsedBody;
+  Map<String, dynamic> _bodyFields, _queryParameters;
+  List _bodyList;
+  Object _bodyObject;
+  List<HttpMultipartFormData> _bodyFiles;
+  MediaType _contentType;
 
   /// The underlying [RawRequest] provided by the driver.
   RawRequest get rawRequest;
@@ -60,7 +65,7 @@ abstract class RequestContext<RawRequest> {
 
   /// The content type of an incoming request.
   MediaType get contentType =>
-      new MediaType.parse(headers.contentType.toString());
+      _contentType ??= new MediaType.parse(headers.contentType.toString());
 
   /// The URL parameters extracted from the request URI.
   Map<String, dynamic> params = <String, dynamic>{};
@@ -83,6 +88,64 @@ abstract class RequestContext<RawRequest> {
   /// The [Uri] instance representing the path this request is responding to.
   Uri get uri;
 
+  /// The [Stream] of incoming binary data sent from the client.
+  Stream<List<int>> get body;
+
+  /// Returns `true` if [parseBody] has been called so far.
+  bool get hasParsedBody => _hasParsedBody;
+
+  /// Returns a *mutable* [Map] of the fields parsed from the request [body].
+  ///
+  /// Note that [parseBody] must be called first.
+  Map<String, dynamic> get bodyFields {
+    if (!hasParsedBody) {
+      throw new StateError('The request body has not been parsed yet.');
+    } else if (_bodyFields == null) {
+      throw new StateError('The request body, $_bodyObject, is not a Map.');
+    }
+
+    return _bodyFields;
+  }
+
+  /// Returns a *mutable* [List] parsed from the request [body].
+  ///
+  /// Note that [parseBody] must be called first.
+  List get bodyList {
+    if (!hasParsedBody) {
+      throw new StateError('The request body has not been parsed yet.');
+    } else if (_bodyList == null) {
+      throw new StateError('The request body, $_bodyObject, is not a List.');
+    }
+
+    return _bodyList;
+  }
+
+  /// Returns the parsed request body, whatever it may be (typically a [Map] or [List]).
+  ///
+  /// Note that [parseBody] must be called first.
+  Object get bodyObject {
+    if (!hasParsedBody) {
+      throw new StateError('The request body has not been parsed yet.');
+    }
+
+    return _bodyObject;
+  }
+
+  /// Returns a *mutable* map of the files parsed from the request [body].
+  ///
+  /// Note that [parseBody] must be called first.
+  List<HttpMultipartFormData> get bodyFiles {
+    if (!hasParsedBody) {
+      throw new StateError('The request body has not been parsed yet.');
+    }
+
+    return _bodyFiles;
+  }
+
+  /// Returns a *mutable* map of the fields contained in the query.
+  Map<String, dynamic> get queryParameters =>
+      _queryParameters ??= new Map<String, dynamic>.from(uri.queryParameters);
+
   /// Returns the file extension of the requested path, if any.
   ///
   /// Includes the leading `.`, if there is one.
@@ -120,49 +183,54 @@ abstract class RequestContext<RawRequest> {
   /// Returns as `true` if the client's `Accept` header indicates that it will accept any response content type.
   bool get acceptsAll => _acceptsAllCache ??= accepts('*/*');
 
-  /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the body.
-  Future<Map> parseBody() => parse().then((b) => b.body);
-
-  /// Retrieves a list of all uploaded files if it has already been parsed, or lazy-parses it before returning the files.
-  Future<List<FileUploadInfo>> parseUploadedFiles() =>
-      parse().then((b) => b.files);
-
-  /// Retrieves the original request buffer if it has already been parsed, or lazy-parses it before returning the buffer..
-  ///
-  /// This will return an empty `List` if you have not enabled `keepRawRequestBuffers` on your [Angel] instance.
-  Future<List<int>> parseRawRequestBuffer() =>
-      parse().then((b) => b.originalBuffer);
-
-  /// Retrieves the request body if it has already been parsed, or lazy-parses it before returning the query.
-  ///
-  /// If [forceParse] is not `true`, then [uri].query will be returned, and no parsing will be performed.
-  Future<Map<String, dynamic>> parseQuery({bool forceParse: false}) {
-    if (_body == null && forceParse != true)
-      return new Future.value(
-          new Map<String, dynamic>.from(uri.queryParameters));
-    else
-      return parse().then((b) => b.query);
-  }
-
   /// Manually parses the request body, if it has not already been parsed.
-  Future<BodyParseResult> parse() {
-    if (_body != null)
-      return new Future.value(_body);
-    else
-      _provisionalQuery = null;
-    return parseOnce().then((body) => _body = body);
-  }
+  Future<void> parseBody({Encoding encoding: utf8}) async {
+    if (!_hasParsedBody) {
+      _hasParsedBody = true;
 
-  /// Override this method to one-time parse an incoming request.
-  @virtual
-  Future<BodyParseResult> parseOnce();
+      if (contentType.type == 'application' && contentType.subtype == 'json') {
+        _bodyFiles = [];
+
+        var parsed = _bodyObject =
+            await body.transform(encoding.decoder).join().then(json.decode);
+
+        if (parsed is Map) {
+          _bodyFields = new Map<String, dynamic>.from(parsed);
+        } else if (parsed is List) {
+          _bodyList = parsed;
+        }
+      } else if (contentType.type == 'multipart' &&
+          contentType.subtype == 'form-data' &&
+          contentType.parameters.containsKey('boundary')) {
+        var boundary = contentType.parameters['boundary'];
+        var transformer = new MimeMultipartTransformer(boundary);
+        var parts = body.transform(transformer).map((part) =>
+            HttpMultipartFormData.parse(part, defaultEncoding: encoding));
+        _bodyFields = {};
+        _bodyFiles = [];
+
+        await for (var part in parts) {
+          if (part.isBinary) {
+            _bodyFiles.add(part);
+          } else if (part.isText &&
+              part.contentDisposition.parameters.containsKey('name')) {
+            // If there is no name, then don't parse it.
+            var key = part.contentDisposition.parameters['name'];
+            var value = await part.join();
+            _bodyFields[key] = value;
+          }
+        }
+      } else {
+        _bodyFields = {};
+        _bodyFiles = [];
+      }
+    }
+  }
 
   /// Disposes of all resources.
   Future close() {
-    _body = null;
     _acceptsAllCache = null;
     _acceptHeaderCache = null;
-    _provisionalQuery?.clear();
     serviceParams.clear();
     params.clear();
     return new Future.value();
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 0dd00111..8449052f 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -119,10 +119,6 @@ class Angel extends Routable {
   /// or use `lazyBody()`.
   bool eagerParseRequestBodies = false;
 
-  /// When set to `true`, the original body bytes will be stored
-  /// on requests. `false` by default.
-  bool keepRawRequestBuffers = false;
-
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
@@ -364,7 +360,6 @@ class Angel extends Routable {
       this.logger,
       this.eagerParseRequestBodies: false,
       this.allowMethodOverrides: true,
-      this.keepRawRequestBuffers: false,
       this.serializer,
       this.viewGenerator})
       : super(reflector) {
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index bd7d96db..12d3d81a 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -1,29 +1,10 @@
 /// A basic server that prints "Hello, world!"
 library performance.hello;
 
-import 'dart:async';
-import 'dart:io';
-import 'dart:isolate';
-import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 
 main() async {
-  var isolates = <Isolate>[];
-
-  for (int i = 0; i < Platform.numberOfProcessors; i++) {
-    isolates.add(await Isolate.spawn(start, i + 1));
-  }
-
-  await Future.wait(isolates.map((i) {
-    var rcv = new ReceivePort();
-    i.addOnExitListener(rcv.sendPort);
-    return rcv.first;
-  }));
-  //start(0);
-}
-
-void start(int id) {
   var app = new Angel();
   var http = new AngelHttp.custom(app, startShared, useZone: false);
 
@@ -37,8 +18,6 @@ void start(int id) {
     return oldHandler(e, req, res);
   };
 
-  http.startServer('127.0.0.1', 3000).then((server) {
-    print(
-        'Instance #$id listening at http://${server.address.address}:${server.port}');
-  });
+  await http.startServer('127.0.0.1', 3000);
+  print('Listening at ${http.uri}');
 }
diff --git a/performance/hello/raw.dart b/performance/hello/raw.dart
index 956056b2..423ba843 100644
--- a/performance/hello/raw.dart
+++ b/performance/hello/raw.dart
@@ -2,18 +2,10 @@
 library performance.hello;
 
 import 'dart:io';
-import 'dart:isolate';
 
 main() {
-  for (int i = 0; i < Platform.numberOfProcessors - 1; i++)
-    Isolate.spawn(start, i + 1);
-  start(0);
-}
-
-void start(int id) {
-  HttpServer.bind('127.0.0.1', 3000, shared: true).then((server) {
-    print(
-        'Instance #$id listening at http://${server.address.address}:${server.port}');
+  return HttpServer.bind('127.0.0.1', 3000, shared: true).then((server) {
+    print('Listening at http://${server.address.address}:${server.port}');
 
     server.listen((request) {
       if (request.uri.path == '/') {
diff --git a/pubspec.yaml b/pubspec.yaml
index ee352e0f..f1529a91 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,11 +10,11 @@ dependencies:
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0
   angel_route: ^3.0.0
-  body_parser: ^1.0.0
   charcode: ^1.0.0
   combinator: ^1.0.0
   file: ^5.0.0
   http_parser: ^3.0.0
+  http_server: ^0.9.0
   http2: ">=0.1.7 <2.0.0"
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0

From f95de91bf52bb6e997236603baf1c7e8b034d650 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 9 Dec 2018 10:49:59 -0500
Subject: [PATCH 332/414] 2.0.0-alpha.15

---
 CHANGELOG.md                             |   7 +
 example/http2/body_parsing.dart          |   2 +-
 example/http2/main.dart                  |   2 +-
 example/http2/server_push.dart           |   2 +-
 example/json.dart                        |   3 +-
 lib/src/core/request_context.dart        |  66 +++++++--
 lib/src/core/server.dart                 |   6 -
 lib/src/core/service.dart                | 164 ++++++++++-------------
 lib/src/http/http_request_context.dart   |  19 +--
 lib/src/http2/http2_request_context.dart |  72 ++++++----
 pubspec.yaml                             |   2 +-
 test/http2/adapter_test.dart             |  16 ++-
 test/http2/http2_client.dart             |   2 +-
 test/routing_test.dart                   |   7 +-
 test/services_test.dart                  |   2 +
 15 files changed, 203 insertions(+), 169 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e618a19a..9ed1eeb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2.0.0-alpha.15
+* Remove dependency on `body_parser`.
+* `RequestContext` now exposes a `Stream<List<int>> get body` getter.
+    * Calling `RequestContext.parseBody()` parses its contents.
+    * Added `bodyAsMap`, `bodyAsList`, `bodyAsObject`, and `uploadedFiles` to `RequestContext`.
+    * Removed `Angel.keepRawRequestBuffers` and anything that had to do with buffering request bodies.
+
 # 2.0.0-alpha.14
 * Patch `HttpResponseContext._openStream` to send content-length.
 
diff --git a/example/http2/body_parsing.dart b/example/http2/body_parsing.dart
index b7d0fc77..93c4a78d 100644
--- a/example/http2/body_parsing.dart
+++ b/example/http2/body_parsing.dart
@@ -16,7 +16,7 @@ main() async {
 
   app.get('/', (req, res) => res.streamFile(indexHtml));
 
-  app.post('/', (req, res) => req.parseBody());
+  app.post('/', (req, res) => req.parseBody().then((_) => req.bodyAsMap));
 
   var ctx = new SecurityContext()
     ..useCertificateChain('dev.pem')
diff --git a/example/http2/main.dart b/example/http2/main.dart
index 04a3ed98..e381c48c 100644
--- a/example/http2/main.dart
+++ b/example/http2/main.dart
@@ -16,7 +16,7 @@ main() async {
   app.get('/', (req, res) => 'Hello HTTP/2!!!');
 
   app.fallback((req, res) => throw new AngelHttpException.notFound(
-      message: 'No file exists at ${req.uri.path}'));
+      message: 'No file exists at ${req.uri}'));
 
   var ctx = new SecurityContext()
     ..useCertificateChain('dev.pem')
diff --git a/example/http2/server_push.dart b/example/http2/server_push.dart
index 814acf4f..439b7fb9 100644
--- a/example/http2/server_push.dart
+++ b/example/http2/server_push.dart
@@ -10,7 +10,7 @@ main() async {
   var app = new Angel();
   app.logger = new Logger('angel')..onRecord.listen(prettyLog);
 
-  var publicDir = new Directory('example/public');
+  var publicDir = new Directory('example/http2/public');
   var indexHtml =
       const LocalFileSystem().file(publicDir.uri.resolve('index.html'));
   var styleCss =
diff --git a/example/json.dart b/example/json.dart
index e5e6dcbe..23dac1a2 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -32,7 +32,8 @@ main() async {
 
 serverMain(_) async {
   var app = new Angel();
-  var http = new AngelHttp.custom(app, startShared, useZone: false); // Run a cluster
+  var http =
+      new AngelHttp.custom(app, startShared, useZone: false); // Run a cluster
 
   app.get('/', (req, res) {
     return res.serialize({
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 57e12673..0e081106 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -2,12 +2,12 @@ library angel_framework.http.request_context;
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io' show Cookie, HttpHeaders, HttpSession, InternetAddress;
+import 'dart:io'
+    show Cookie, HeaderValue, HttpHeaders, HttpSession, InternetAddress;
 
 import 'package:angel_container/angel_container.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:http_server/http_server.dart';
-import 'package:meta/meta.dart';
 import 'package:mime/mime.dart';
 import 'package:path/path.dart' as p;
 
@@ -21,11 +21,11 @@ part 'injection.dart';
 /// A convenience wrapper around an incoming [RawRequest].
 abstract class RequestContext<RawRequest> {
   String _acceptHeaderCache, _extensionCache;
-  bool _acceptsAllCache, _hasParsedBody;
+  bool _acceptsAllCache, _hasParsedBody = false;
   Map<String, dynamic> _bodyFields, _queryParameters;
   List _bodyList;
   Object _bodyObject;
-  List<HttpMultipartFormData> _bodyFiles;
+  List<UploadedFile> _uploadedFiles;
   MediaType _contentType;
 
   /// The underlying [RawRequest] provided by the driver.
@@ -97,7 +97,7 @@ abstract class RequestContext<RawRequest> {
   /// Returns a *mutable* [Map] of the fields parsed from the request [body].
   ///
   /// Note that [parseBody] must be called first.
-  Map<String, dynamic> get bodyFields {
+  Map<String, dynamic> get bodyAsMap {
     if (!hasParsedBody) {
       throw new StateError('The request body has not been parsed yet.');
     } else if (_bodyFields == null) {
@@ -110,7 +110,7 @@ abstract class RequestContext<RawRequest> {
   /// Returns a *mutable* [List] parsed from the request [body].
   ///
   /// Note that [parseBody] must be called first.
-  List get bodyList {
+  List get bodyAsList {
     if (!hasParsedBody) {
       throw new StateError('The request body has not been parsed yet.');
     } else if (_bodyList == null) {
@@ -123,7 +123,7 @@ abstract class RequestContext<RawRequest> {
   /// Returns the parsed request body, whatever it may be (typically a [Map] or [List]).
   ///
   /// Note that [parseBody] must be called first.
-  Object get bodyObject {
+  Object get bodyAsObject {
     if (!hasParsedBody) {
       throw new StateError('The request body has not been parsed yet.');
     }
@@ -134,12 +134,12 @@ abstract class RequestContext<RawRequest> {
   /// Returns a *mutable* map of the files parsed from the request [body].
   ///
   /// Note that [parseBody] must be called first.
-  List<HttpMultipartFormData> get bodyFiles {
+  List<UploadedFile> get uploadedFiles {
     if (!hasParsedBody) {
       throw new StateError('The request body has not been parsed yet.');
     }
 
-    return _bodyFiles;
+    return _uploadedFiles;
   }
 
   /// Returns a *mutable* map of the fields contained in the query.
@@ -189,7 +189,7 @@ abstract class RequestContext<RawRequest> {
       _hasParsedBody = true;
 
       if (contentType.type == 'application' && contentType.subtype == 'json') {
-        _bodyFiles = [];
+        _uploadedFiles = [];
 
         var parsed = _bodyObject =
             await body.transform(encoding.decoder).join().then(json.decode);
@@ -199,6 +199,14 @@ abstract class RequestContext<RawRequest> {
         } else if (parsed is List) {
           _bodyList = parsed;
         }
+      } else if (contentType.type == 'application' &&
+          contentType.subtype == 'x-www-form-urlencoded') {
+        _uploadedFiles = [];
+        var parsed = await body
+            .transform(encoding.decoder)
+            .join()
+            .then((s) => Uri.splitQueryString(s, encoding: encoding));
+        _bodyFields = new Map<String, dynamic>.from(parsed);
       } else if (contentType.type == 'multipart' &&
           contentType.subtype == 'form-data' &&
           contentType.parameters.containsKey('boundary')) {
@@ -207,11 +215,11 @@ abstract class RequestContext<RawRequest> {
         var parts = body.transform(transformer).map((part) =>
             HttpMultipartFormData.parse(part, defaultEncoding: encoding));
         _bodyFields = {};
-        _bodyFiles = [];
+        _uploadedFiles = [];
 
         await for (var part in parts) {
           if (part.isBinary) {
-            _bodyFiles.add(part);
+            _uploadedFiles.add(new UploadedFile(part));
           } else if (part.isText &&
               part.contentDisposition.parameters.containsKey('name')) {
             // If there is no name, then don't parse it.
@@ -222,7 +230,7 @@ abstract class RequestContext<RawRequest> {
         }
       } else {
         _bodyFields = {};
-        _bodyFiles = [];
+        _uploadedFiles = [];
       }
     }
   }
@@ -236,3 +244,35 @@ abstract class RequestContext<RawRequest> {
     return new Future.value();
   }
 }
+
+/// Reads information about a binary chunk uploaded to the server.
+class UploadedFile {
+  /// The underlying `form-data` item.
+  final HttpMultipartFormData formData;
+
+  MediaType _contentType;
+
+  UploadedFile(this.formData);
+
+  /// Returns the binary stream from [formData].
+  Stream<List<int>> get data => formData.cast<List<int>>();
+
+  /// The filename associated with the data on the user's system.
+  /// Returns [:null:] if not present.
+  String get filename => formData.contentDisposition.parameters['filename'];
+
+  /// The name of the field associated with this data.
+  /// Returns [:null:] if not present.
+  String get name => formData.contentDisposition.parameters['name'];
+
+  /// The parsed [:Content-Type:] header of the [:HttpMultipartFormData:].
+  /// Returns [:null:] if not present.
+  MediaType get contentType => _contentType ??= (formData.contentType == null
+      ? null
+      : new MediaType.parse(formData.contentType.toString()));
+
+  /// The parsed [:Content-Transfer-Encoding:] header of the
+  /// [:HttpMultipartFormData:]. This field is used to determine how to decode
+  /// the data. Returns [:null:] if not present.
+  HeaderValue get contentTransferEncoding => formData.contentTransferEncoding;
+}
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 8449052f..a86fc84d 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -114,11 +114,6 @@ class Angel extends Routable {
   /// for you.
   final Map configuration = {};
 
-  /// When set to `true` (default: `false`), the request body will be parsed
-  /// automatically; otherwise, you must call [RequestContext].parseBody() manually,
-  /// or use `lazyBody()`.
-  bool eagerParseRequestBodies = false;
-
   /// A function that renders views.
   ///
   /// Called by [ResponseContext]@`render`.
@@ -358,7 +353,6 @@ class Angel extends Routable {
   Angel(
       {Reflector reflector: const EmptyReflector(),
       this.logger,
-      this.eagerParseRequestBodies: false,
       this.allowMethodOverrides: true,
       this.serializer,
       this.viewGenerator})
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index a5c9306f..a330b0d7 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -200,13 +200,11 @@ class Service<Id, Data> extends Routable {
     Middleware indexMiddleware =
         getAnnotation(service.index, Middleware, app.container.reflector);
     get('/', (req, res) {
-      return req.parseQuery().then((query) {
-        return this.index(mergeMap([
-          {'query': query},
-          restProvider,
-          req.serviceParams
-        ]));
-      });
+      return this.index(mergeMap([
+        {'query': req.queryParameters},
+        restProvider,
+        req.serviceParams
+      ]));
     },
         middleware: <RequestHandler>[]
           ..addAll(handlers)
@@ -215,20 +213,18 @@ class Service<Id, Data> extends Routable {
     Middleware createMiddleware =
         getAnnotation(service.create, Middleware, app.container.reflector);
     post('/', (req, ResponseContext res) {
-      return req.parseQuery().then((query) {
-        return req.parseBody().then((body) {
-          return this
-              .create(
-                  body as Data,
-                  mergeMap([
-                    {'query': query},
-                    restProvider,
-                    req.serviceParams
-                  ]))
-              .then((r) {
-            res.statusCode = 201;
-            return r;
-          });
+      return req.parseBody().then((_) {
+        return this
+            .create(
+                req.bodyAsMap as Data,
+                mergeMap([
+                  {'query': req.queryParameters},
+                  restProvider,
+                  req.serviceParams
+                ]))
+            .then((r) {
+          res.statusCode = 201;
+          return r;
         });
       });
     },
@@ -241,15 +237,13 @@ class Service<Id, Data> extends Routable {
         getAnnotation(service.read, Middleware, app.container.reflector);
 
     get('/:id', (req, res) {
-      return req.parseQuery().then((query) {
-        return this.read(
-            parseId<Id>(req.params['id']),
-            mergeMap([
-              {'query': query},
-              restProvider,
-              req.serviceParams
-            ]));
-      });
+      return this.read(
+          parseId<Id>(req.params['id']),
+          mergeMap([
+            {'query': req.queryParameters},
+            restProvider,
+            req.serviceParams
+          ]));
     },
         middleware: []
           ..addAll(handlers)
@@ -257,20 +251,18 @@ class Service<Id, Data> extends Routable {
 
     Middleware modifyMiddleware =
         getAnnotation(service.modify, Middleware, app.container.reflector);
-    patch(
-        '/:id',
-        (req, res) => req.parseBody().then((body) {
-              return req.parseQuery().then((query) {
-                return this.modify(
-                    parseId<Id>(req.params['id']),
-                    body as Data,
-                    mergeMap([
-                      {'query': query},
-                      restProvider,
-                      req.serviceParams
-                    ]));
-              });
-            }),
+    patch('/:id', (req, res) {
+      return req.parseBody().then((_) {
+        return this.modify(
+            parseId<Id>(req.params['id']),
+            req.bodyAsMap as Data,
+            mergeMap([
+              {'query': req.queryParameters},
+              restProvider,
+              req.serviceParams
+            ]));
+      });
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -278,38 +270,34 @@ class Service<Id, Data> extends Routable {
 
     Middleware updateMiddleware =
         getAnnotation(service.update, Middleware, app.container.reflector);
-    post(
-        '/:id',
-        (req, res) => req.parseBody().then((body) {
-              return req.parseQuery().then((query) {
-                return this.update(
-                    parseId<Id>(req.params['id']),
-                    body as Data,
-                    mergeMap([
-                      {'query': query},
-                      restProvider,
-                      req.serviceParams
-                    ]));
-              });
-            }),
+    post('/:id', (req, res) {
+      return req.parseBody().then((_) {
+        return this.update(
+            parseId<Id>(req.params['id']),
+            req.bodyAsMap as Data,
+            mergeMap([
+              {'query': req.queryParameters},
+              restProvider,
+              req.serviceParams
+            ]));
+      });
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
-    put(
-        '/:id',
-        (req, res) => req.parseBody().then((body) {
-              return req.parseQuery().then((query) {
-                return this.update(
-                    parseId<Id>(req.params['id']),
-                    body as Data,
-                    mergeMap([
-                      {'query': query},
-                      restProvider,
-                      req.serviceParams
-                    ]));
-              });
-            }),
+    put('/:id', (req, res) {
+      return req.parseBody().then((_) {
+        return this.update(
+            parseId<Id>(req.params['id']),
+            req.bodyAsMap as Data,
+            mergeMap([
+              {'query': req.queryParameters},
+              restProvider,
+              req.serviceParams
+            ]));
+      });
+    },
         middleware: []
           ..addAll(handlers)
           ..addAll(
@@ -318,30 +306,26 @@ class Service<Id, Data> extends Routable {
     Middleware removeMiddleware =
         getAnnotation(service.remove, Middleware, app.container.reflector);
     delete('/', (req, res) {
-      return req.parseQuery().then((query) {
-        return this.remove(
-            null,
-            mergeMap([
-              {'query': query},
-              restProvider,
-              req.serviceParams
-            ]));
-      });
+      return this.remove(
+          null,
+          mergeMap([
+            {'query': req.queryParameters},
+            restProvider,
+            req.serviceParams
+          ]));
     },
         middleware: []
           ..addAll(handlers)
           ..addAll(
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
     delete('/:id', (req, res) {
-      return req.parseQuery().then((query) {
-        return this.remove(
-            parseId<Id>(req.params['id']),
-            mergeMap([
-              {'query': query},
-              restProvider,
-              req.serviceParams
-            ]));
-      });
+      return this.remove(
+          parseId<Id>(req.params['id']),
+          mergeMap([
+            {'query': req.queryParameters},
+            restProvider,
+            req.serviceParams
+          ]));
     },
         middleware: []
           ..addAll(handlers)
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index e8d21c0d..f9408580 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:angel_container/angel_container.dart';
-import 'package:body_parser/body_parser.dart';
 import 'package:http_parser/http_parser.dart';
 
 import '../core/core.dart';
@@ -40,6 +39,9 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
   /// The underlying [HttpRequest] instance underneath this context.
   HttpRequest get rawRequest => _io;
 
+  @override
+  Stream<List<int>> get body => _io;
+
   @override
   String get method {
     return _override ?? originalMethod;
@@ -120,10 +122,6 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
     ctx._path = path;
     ctx._io = request;
 
-    if (app.eagerParseRequestBodies == true) {
-      return ctx.parse().then((_) => ctx);
-    }
-
     return new Future.value(ctx);
   }
 
@@ -134,15 +132,4 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
     _override = _path = null;
     return super.close();
   }
-
-  @override
-  Future<BodyParseResult> parseOnce() {
-    return parseBodyFromStream(
-        rawRequest,
-        rawRequest.headers.contentType != null
-            ? new MediaType.parse(rawRequest.headers.contentType.toString())
-            : null,
-        rawRequest.uri,
-        storeOriginalBuffer: app.keepRawRequestBuffers == true);
-  }
 }
diff --git a/lib/src/http2/http2_request_context.dart b/lib/src/http2/http2_request_context.dart
index f15b247e..3381383f 100644
--- a/lib/src/http2/http2_request_context.dart
+++ b/lib/src/http2/http2_request_context.dart
@@ -3,8 +3,6 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:angel_container/src/container.dart';
 import 'package:angel_framework/angel_framework.dart';
-import 'package:body_parser/body_parser.dart';
-import 'package:http_parser/http_parser.dart';
 import 'package:http2/transport.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:uuid/uuid.dart';
@@ -13,8 +11,8 @@ final RegExp _comma = new RegExp(r',\s*');
 final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 class Http2RequestContext extends RequestContext<ServerTransportStream> {
+  final StreamController<List<int>> _body = new StreamController();
   final Container container;
-  BytesBuilder _buf;
   List<Cookie> _cookies;
   HttpHeaders _headers;
   String _method, _override, _path;
@@ -25,27 +23,48 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
 
   Http2RequestContext._(this.container);
 
+  @override
+  Stream<List<int>> get body => _body.stream;
+
   static Future<Http2RequestContext> from(
       ServerTransportStream stream,
       Socket socket,
       Angel app,
       Map<String, MockHttpSession> sessions,
       Uuid uuid) async {
+    var c = new Completer<Http2RequestContext>();
     var req = new Http2RequestContext._(app.container.createChild())
       ..app = app
       .._socket = socket
       .._stream = stream;
 
-    var buf = req._buf = new BytesBuilder();
     var headers = req._headers = new MockHttpHeaders();
-    String scheme = 'https',
-        authority = '${socket.address.address}:${socket.port}',
-        path = '';
+    String scheme = 'https', host = socket.address.address, path = '';
+    int port = socket.port;
     var cookies = <Cookie>[];
 
-    await for (var msg in stream.incomingMessages) {
+    void finalize() {
+      req
+        .._cookies = new List.unmodifiable(cookies)
+        .._uri = new Uri(scheme: scheme, host: host, port: port, path: path);
+      if (!c.isCompleted) c.complete(req);
+    }
+
+    void parseHost(String value) {
+      var uri = Uri.tryParse(value);
+      if (uri == null || uri.scheme == 'localhost') return;
+      scheme = uri.hasScheme ? uri.scheme : scheme;
+
+      if (uri.hasAuthority) {
+        host = uri.host;
+        port = uri.hasPort ? uri.port : null;
+      }
+    }
+
+    stream.incomingMessages.listen((msg) {
       if (msg is DataStreamMessage) {
-        buf.add(msg.bytes);
+        if (!c.isCompleted) finalize();
+        req._body.add(msg.bytes);
       } else if (msg is HeadersStreamMessage) {
         for (var header in msg.headers) {
           var name = ascii.decode(header.name).toLowerCase();
@@ -64,7 +83,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
               scheme = value;
               break;
             case ':authority':
-              authority = value;
+              parseHost(value);
               break;
             case 'cookie':
               var cookieStrings = value.split(';').map((s) => s.trim());
@@ -78,18 +97,22 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
               }
               break;
             default:
-              headers.add(ascii.decode(header.name), value.split(_comma));
+              var name = ascii.decode(header.name).toLowerCase();
+
+              if (name == 'host') {
+                parseHost(value);
+              }
+
+              headers.add(name, value.split(_comma));
               break;
           }
         }
+
+        if (msg.endStream && !c.isCompleted) finalize();
       }
-
-      //if (msg.endStream) break;
-    }
-
-    req
-      .._cookies = new List.unmodifiable(cookies)
-      .._uri = Uri.parse('$scheme://$authority').replace(path: path);
+    }, onDone: () {
+      if (!c.isCompleted) finalize();
+    }, cancelOnError: true, onError: c.completeError);
 
     // Apply session
     var dartSessId =
@@ -104,7 +127,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
       () => new MockHttpSession(id: dartSessId.value),
     );
 
-    return req;
+    return c.future;
   }
 
   @override
@@ -147,19 +170,10 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
 
   @override
   Future close() {
+    _body.close();
     return super.close();
   }
 
-  @override
-  Future<BodyParseResult> parseOnce() {
-    return parseBodyFromStream(
-      new Stream.fromIterable([_buf.takeBytes()]),
-      contentType == null ? null : new MediaType.parse(contentType.toString()),
-      uri,
-      storeOriginalBuffer: app.keepRawRequestBuffers == true,
-    );
-  }
-
   @override
   ServerTransportStream get rawRequest => _stream;
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index f1529a91..245e192e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.14
+version: 2.0.0-alpha.15
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
index 547a7878..d16b5a09 100644
--- a/test/http2/adapter_test.dart
+++ b/test/http2/adapter_test.dart
@@ -25,9 +25,7 @@ void main() {
   Uri serverRoot;
 
   setUp(() async {
-    app = new Angel()
-      ..keepRawRequestBuffers = true
-      ..encoders['gzip'] = gzip.encoder;
+    app = new Angel()..encoders['gzip'] = gzip.encoder;
 
     app.get('/', (req, res) async {
       res.write('Hello world');
@@ -50,13 +48,17 @@ void main() {
       await res.close();
     });
 
-    app.post('/body', (req, res) => req.parseBody());
+    app.post('/body', (req, res) => req.parseBody().then((_) => req.bodyAsMap));
 
     app.post('/upload', (req, res) async {
-      var body = await req.parseBody(), files = await req.parseUploadedFiles();
-      stdout.add(await req.parseRawRequestBuffer());
+      await req.parseBody();
+      var body = req.bodyAsMap, files = req.uploadedFiles;
       var file = files.firstWhere((f) => f.name == 'file');
-      return [file.data.length, file.mimeType, body];
+      return [
+        await file.data.map((l) => l.length).reduce((a, b) => a + b),
+        file.contentType.mimeType,
+        body
+      ];
     });
 
     app.get('/push', (req, res) async {
diff --git a/test/http2/http2_client.dart b/test/http2/http2_client.dart
index 5263d2b7..ebf46bab 100644
--- a/test/http2/http2_client.dart
+++ b/test/http2/http2_client.dart
@@ -38,7 +38,7 @@ class Http2Client extends BaseClient {
       headers.add(new Header.ascii(k, v));
     });
 
-    var stream = await connection.makeRequest(headers);
+    var stream = await connection.makeRequest(headers, endStream: body.isEmpty);
 
     if (body.isNotEmpty) {
       stream.sendData(body, endStream: true);
diff --git a/test/routing_test.dart b/test/routing_test.dart
index e283d708..15424b19 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -75,7 +75,10 @@ main() {
         middleware: [interceptor]);
     app.get('/hello', (req, res) => 'world');
     app.get('/name/:first/last/:last', (req, res) => req.params);
-    app.post('/lambda', (RequestContext req, res) => req.parseBody());
+    app.post(
+        '/lambda',
+        (RequestContext req, res) =>
+            req.parseBody().then((_) => req.bodyAsMap));
     app.mount('/todos/:id', todos);
     app
         .get('/greet/:name',
@@ -85,7 +88,7 @@ main() {
       res.redirectTo('Named routes', {'name': 'tests'});
     });
     app.get('/log', (RequestContext req, res) async {
-      print("Query: ${await req.parseQuery()}");
+      print("Query: ${req.queryParameters}");
       return "Logged";
     });
 
diff --git a/test/services_test.dart b/test/services_test.dart
index d5e4e7d0..2afcb38d 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -77,6 +77,7 @@ main() {
       await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
       postData = json.encode({'text': 'modified'});
+      
       var response = await client.patch("$url/todos/0",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);
@@ -90,6 +91,7 @@ main() {
       await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
       postData = json.encode({'over': 'write'});
+
       var response = await client.post("$url/todos/0",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);

From 803f446a012e07bf7fe6303272a9c165151fb92c Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 10 Dec 2018 22:19:16 -0500
Subject: [PATCH 333/414] 2.0.0-alpha.16

---
 CHANGELOG.md                    |  3 +++
 example/http2/body_parsing.dart |  6 +++---
 example/http2/main.dart         |  6 +++---
 example/http2/server_push.dart  |  6 +++---
 example/main.dart               | 11 +++--------
 lib/src/core/driver.dart        | 16 +++++++++-------
 lib/src/core/server.dart        | 24 ++++++++++++++++++++----
 lib/src/http2/angel_http2.dart  |  4 ++--
 pubspec.yaml                    |  3 ++-
 test/services_test.dart         |  2 +-
 10 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ed1eeb8..c43c242c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.16
+* Use `package:lumberjack` for logging.
+
 # 2.0.0-alpha.15
 * Remove dependency on `body_parser`.
 * `RequestContext` now exposes a `Stream<List<int>> get body` getter.
diff --git a/example/http2/body_parsing.dart b/example/http2/body_parsing.dart
index 93c4a78d..ffc3e57a 100644
--- a/example/http2/body_parsing.dart
+++ b/example/http2/body_parsing.dart
@@ -25,10 +25,10 @@ main() async {
   try {
     ctx.setAlpnProtocols(['h2'], true);
   } catch (e, st) {
-    app.logger.severe(
+    app.logger.error(
       'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
-      e,
-      st,
+      error: e,
+      stackTrace: st,
     );
   }
 
diff --git a/example/http2/main.dart b/example/http2/main.dart
index e381c48c..0f4ebf38 100644
--- a/example/http2/main.dart
+++ b/example/http2/main.dart
@@ -25,10 +25,10 @@ main() async {
   try {
     ctx.setAlpnProtocols(['h2'], true);
   } catch (e, st) {
-    app.logger.severe(
+    app.logger.error(
       'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
-      e,
-      st,
+      error: e,
+      stackTrace: st,
     );
   }
 
diff --git a/example/http2/server_push.dart b/example/http2/server_push.dart
index 439b7fb9..3ebec6c5 100644
--- a/example/http2/server_push.dart
+++ b/example/http2/server_push.dart
@@ -41,10 +41,10 @@ main() async {
   try {
     ctx.setAlpnProtocols(['h2'], true);
   } catch (e, st) {
-    app.logger.severe(
+    app.logger.error(
       'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
-      e,
-      st,
+      error: e,
+      stackTrace: st,
     );
   }
 
diff --git a/example/main.dart b/example/main.dart
index 6d0934eb..c671de60 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -1,7 +1,8 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
-import 'package:logging/logging.dart';
+import 'package:lumberjack/lumberjack.dart';
+import 'package:lumberjack/io.dart';
 
 main() async {
   var app = new Angel(
@@ -9,13 +10,7 @@ main() async {
     reflector: MirrorsReflector(),
   );
 
-  hierarchicalLoggingEnabled = true;
-
-  app.logger.onRecord.listen((rec) {
-    print(rec);
-    if (rec.error != null) print(rec.error);
-    if (rec.stackTrace != null) print(rec.stackTrace);
-  });
+  app.logger.pipe(AnsiLogPrinter.toStdout());
 
   // Index route. Returns JSON.
   app.get('/', (req, res) => 'Welcome to Angel!');
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index 1bb9d50b..ae556e06 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -167,7 +167,8 @@ abstract class Driver<
               var error = e.error ?? e;
               var trace =
                   new Trace.from(e.stackTrace ?? StackTrace.current).terse;
-              app.logger.severe(e.message ?? e.toString(), error, trace);
+              app.logger.error(e.message ?? e.toString(),
+                  error: error, stackTrace: trace);
             }
 
             return handleAngelHttpException(
@@ -177,7 +178,7 @@ abstract class Driver<
           var zoneSpec = new ZoneSpecification(
             print: (self, parent, zone, line) {
               if (app.logger != null)
-                app.logger.info(line);
+                app.logger.information(line);
               else
                 parent.print(zone, line);
             },
@@ -200,7 +201,8 @@ abstract class Driver<
                 }
 
                 if (app.logger != null) {
-                  app.logger.severe(e.message ?? e.toString(), error, trace);
+                  app.logger.error(e.message ?? e.toString(),
+                      error: error, stackTrace: trace);
                 }
 
                 return handleAngelHttpException(
@@ -211,8 +213,8 @@ abstract class Driver<
                 // Ideally, we won't be in a position where an absolutely fatal error occurs,
                 // but if so, we'll need to log it.
                 if (app.logger != null) {
-                  app.logger.severe(
-                      'Fatal error occurred when processing $uri.', e, trace);
+                  app.logger.error('Fatal error occurred when processing $uri.',
+                      error: e, stackTrace: trace);
                 } else {
                   stderr
                     ..writeln('Fatal error occurred when processing '
@@ -253,7 +255,7 @@ abstract class Driver<
       {bool ignoreFinalizers: false}) {
     if (req == null || res == null) {
       try {
-        app.logger?.severe(e, st);
+        app.logger?.error(null, error: e, stackTrace: st);
         setStatusCode(response, 500);
         writeStringToResponse(response, '500 Internal Server Error');
         closeResponse(response);
@@ -285,7 +287,7 @@ abstract class Driver<
     void _cleanup(_) {
       if (!app.isProduction && app.logger != null) {
         var sw = req.container.make<Stopwatch>();
-        app.logger.info(
+        app.logger.information(
             "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
       }
     }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index a86fc84d..c024ef5b 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -10,7 +10,9 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:http_parser/http_parser.dart';
-import 'package:logging/logging.dart';
+import 'package:logging/logging.dart' as dart;
+import 'package:lumberjack/logging.dart';
+import 'package:lumberjack/lumberjack.dart';
 import 'package:mime/mime.dart';
 import 'package:tuple/tuple.dart';
 
@@ -90,7 +92,20 @@ class Angel extends Routable {
   Angel get parent => _parent;
 
   /// Outputs diagnostics and debug messages.
-  Logger logger;
+  Logger get logger => _logger;
+
+  set logger(value) {
+    if (_logger != null) _logger.close();
+    if (value is dart.Logger) {
+      _logger = new ConvertingLogger(value);
+    } else if (value is Logger) {
+      _logger = value;
+    } else {
+      throw new ArgumentError();
+    }
+  }
+
+  Logger _logger;
 
   /// Plug-ins to be called right before server startup.
   ///
@@ -292,7 +307,7 @@ class Angel extends Routable {
     if (isProduction == true || force == true) {
       _isProduction = true;
       _flattened ??= flatten(this);
-      logger?.config('Angel is running in production mode.');
+      logger?.notice('Angel is running in production mode.');
     }
   }
 
@@ -352,11 +367,12 @@ class Angel extends Routable {
 
   Angel(
       {Reflector reflector: const EmptyReflector(),
-      this.logger,
+      logger,
       this.allowMethodOverrides: true,
       this.serializer,
       this.viewGenerator})
       : super(reflector) {
+    if (logger != null) this.logger = logger;
     bootstrapContainer();
     viewGenerator ??= noViewEngineConfigured;
     serializer ??= json.encode;
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index 3a90e58f..a041e5f5 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -191,8 +191,8 @@ class _AngelHttp2ServerSocket extends Stream<SecureSocket>
       },
       onDone: _ctrl.close,
       onError: (e, st) {
-        driver.app.logger.warning(
-            'HTTP/2 incoming connection failure: ', e, st as StackTrace);
+        driver.app.logger.warning('HTTP/2 incoming connection failure: ',
+            error: e, stackTrace: st as StackTrace);
       },
     );
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 245e192e..b091d332 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.15
+version: 2.0.0-alpha.16
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -17,6 +17,7 @@ dependencies:
   http_server: ^0.9.0
   http2: ">=0.1.7 <2.0.0"
   logging: ">=0.11.3 <1.0.0"
+  lumberjack: ^1.0.0-rc.0
   matcher: ^0.12.0
   merge_map: ^1.0.0
   meta: ^1.0.0
diff --git a/test/services_test.dart b/test/services_test.dart
index 2afcb38d..8b881be3 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -77,7 +77,7 @@ main() {
       await client.post("$url/todos",
           headers: headers as Map<String, String>, body: postData);
       postData = json.encode({'text': 'modified'});
-      
+
       var response = await client.patch("$url/todos/0",
           headers: headers as Map<String, String>, body: postData);
       expect(response.statusCode, 200);

From 8d80eab5bd48044c081102d536ceafa81ee6730e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 10 Dec 2018 22:22:34 -0500
Subject: [PATCH 334/414] Update examples to use lumberjack

---
 example/handle_error.dart       | 5 +++--
 example/http2/body_parsing.dart | 7 ++++---
 example/http2/main.dart         | 7 ++++---
 example/http2/server_push.dart  | 7 ++++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/example/handle_error.dart b/example/handle_error.dart
index d4e6a799..d7d302a8 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -3,11 +3,12 @@ import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
-import 'package:logging/logging.dart';
+import 'package:lumberjack/lumberjack.dart';
+import 'package:lumberjack/io.dart';
 
 main() async {
   var app = new Angel(reflector: MirrorsReflector())
-    ..logger = (new Logger('angel')..onRecord.listen(print))
+    ..logger = (new Logger('angel')..pipe(new AnsiLogPrinter.toStdout()))
     ..encoders.addAll({'gzip': gzip.encoder});
 
   app.fallback(
diff --git a/example/http2/body_parsing.dart b/example/http2/body_parsing.dart
index ffc3e57a..7a515f05 100644
--- a/example/http2/body_parsing.dart
+++ b/example/http2/body_parsing.dart
@@ -3,12 +3,13 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:angel_framework/http2.dart';
 import 'package:file/local.dart';
-import 'package:logging/logging.dart';
-import 'pretty_logging.dart';
+import 'package:lumberjack/lumberjack.dart';
+import 'package:lumberjack/io.dart';
 
 main() async {
   var app = new Angel();
-  app.logger = new Logger('angel')..onRecord.listen(prettyLog);
+  app.logger = new Logger('angel');
+  app.logger.pipe(new AnsiLogPrinter.toStdout());
 
   var publicDir = new Directory('example/public');
   var indexHtml =
diff --git a/example/http2/main.dart b/example/http2/main.dart
index 0f4ebf38..377ec6a6 100644
--- a/example/http2/main.dart
+++ b/example/http2/main.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:angel_framework/http2.dart';
-import 'package:logging/logging.dart';
-import 'pretty_logging.dart';
+import 'package:lumberjack/lumberjack.dart';
+import 'package:lumberjack/io.dart';
 
 main() async {
   var app = new Angel()
@@ -11,7 +11,8 @@ main() async {
       'gzip': gzip.encoder,
       'deflate': zlib.encoder,
     });
-  app.logger = new Logger('angel')..onRecord.listen(prettyLog);
+  app.logger = new Logger('angel');
+  app.logger.pipe(new AnsiLogPrinter.toStdout());
 
   app.get('/', (req, res) => 'Hello HTTP/2!!!');
 
diff --git a/example/http2/server_push.dart b/example/http2/server_push.dart
index 3ebec6c5..15f1ce83 100644
--- a/example/http2/server_push.dart
+++ b/example/http2/server_push.dart
@@ -3,12 +3,13 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:angel_framework/http2.dart';
 import 'package:file/local.dart';
-import 'package:logging/logging.dart';
-import 'pretty_logging.dart';
+import 'package:lumberjack/lumberjack.dart';
+import 'package:lumberjack/io.dart';
 
 main() async {
   var app = new Angel();
-  app.logger = new Logger('angel')..onRecord.listen(prettyLog);
+  app.logger = new Logger('angel');
+  app.logger.pipe(new AnsiLogPrinter.toStdout());
 
   var publicDir = new Directory('example/http2/public');
   var indexHtml =

From 5af191eebbf03647c6da7cad412f2c21bdab13bc Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 10 Dec 2018 22:43:07 -0500
Subject: [PATCH 335/414] most tests fixed

---
 lib/src/core/server.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index c024ef5b..4c8e71bc 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -100,8 +100,8 @@ class Angel extends Routable {
       _logger = new ConvertingLogger(value);
     } else if (value is Logger) {
       _logger = value;
-    } else {
-      throw new ArgumentError();
+    } else if (value != null) {
+      throw new ArgumentError('Unsupported logger: $value');
     }
   }
 

From 1f83c4acb2e6596c547de54861b2d982101a8034 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 13 Dec 2018 21:31:21 -0500
Subject: [PATCH 336/414] 17

---
 CHANGELOG.md                             |  4 ++++
 example/handle_error.dart                | 10 +++++++---
 example/http2/body_parsing.dart          | 20 +++++++++++---------
 example/http2/common.dart                |  7 +++++++
 example/http2/main.dart                  | 13 ++++++-------
 example/http2/server_push.dart           | 20 +++++++++++---------
 example/main.dart                        | 10 +++++++---
 lib/src/core/driver.dart                 | 16 +++++++---------
 lib/src/core/server.dart                 | 24 ++++--------------------
 lib/src/http2/angel_http2.dart           |  4 ++--
 lib/src/http2/http2_request_context.dart |  8 ++++----
 pubspec.yaml                             |  3 +--
 12 files changed, 71 insertions(+), 68 deletions(-)
 create mode 100644 example/http2/common.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c43c242c..19cec9f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.17
+* Revert the migration to `lumberjack` for now. In the future, when it's more
+stable, there'll be a conversion, perhaps.
+
 # 2.0.0-alpha.16
 * Use `package:lumberjack` for logging.
 
diff --git a/example/handle_error.dart b/example/handle_error.dart
index d7d302a8..ea058457 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -3,12 +3,16 @@ import 'dart:io';
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
-import 'package:lumberjack/lumberjack.dart';
-import 'package:lumberjack/io.dart';
+import 'package:logging/logging.dart';
 
 main() async {
   var app = new Angel(reflector: MirrorsReflector())
-    ..logger = (new Logger('angel')..pipe(new AnsiLogPrinter.toStdout()))
+    ..logger = (new Logger('angel')
+      ..onRecord.listen((rec) {
+        print(rec);
+        if (rec.error != null) print(rec.error);
+        if (rec.stackTrace != null) print(rec.stackTrace);
+      }))
     ..encoders.addAll({'gzip': gzip.encoder});
 
   app.fallback(
diff --git a/example/http2/body_parsing.dart b/example/http2/body_parsing.dart
index 7a515f05..2cb8110b 100644
--- a/example/http2/body_parsing.dart
+++ b/example/http2/body_parsing.dart
@@ -3,13 +3,16 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:angel_framework/http2.dart';
 import 'package:file/local.dart';
-import 'package:lumberjack/lumberjack.dart';
-import 'package:lumberjack/io.dart';
+import 'package:logging/logging.dart';
 
 main() async {
   var app = new Angel();
-  app.logger = new Logger('angel');
-  app.logger.pipe(new AnsiLogPrinter.toStdout());
+  app.logger = new Logger('angel')
+    ..onRecord.listen((rec) {
+      print(rec);
+      if (rec.error != null) print(rec.error);
+      if (rec.stackTrace != null) print(rec.stackTrace);
+    });
 
   var publicDir = new Directory('example/public');
   var indexHtml =
@@ -26,11 +29,10 @@ main() async {
   try {
     ctx.setAlpnProtocols(['h2'], true);
   } catch (e, st) {
-    app.logger.error(
-      'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
-      error: e,
-      stackTrace: st,
-    );
+    app.logger.severe(
+        'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
+        e,
+        st);
   }
 
   var http1 = new AngelHttp(app);
diff --git a/example/http2/common.dart b/example/http2/common.dart
new file mode 100644
index 00000000..b937b43f
--- /dev/null
+++ b/example/http2/common.dart
@@ -0,0 +1,7 @@
+import 'package:logging/logging.dart';
+
+void dumpError(LogRecord rec) {
+  print(rec);
+  if (rec.error != null) print(rec.error);
+  if (rec.stackTrace != null) print(rec.stackTrace);
+}
diff --git a/example/http2/main.dart b/example/http2/main.dart
index 377ec6a6..f2a7be38 100644
--- a/example/http2/main.dart
+++ b/example/http2/main.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:angel_framework/http2.dart';
-import 'package:lumberjack/lumberjack.dart';
-import 'package:lumberjack/io.dart';
+import 'package:logging/logging.dart';
+import 'common.dart';
 
 main() async {
   var app = new Angel()
@@ -11,8 +11,7 @@ main() async {
       'gzip': gzip.encoder,
       'deflate': zlib.encoder,
     });
-  app.logger = new Logger('angel');
-  app.logger.pipe(new AnsiLogPrinter.toStdout());
+  app.logger = new Logger('angel')..onRecord.listen(dumpError);
 
   app.get('/', (req, res) => 'Hello HTTP/2!!!');
 
@@ -26,10 +25,10 @@ main() async {
   try {
     ctx.setAlpnProtocols(['h2'], true);
   } catch (e, st) {
-    app.logger.error(
+    app.logger.severe(
       'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
-      error: e,
-      stackTrace: st,
+      e,
+      st,
     );
   }
 
diff --git a/example/http2/server_push.dart b/example/http2/server_push.dart
index 15f1ce83..0c99420b 100644
--- a/example/http2/server_push.dart
+++ b/example/http2/server_push.dart
@@ -3,13 +3,16 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:angel_framework/http2.dart';
 import 'package:file/local.dart';
-import 'package:lumberjack/lumberjack.dart';
-import 'package:lumberjack/io.dart';
+import 'package:logging/logging.dart';
 
 main() async {
   var app = new Angel();
-  app.logger = new Logger('angel');
-  app.logger.pipe(new AnsiLogPrinter.toStdout());
+  app.logger = new Logger('angel')
+    ..onRecord.listen((rec) {
+      print(rec);
+      if (rec.error != null) print(rec.error);
+      if (rec.stackTrace != null) print(rec.stackTrace);
+    });
 
   var publicDir = new Directory('example/http2/public');
   var indexHtml =
@@ -42,11 +45,10 @@ main() async {
   try {
     ctx.setAlpnProtocols(['h2'], true);
   } catch (e, st) {
-    app.logger.error(
-      'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
-      error: e,
-      stackTrace: st,
-    );
+    app.logger.severe(
+        'Cannot set ALPN protocol on server to `h2`. The server will only serve HTTP/1.x.',
+        e,
+        st);
   }
 
   var http1 = new AngelHttp(app);
diff --git a/example/main.dart b/example/main.dart
index c671de60..0a07dcd5 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -1,8 +1,7 @@
 import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
-import 'package:lumberjack/lumberjack.dart';
-import 'package:lumberjack/io.dart';
+import 'package:logging/logging.dart';
 
 main() async {
   var app = new Angel(
@@ -10,7 +9,12 @@ main() async {
     reflector: MirrorsReflector(),
   );
 
-  app.logger.pipe(AnsiLogPrinter.toStdout());
+  app.logger = new Logger('angel')
+    ..onRecord.listen((rec) {
+      print(rec);
+      if (rec.error != null) print(rec.error);
+      if (rec.stackTrace != null) print(rec.stackTrace);
+    });
 
   // Index route. Returns JSON.
   app.get('/', (req, res) => 'Welcome to Angel!');
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index ae556e06..5580f01a 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -167,8 +167,7 @@ abstract class Driver<
               var error = e.error ?? e;
               var trace =
                   new Trace.from(e.stackTrace ?? StackTrace.current).terse;
-              app.logger.error(e.message ?? e.toString(),
-                  error: error, stackTrace: trace);
+              app.logger.severe(e.message ?? e.toString(), error, trace);
             }
 
             return handleAngelHttpException(
@@ -178,7 +177,7 @@ abstract class Driver<
           var zoneSpec = new ZoneSpecification(
             print: (self, parent, zone, line) {
               if (app.logger != null)
-                app.logger.information(line);
+                app.logger.info(line);
               else
                 parent.print(zone, line);
             },
@@ -201,8 +200,7 @@ abstract class Driver<
                 }
 
                 if (app.logger != null) {
-                  app.logger.error(e.message ?? e.toString(),
-                      error: error, stackTrace: trace);
+                  app.logger.severe(e.message ?? e.toString(), error, trace);
                 }
 
                 return handleAngelHttpException(
@@ -213,8 +211,8 @@ abstract class Driver<
                 // Ideally, we won't be in a position where an absolutely fatal error occurs,
                 // but if so, we'll need to log it.
                 if (app.logger != null) {
-                  app.logger.error('Fatal error occurred when processing $uri.',
-                      error: e, stackTrace: trace);
+                  app.logger.severe(
+                      'Fatal error occurred when processing $uri.', e, trace);
                 } else {
                   stderr
                     ..writeln('Fatal error occurred when processing '
@@ -255,7 +253,7 @@ abstract class Driver<
       {bool ignoreFinalizers: false}) {
     if (req == null || res == null) {
       try {
-        app.logger?.error(null, error: e, stackTrace: st);
+        app.logger?.severe(null, e, st);
         setStatusCode(response, 500);
         writeStringToResponse(response, '500 Internal Server Error');
         closeResponse(response);
@@ -287,7 +285,7 @@ abstract class Driver<
     void _cleanup(_) {
       if (!app.isProduction && app.logger != null) {
         var sw = req.container.make<Stopwatch>();
-        app.logger.information(
+        app.logger.info(
             "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
       }
     }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 4c8e71bc..0a1ab0aa 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -10,9 +10,7 @@ import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:combinator/combinator.dart';
 import 'package:http_parser/http_parser.dart';
-import 'package:logging/logging.dart' as dart;
-import 'package:lumberjack/logging.dart';
-import 'package:lumberjack/lumberjack.dart';
+import 'package:logging/logging.dart';
 import 'package:mime/mime.dart';
 import 'package:tuple/tuple.dart';
 
@@ -92,20 +90,7 @@ class Angel extends Routable {
   Angel get parent => _parent;
 
   /// Outputs diagnostics and debug messages.
-  Logger get logger => _logger;
-
-  set logger(value) {
-    if (_logger != null) _logger.close();
-    if (value is dart.Logger) {
-      _logger = new ConvertingLogger(value);
-    } else if (value is Logger) {
-      _logger = value;
-    } else if (value != null) {
-      throw new ArgumentError('Unsupported logger: $value');
-    }
-  }
-
-  Logger _logger;
+  Logger logger;
 
   /// Plug-ins to be called right before server startup.
   ///
@@ -307,7 +292,7 @@ class Angel extends Routable {
     if (isProduction == true || force == true) {
       _isProduction = true;
       _flattened ??= flatten(this);
-      logger?.notice('Angel is running in production mode.');
+      logger?.info('Angel is running in production mode.');
     }
   }
 
@@ -367,12 +352,11 @@ class Angel extends Routable {
 
   Angel(
       {Reflector reflector: const EmptyReflector(),
-      logger,
+      this.logger,
       this.allowMethodOverrides: true,
       this.serializer,
       this.viewGenerator})
       : super(reflector) {
-    if (logger != null) this.logger = logger;
     bootstrapContainer();
     viewGenerator ??= noViewEngineConfigured;
     serializer ??= json.encode;
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index a041e5f5..3a90e58f 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -191,8 +191,8 @@ class _AngelHttp2ServerSocket extends Stream<SecureSocket>
       },
       onDone: _ctrl.close,
       onError: (e, st) {
-        driver.app.logger.warning('HTTP/2 incoming connection failure: ',
-            error: e, stackTrace: st as StackTrace);
+        driver.app.logger.warning(
+            'HTTP/2 incoming connection failure: ', e, st as StackTrace);
       },
     );
   }
diff --git a/lib/src/http2/http2_request_context.dart b/lib/src/http2/http2_request_context.dart
index 3381383f..b000be83 100644
--- a/lib/src/http2/http2_request_context.dart
+++ b/lib/src/http2/http2_request_context.dart
@@ -31,7 +31,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
       Socket socket,
       Angel app,
       Map<String, MockHttpSession> sessions,
-      Uuid uuid) async {
+      Uuid uuid) {
     var c = new Completer<Http2RequestContext>();
     var req = new Http2RequestContext._(app.container.createChild())
       ..app = app
@@ -63,7 +63,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
 
     stream.incomingMessages.listen((msg) {
       if (msg is DataStreamMessage) {
-        if (!c.isCompleted) finalize();
+        finalize();
         req._body.add(msg.bytes);
       } else if (msg is HeadersStreamMessage) {
         for (var header in msg.headers) {
@@ -108,10 +108,10 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
           }
         }
 
-        if (msg.endStream && !c.isCompleted) finalize();
+        if (msg.endStream) finalize();
       }
     }, onDone: () {
-      if (!c.isCompleted) finalize();
+      finalize();
     }, cancelOnError: true, onError: c.completeError);
 
     // Apply session
diff --git a/pubspec.yaml b/pubspec.yaml
index b091d332..c6b11091 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.16
+version: 2.0.0-alpha.17
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -17,7 +17,6 @@ dependencies:
   http_server: ^0.9.0
   http2: ">=0.1.7 <2.0.0"
   logging: ">=0.11.3 <1.0.0"
-  lumberjack: ^1.0.0-rc.0
   matcher: ^0.12.0
   merge_map: ^1.0.0
   meta: ^1.0.0

From f1d380882831ec83bda5fcfa975b7263e5c89756 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 31 Dec 2018 12:04:02 -0500
Subject: [PATCH 337/414] 2.0.0-alpha.18

---
 CHANGELOG.md                             | 5 +++++
 lib/src/http2/http2_request_context.dart | 3 ++-
 pubspec.yaml                             | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19cec9f1..c3ad2615 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.0.0-alpha.18
+* Upgrade `http2` dependency.
+* Upgrade `uuid` dependency.
+* Fixed a bug that prevented body parsing from ever completing with `http2`.
+
 # 2.0.0-alpha.17
 * Revert the migration to `lumberjack` for now. In the future, when it's more
 stable, there'll be a conversion, perhaps.
diff --git a/lib/src/http2/http2_request_context.dart b/lib/src/http2/http2_request_context.dart
index b000be83..aa1f8889 100644
--- a/lib/src/http2/http2_request_context.dart
+++ b/lib/src/http2/http2_request_context.dart
@@ -112,6 +112,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
       }
     }, onDone: () {
       finalize();
+      req._body.close();
     }, cancelOnError: true, onError: c.completeError);
 
     // Apply session
@@ -119,7 +120,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
         cookies.firstWhere((c) => c.name == 'DARTSESSID', orElse: () => null);
 
     if (dartSessId == null) {
-      dartSessId = new Cookie('DARTSESSID', uuid.v4() as String);
+      dartSessId = new Cookie('DARTSESSID', uuid.v4());
     }
 
     req._session = sessions.putIfAbsent(
diff --git a/pubspec.yaml b/pubspec.yaml
index c6b11091..2513fadc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.17
+version: 2.0.0-alpha.18
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -15,7 +15,7 @@ dependencies:
   file: ^5.0.0
   http_parser: ^3.0.0
   http_server: ^0.9.0
-  http2: ">=0.1.7 <2.0.0"
+  http2: "^1.0.0"
   logging: ">=0.11.3 <1.0.0"
   matcher: ^0.12.0
   merge_map: ^1.0.0
@@ -25,7 +25,7 @@ dependencies:
   path: ^1.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0
-  uuid: ^1.0.0
+  uuid: ^2.0.0-rc.1
 dev_dependencies:
   http: ^0.11.3
   io: ^0.3.0

From 63c97d91368527e040611d5e0a6ff1720f59657b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 31 Dec 2018 12:12:32 -0500
Subject: [PATCH 338/414] add hashcode for providers

---
 CHANGELOG.md                 | 1 +
 lib/src/core/controller.dart | 2 +-
 lib/src/core/driver.dart     | 6 +++---
 lib/src/core/service.dart    | 6 ++++--
 pubspec.yaml                 | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3ad2615..1a9399c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 * Upgrade `http2` dependency.
 * Upgrade `uuid` dependency.
 * Fixed a bug that prevented body parsing from ever completing with `http2`.
+* Add `Providers.hashCode`.
 
 # 2.0.0-alpha.17
 * Revert the migration to `lumberjack` for now. In the future, when it's more
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 65cf262f..c30c05fc 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -23,7 +23,7 @@ class Controller {
   /// A mapping of route paths to routes, produced from the [Expose] annotations on this class.
   Map<String, Route> routeMappings = {};
 
-  Controller({this.injectSingleton: true});
+  Controller({this.injectSingleton = true});
 
   @mustCallSuper
   Future configureServer(Angel app) {
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index 5580f01a..794ff02a 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -26,7 +26,7 @@ abstract class Driver<
   /// The function used to bind this instance to a server..
   final Future<Server> Function(dynamic, int) serverGenerator;
 
-  Driver(this.app, this.serverGenerator, {this.useZone: true});
+  Driver(this.app, this.serverGenerator, {this.useZone = true});
 
   /// The path at which this server is listening for requests.
   Uri get uri;
@@ -250,7 +250,7 @@ abstract class Driver<
       ResponseContext res,
       Request request,
       Response response,
-      {bool ignoreFinalizers: false}) {
+      {bool ignoreFinalizers = false}) {
     if (req == null || res == null) {
       try {
         app.logger?.severe(null, e, st);
@@ -281,7 +281,7 @@ abstract class Driver<
   /// Sends a response.
   Future sendResponse(Request request, Response response, RequestContext req,
       ResponseContext res,
-      {bool ignoreFinalizers: false}) {
+      {bool ignoreFinalizers = false}) {
     void _cleanup(_) {
       if (!app.isProduction && app.logger != null) {
         var sw = req.container.make<Stopwatch>();
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index a330b0d7..755fb6b1 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -1,10 +1,9 @@
 library angel_framework.http.service;
 
 import 'dart:async';
-
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:merge_map/merge_map.dart';
-
+import 'package:quiver_hashcode/hashcode.dart';
 import '../util.dart';
 import 'anonymous_service.dart';
 import 'hooked_service.dart' show HookedService;
@@ -36,6 +35,9 @@ class Providers {
   /// Represents a request parsed from GraphQL.
   static const Providers graphQL = Providers(viaGraphQL);
 
+  @override
+  int get hashCode => hashObjects([via]);
+
   @override
   bool operator ==(other) => other is Providers && other.via == via;
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 2513fadc..a3380ed4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,6 +23,7 @@ dependencies:
   mime: ^0.9.3
   mock_request: ^1.0.0
   path: ^1.0.0
+  quiver_hashcode: ^2.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0
   uuid: ^2.0.0-rc.1

From 3f9e94b12a480db13bff5ae497d26b5dcec21aa6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 27 Jan 2019 16:39:36 -0500
Subject: [PATCH 339/414] 2.0.0-alpha.19

---
 CHANGELOG.md                       |  5 +++++
 lib/src/core/request_context.dart  |  4 ++++
 lib/src/core/response_context.dart | 30 ++++++++++++++++++++++++++----
 pubspec.yaml                       |  2 +-
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a9399c0..c1a4ca81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.0.0-alpha.19
+* `parseBody` checks for null content type, and throws a `400` if none was given.
+* Add `ResponseContext.contentLength`.
+* Update `streamFile` to set content length, and also to work on `HEAD` requests.
+
 # 2.0.0-alpha.18
 * Upgrade `http2` dependency.
 * Upgrade `uuid` dependency.
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 0e081106..6ac8f4a8 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -185,6 +185,10 @@ abstract class RequestContext<RawRequest> {
 
   /// Manually parses the request body, if it has not already been parsed.
   Future<void> parseBody({Encoding encoding: utf8}) async {
+    if (contentType == null) {
+      throw FormatException('Missing "content-type" header.');
+    }
+
     if (!_hasParsedBody) {
       _hasParsedBody = true;
 
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index eccea030..50697dd5 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -76,7 +76,7 @@ abstract class ResponseContext<RawResponse>
   /// This response's status code.
   int get statusCode => _statusCode;
 
-  void set statusCode(int value) {
+  set statusCode(int value) {
     if (!isOpen)
       throw closed();
     else
@@ -104,6 +104,23 @@ abstract class ResponseContext<RawResponse>
   /// open indefinitely.
   FutureOr<RawResponse> detach();
 
+  /// Gets or sets the content length to send back to a client.
+  ///
+  /// Returns `null` if the header is invalidly formatted.
+  int get contentLength {
+    return int.tryParse(headers['content-length']);
+  }
+
+  /// Gets or sets the content length to send back to a client.
+  ///
+  /// If [value] is `null`, then the header will be removed.
+  set contentLength(int value) {
+    if (value == null)
+      headers.remove('content-length');
+    else
+      headers['content-length'] = value.toString();
+  }
+
   /// Gets or sets the content type to send back to a client.
   MediaType get contentType {
     try {
@@ -114,7 +131,7 @@ abstract class ResponseContext<RawResponse>
   }
 
   /// Gets or sets the content type to send back to a client.
-  void set contentType(MediaType value) {
+  set contentType(MediaType value) {
     headers['content-type'] = value.toString();
   }
 
@@ -289,13 +306,18 @@ abstract class ResponseContext<RawResponse>
   }
 
   /// Streams a file to this response.
-  Future streamFile(File file) {
+  ///
+  /// `HEAD` responses will not actually write data.
+  Future streamFile(File file) async {
     if (!isOpen) throw closed();
     var mimeType = app.mimeTypeResolver.lookup(file.path);
+    contentLength = await file.length();
     contentType = mimeType == null
         ? new MediaType('application', 'octet-stream')
         : MediaType.parse(mimeType);
-    return file.openRead().pipe(this);
+
+    if (correspondingRequest.method != 'HEAD')
+      return file.openRead().pipe(this);
   }
 
   /// Configure the response to write to an intermediate response buffer, rather than to the stream directly.
diff --git a/pubspec.yaml b/pubspec.yaml
index a3380ed4..5055412d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.18
+version: 2.0.0-alpha.19
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From b0ecac32320af4400c4260f2e4d81357e6700048 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 3 Feb 2019 11:03:31 -0500
Subject: [PATCH 340/414] 2.0.0-alpha.20

---
 CHANGELOG.md             |  3 +++
 lib/src/core/driver.dart | 18 ++++++++++--------
 lib/src/core/server.dart |  7 ++++---
 pubspec.yaml             |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1a4ca81..96ce9aa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.20
+* Inject the `MiddlewarePipeline` into requests.
+
 # 2.0.0-alpha.19
 * `parseBody` checks for null content type, and throws a `400` if none was given.
 * Add `ResponseContext.contentLength`.
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index 794ff02a..e7045aaa 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -97,17 +97,18 @@ abstract class Driver<
           var path = req.path;
           if (path == '/') path = '';
 
-          Tuple3<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>>
-              resolveTuple() {
+          Tuple4<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>,
+              MiddlewarePipeline> resolveTuple() {
             Router r = app.optimizedRouter;
             var resolved =
                 r.resolveAbsolute(path, method: req.method, strip: false);
-
-            return new Tuple3(
-              new MiddlewarePipeline(resolved).handlers,
+            var pipeline = new MiddlewarePipeline(resolved);
+            return new Tuple4(
+              pipeline.handlers,
               resolved.fold<Map<String, dynamic>>(
                   <String, dynamic>{}, (out, r) => out..addAll(r.allParams)),
               resolved.isEmpty ? null : resolved.first.parseResult,
+              pipeline,
             );
           }
 
@@ -118,9 +119,10 @@ abstract class Driver<
 
           req.params.addAll(tuple.item2);
 
-          req.container.registerSingleton<ParseResult<Map<String, dynamic>>>(
-              tuple.item3);
-          req.container.registerSingleton<ParseResult>(tuple.item3);
+          req.container
+            ..registerSingleton<MiddlewarePipeline>(tuple.item4)
+            ..registerSingleton<ParseResult<Map<String, dynamic>>>(tuple.item3)
+            ..registerSingleton<ParseResult>(tuple.item3);
 
           if (!app.isProduction && app.logger != null) {
             req.container
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 0a1ab0aa..ccf20ccb 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -36,9 +36,10 @@ class Angel extends Routable {
       (String view, [Map data]) => 'No view engine has been configured yet.';
 
   final List<Angel> _children = [];
-  final Map<String,
-          Tuple3<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>>>
-      handlerCache = new HashMap();
+  final Map<
+      String,
+      Tuple4<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>,
+          MiddlewarePipeline>> handlerCache = new HashMap();
 
   Router _flattened;
   bool _isProduction;
diff --git a/pubspec.yaml b/pubspec.yaml
index 5055412d..743db819 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.19
+version: 2.0.0-alpha.20
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From ed989984a2b1e7bb035aa42a01582c371e8cde20 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 3 Feb 2019 13:00:42 -0500
Subject: [PATCH 341/414] 2.0.0-alpha.21

---
 CHANGELOG.md                             |  5 ++++
 lib/src/core/driver.dart                 |  9 +++++--
 lib/src/core/request_context.dart        | 23 ++++++++++++++++-
 lib/src/core/server.dart                 |  2 +-
 lib/src/http2/http2_request_context.dart | 31 +++++++++++++---------
 pubspec.yaml                             |  2 +-
 test/http2/adapter_test.dart             | 33 +++++++++++++++++++++++-
 test/http2/http2_client.dart             |  5 +++-
 8 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96ce9aa9..f54e3b1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.0.0-alpha.21
+* Update for `angel_route@3.0.4` compatibility.
+* Add `readAsBytes` and `readAsString` to `UploadedFile`.
+* URI-decode path components in HTTP2.
+
 # 2.0.0-alpha.20
 * Inject the `MiddlewarePipeline` into requests.
 
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index e7045aaa..5e43226d 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -97,7 +97,7 @@ abstract class Driver<
           var path = req.path;
           if (path == '/') path = '';
 
-          Tuple4<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>,
+          Tuple4<List, Map<String, dynamic>, ParseResult<RouteResult>,
               MiddlewarePipeline> resolveTuple() {
             Router r = app.optimizedRouter;
             var resolved =
@@ -121,7 +121,7 @@ abstract class Driver<
 
           req.container
             ..registerSingleton<MiddlewarePipeline>(tuple.item4)
-            ..registerSingleton<ParseResult<Map<String, dynamic>>>(tuple.item3)
+            ..registerSingleton<ParseResult<RouteResult>>(tuple.item3)
             ..registerSingleton<ParseResult>(tuple.item3);
 
           if (!app.isProduction && app.logger != null) {
@@ -129,6 +129,11 @@ abstract class Driver<
                 .registerSingleton<Stopwatch>(new Stopwatch()..start());
           }
 
+          if (tuple.item1.isEmpty) {
+            print(req.uri);
+            print('${req.path} => ${tuple.item1}');
+          }
+
           var pipeline = tuple.item1;
           var it = pipeline.iterator;
 
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 6ac8f4a8..1f9a81a9 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -3,7 +3,13 @@ library angel_framework.http.request_context;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io'
-    show Cookie, HeaderValue, HttpHeaders, HttpSession, InternetAddress;
+    show
+        BytesBuilder,
+        Cookie,
+        HeaderValue,
+        HttpHeaders,
+        HttpSession,
+        InternetAddress;
 
 import 'package:angel_container/angel_container.dart';
 import 'package:http_parser/http_parser.dart';
@@ -279,4 +285,19 @@ class UploadedFile {
   /// [:HttpMultipartFormData:]. This field is used to determine how to decode
   /// the data. Returns [:null:] if not present.
   HeaderValue get contentTransferEncoding => formData.contentTransferEncoding;
+
+  /// Reads the contents of the file into a single linear buffer.
+  ///
+  /// Note that this leads to holding the whole file in memory, which might
+  /// not be ideal for large files.w
+  Future<List<int>> readAsBytes() {
+    return data
+        .fold<BytesBuilder>(BytesBuilder(), (bb, out) => bb..add(out))
+        .then((bb) => bb.takeBytes());
+  }
+
+  /// Reads the contents of the file as [String], using the given [encoding].
+  Future<String> readAsString({Encoding encoding: utf8}) {
+    return data.transform(encoding.decoder).join();
+  }
 }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index ccf20ccb..c404d077 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -38,7 +38,7 @@ class Angel extends Routable {
   final List<Angel> _children = [];
   final Map<
       String,
-      Tuple4<List, Map<String, dynamic>, ParseResult<Map<String, dynamic>>,
+      Tuple4<List, Map<String, dynamic>, ParseResult<RouteResult>,
           MiddlewarePipeline>> handlerCache = new HashMap();
 
   Router _flattened;
diff --git a/lib/src/http2/http2_request_context.dart b/lib/src/http2/http2_request_context.dart
index aa1f8889..4c61286a 100644
--- a/lib/src/http2/http2_request_context.dart
+++ b/lib/src/http2/http2_request_context.dart
@@ -39,26 +39,30 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
       .._stream = stream;
 
     var headers = req._headers = new MockHttpHeaders();
-    String scheme = 'https', host = socket.address.address, path = '';
-    int port = socket.port;
+    // String scheme = 'https', host = socket.address.address, path = '';
+    var uri =
+        Uri(scheme: 'https', host: socket.address.address, port: socket.port);
     var cookies = <Cookie>[];
 
     void finalize() {
       req
         .._cookies = new List.unmodifiable(cookies)
-        .._uri = new Uri(scheme: scheme, host: host, port: port, path: path);
+        .._uri = uri;
       if (!c.isCompleted) c.complete(req);
     }
 
     void parseHost(String value) {
-      var uri = Uri.tryParse(value);
-      if (uri == null || uri.scheme == 'localhost') return;
-      scheme = uri.hasScheme ? uri.scheme : scheme;
+      var inUri = Uri.tryParse(value);
+      if (inUri == null) return;
+      // if (uri == null || uri.scheme == 'localhost') return;
 
-      if (uri.hasAuthority) {
-        host = uri.host;
-        port = uri.hasPort ? uri.port : null;
+      if (inUri.hasScheme) uri = uri.replace(scheme: inUri.scheme);
+
+      if (inUri.hasAuthority) {
+        uri = uri.replace(host: inUri.host, userInfo: inUri.userInfo);
       }
+
+      if (inUri.hasPort) uri = uri.replace(port: inUri.port);
     }
 
     stream.incomingMessages.listen((msg) {
@@ -68,19 +72,22 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
       } else if (msg is HeadersStreamMessage) {
         for (var header in msg.headers) {
           var name = ascii.decode(header.name).toLowerCase();
-          var value = ascii.decode(header.value);
+          var value = Uri.decodeComponent(ascii.decode(header.value));
 
           switch (name) {
             case ':method':
               req._method = value;
               break;
             case ':path':
-              path = value.replaceAll(_straySlashes, '');
+              var inUri = Uri.parse(value);
+              uri = uri.replace(path: inUri.path);
+              if (inUri.hasQuery) uri = uri.replace(query: inUri.query);
+              var path = uri.path.replaceAll(_straySlashes, '');
               req._path = path;
               if (path.isEmpty) req._path = '/';
               break;
             case ':scheme':
-              scheme = value;
+              uri = uri.replace(scheme: value);
               break;
             case ':authority':
               parseHost(value);
diff --git a/pubspec.yaml b/pubspec.yaml
index 743db819..b3d19163 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.20
+version: 2.0.0-alpha.21
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
index d16b5a09..ea625790 100644
--- a/test/http2/adapter_test.dart
+++ b/test/http2/adapter_test.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart' hide Header;
 import 'package:angel_framework/http2.dart';
 import 'package:http/src/multipart_file.dart' as http;
@@ -8,6 +9,7 @@ import 'package:http/src/multipart_request.dart' as http;
 import 'package:http/http.dart' as http;
 import 'package:http2/transport.dart';
 import 'package:http_parser/http_parser.dart';
+import 'package:logging/logging.dart';
 import 'package:test/test.dart';
 import 'http2_client.dart';
 
@@ -25,7 +27,16 @@ void main() {
   Uri serverRoot;
 
   setUp(() async {
-    app = new Angel()..encoders['gzip'] = gzip.encoder;
+    app = new Angel(reflector: MirrorsReflector())
+      ..encoders['gzip'] = gzip.encoder;
+    hierarchicalLoggingEnabled = true;
+    app.logger = Logger.detached('angel.http2')
+      ..onRecord.listen((rec) {
+        print(rec);
+        if (rec.error == null) return;
+        print(rec.error);
+        if (rec.stackTrace != null) print(rec.stackTrace);
+      });
 
     app.get('/', (req, res) async {
       res.write('Hello world');
@@ -77,6 +88,13 @@ void main() {
       await res.close();
     });
 
+    app.get('/param/:name', (req, res) => req.params);
+
+    app.get('/query', (req, res) {
+      print('incoming URI: ${req.uri}');
+      return req.queryParameters;
+    });
+
     var ctx = new SecurityContext()
       ..useCertificateChain('dev.pem')
       ..usePrivateKey('dev.key', password: 'dartdart')
@@ -121,6 +139,19 @@ void main() {
     });
   });
 
+  test('query uri decoded', () async {
+    var uri =
+        serverRoot.replace(path: '/query', queryParameters: {'foo!': 'bar?'});
+    var response = await client.get(uri);
+    print('Sent $uri');
+    expect(response.body, json.encode({'foo!': 'bar?'}));
+  });
+
+  test('params uri decoded', () async {
+    var response = await client.get(serverRoot.replace(path: '/param/foo!'));
+    expect(response.body, json.encode({'name': 'foo!'}));
+  });
+
   test('method parsed', () async {
     var response = await client.delete(serverRoot.replace(path: '/method'));
     expect(response.body, json.encode('DELETE'));
diff --git a/test/http2/http2_client.dart b/test/http2/http2_client.dart
index ebf46bab..8a63e145 100644
--- a/test/http2/http2_client.dart
+++ b/test/http2/http2_client.dart
@@ -21,7 +21,10 @@ class Http2Client extends BaseClient {
     var headers = <Header>[
       new Header.ascii(':authority', request.url.authority),
       new Header.ascii(':method', request.method),
-      new Header.ascii(':path', request.url.path),
+      new Header.ascii(
+          ':path',
+          request.url.path +
+              (request.url.hasQuery ? ('?' + request.url.query) : '')),
       new Header.ascii(':scheme', request.url.scheme),
     ];
 

From ba1ad07c906ad78bbd66ff151f24f02b12e60b81 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 3 Feb 2019 13:50:22 -0500
Subject: [PATCH 342/414] .22

---
 CHANGELOG.md             |  4 ++++
 lib/src/core/driver.dart | 46 +++++++++++++++++++++++-----------------
 lib/src/core/server.dart |  4 ++--
 pubspec.yaml             |  2 +-
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f54e3b1f..894af546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.22
+* Update pipeline handling mechanism, and inject a `MiddlewarePipelineIterator`.
+    * This allows routes to know where in the resolution process they exist, at runtime.
+
 # 2.0.0-alpha.21
 * Update for `angel_route@3.0.4` compatibility.
 * Add `readAsBytes` and `readAsString` to `UploadedFile`.
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index 5e43226d..5ffce8d1 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -99,10 +99,10 @@ abstract class Driver<
 
           Tuple4<List, Map<String, dynamic>, ParseResult<RouteResult>,
               MiddlewarePipeline> resolveTuple() {
-            Router r = app.optimizedRouter;
+            var r = app.optimizedRouter;
             var resolved =
                 r.resolveAbsolute(path, method: req.method, strip: false);
-            var pipeline = new MiddlewarePipeline(resolved);
+            var pipeline = new MiddlewarePipeline<RequestHandler>(resolved);
             return new Tuple4(
               pipeline.handlers,
               resolved.fold<Map<String, dynamic>>(
@@ -116,11 +116,16 @@ abstract class Driver<
           var tuple = app.isProduction
               ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
               : resolveTuple();
+          var line = tuple.item4 as MiddlewarePipeline<RequestHandler>;
+          var it = MiddlewarePipelineIterator<RequestHandler>(line);
 
           req.params.addAll(tuple.item2);
 
           req.container
             ..registerSingleton<MiddlewarePipeline>(tuple.item4)
+            ..registerSingleton<MiddlewarePipeline<RequestHandler>>(line)
+            ..registerSingleton<MiddlewarePipelineIterator>(it)
+            ..registerSingleton<MiddlewarePipelineIterator<RequestHandler>>(it)
             ..registerSingleton<ParseResult<RouteResult>>(tuple.item3)
             ..registerSingleton<ParseResult>(tuple.item3);
 
@@ -129,24 +134,8 @@ abstract class Driver<
                 .registerSingleton<Stopwatch>(new Stopwatch()..start());
           }
 
-          if (tuple.item1.isEmpty) {
-            print(req.uri);
-            print('${req.path} => ${tuple.item1}');
-          }
-
-          var pipeline = tuple.item1;
-          var it = pipeline.iterator;
-
-          var runPipeline = pipeline.isEmpty
-              ? null
-              : Future.doWhile(() => !it.moveNext()
-                  ? new Future.value(false)
-                  : app.executeHandler(it.current, req, res));
-
-          return runPipeline == null
-              ? sendResponse(request, response, req, res)
-              : runPipeline
-                  .then((_) => sendResponse(request, response, req, res));
+          return runPipeline(it, req, res, app)
+              .then((_) => sendResponse(request, response, req, res));
         }
 
         if (useZone == false) {
@@ -355,4 +344,21 @@ abstract class Driver<
       return closeResponse(response).then(_cleanup);
     });
   }
+
+  /// Runs a [MiddlewarePipeline].
+  static Future<void> runPipeline<RequestContextType extends RequestContext,
+          ResponseContextType extends ResponseContext>(
+      MiddlewarePipelineIterator<RequestHandler> it,
+      RequestContextType req,
+      ResponseContextType res,
+      Angel app) async {
+    while (it.moveNext()) {
+      var current = it.current.handlers.iterator;
+
+      while (current.moveNext()) {
+        var result = await app.executeHandler(current.current, req, res);
+        if (result != true) break;
+      }
+    }
+  }
 }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index c404d077..af9cc062 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -41,7 +41,7 @@ class Angel extends Routable {
       Tuple4<List, Map<String, dynamic>, ParseResult<RouteResult>,
           MiddlewarePipeline>> handlerCache = new HashMap();
 
-  Router _flattened;
+  Router<RequestHandler> _flattened;
   bool _isProduction;
   Angel _parent;
 
@@ -62,7 +62,7 @@ class Angel extends Routable {
   Map<dynamic, InjectionRequest> get preContained => _preContained;
 
   /// Returns the [flatten]ed version of this router in production.
-  Router get optimizedRouter => _flattened ?? this;
+  Router<RequestHandler> get optimizedRouter => _flattened ?? this;
 
   /// Determines whether to allow HTTP request method overrides.
   bool allowMethodOverrides = true;
diff --git a/pubspec.yaml b/pubspec.yaml
index b3d19163..af4db52c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.21
+version: 2.0.0-alpha.22
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 4df78749f1ca2ceb62f68a04afebc9b57cf3b5ce Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 10 Mar 2019 23:04:49 -0400
Subject: [PATCH 343/414] Add charset=utf-8 to res.render

---
 CHANGELOG.md                       | 3 +++
 lib/src/core/response_context.dart | 2 +-
 pubspec.yaml                       | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 894af546..0e7bd292 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-alpha.23
+* `ResponseContext.render` sets `charset` to `utf8` in `contentType`.
+
 # 2.0.0-alpha.22
 * Update pipeline handling mechanism, and inject a `MiddlewarePipelineIterator`.
     * This allows routes to know where in the resolution process they exist, at runtime.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 50697dd5..eb4de267 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -184,7 +184,7 @@ abstract class ResponseContext<RawResponse>
   /// Renders a view to the response stream, and closes the response.
   Future render(String view, [Map<String, dynamic> data]) {
     if (!isOpen) throw closed();
-    contentType = new MediaType('text', 'html');
+    contentType = new MediaType('text', 'html', {'charset': 'utf-8'});
     return Future<String>.sync(() => app.viewGenerator(
         view,
         new Map<String, dynamic>.from(renderParams)
diff --git a/pubspec.yaml b/pubspec.yaml
index af4db52c..c330d3f8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.22
+version: 2.0.0-alpha.23
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -30,4 +30,4 @@ dependencies:
 dev_dependencies:
   http: ^0.11.3
   io: ^0.3.0
-  test: ^1.0.0
\ No newline at end of file
+  test: ^1.0.0

From 1b1c190de4aca54a20f225d4c82642cda2a3ec9a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 11 Mar 2019 11:17:44 -0400
Subject: [PATCH 344/414] Add AngelEnv class

---
 lib/src/core/env.dart | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 lib/src/core/env.dart

diff --git a/lib/src/core/env.dart b/lib/src/core/env.dart
new file mode 100644
index 00000000..fa0860ca
--- /dev/null
+++ b/lib/src/core/env.dart
@@ -0,0 +1,27 @@
+import 'dart:io';
+
+/// A constant instance of [AngelEnv].
+const AngelEnv angelEnv = const AngelEnv();
+
+/// Queries the environment's `ANGEL_ENV` value.
+class AngelEnv {
+  final String _customValue;
+
+  /// You can optionally provide a custom value, in order to override the system's
+  /// value.
+  const AngelEnv([this._customValue]);
+
+  /// Returns the value of the `ANGEL_ENV` variable; defaults to `'development'`.
+  String get value =>
+      (_customValue ?? Platform.environment['ANGEL_ENV'] ?? 'development')
+          .toLowerCase();
+
+  /// Returns whether the [value] is `'development'`.
+  bool get isDevelopment => value == 'development';
+
+  /// Returns whether the [value] is `'production'`.
+  bool get isProduction => value == 'production';
+
+  /// Returns whether the [value] is `'staging'`.
+  bool get isStaging => value == 'staging';
+}

From 62709c0bbdfa5a8634720340d9d2fcc9334ca255 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 8 Apr 2019 15:53:07 -0400
Subject: [PATCH 345/414] Make getAnnotation generic

---
 CHANGELOG.md                     |  4 ++++
 analysis_options.yaml            |  2 +-
 lib/src/core/controller.dart     |  4 ++--
 lib/src/core/core.dart           |  1 +
 lib/src/core/env.dart            |  6 +++---
 lib/src/core/hooked_service.dart |  4 ++--
 lib/src/core/injection.dart      |  4 ++--
 lib/src/core/map_service.dart    |  2 +-
 lib/src/core/routable.dart       |  2 +-
 lib/src/core/server.dart         | 13 ++++++-------
 lib/src/core/service.dart        | 14 +++++++-------
 lib/src/util.dart                | 10 +++++-----
 test/controller_test.dart        |  2 +-
 test/di_test.dart                |  6 +++---
 test/hooked_test.dart            |  4 ++--
 15 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e7bd292..7afe6886 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-alpha.24
+* Add `AngelEnv` class to `core`.
+* Deprecate `Angel.isProduction`, in favor of `AngelEnv`.
+
 # 2.0.0-alpha.23
 * `ResponseContext.render` sets `charset` to `utf8` in `contentType`.
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index a0ee1ea1..fb26f9d9 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -3,4 +3,4 @@ analyzer:
     implicit-casts: false
 linter:
   rules:
-    - avoid_slow_async_io
\ No newline at end of file
+    - avoid_slow_async_io
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index c30c05fc..01ba1713 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -75,9 +75,9 @@ class Controller {
           methodName != 'call' &&
           methodName != 'equals' &&
           methodName != '==') {
-        Expose exposeDecl = decl.function.annotations
+        var exposeDecl = decl.function.annotations
             .map((m) => m.reflectee)
-            .firstWhere((r) => r is Expose, orElse: () => null);
+            .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
 
         if (exposeDecl == null) return;
 
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index 3822463a..755ae9ae 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -1,6 +1,7 @@
 export 'anonymous_service.dart';
 export 'controller.dart';
 export 'driver.dart';
+export 'env.dart';
 export 'hooked_service.dart';
 export 'map_service.dart';
 export 'metadata.dart';
diff --git a/lib/src/core/env.dart b/lib/src/core/env.dart
index fa0860ca..b43e0bfa 100644
--- a/lib/src/core/env.dart
+++ b/lib/src/core/env.dart
@@ -1,15 +1,15 @@
 import 'dart:io';
 
 /// A constant instance of [AngelEnv].
-const AngelEnv angelEnv = const AngelEnv();
+const AngelEnvironment angelEnv = const AngelEnvironment();
 
 /// Queries the environment's `ANGEL_ENV` value.
-class AngelEnv {
+class AngelEnvironment {
   final String _customValue;
 
   /// You can optionally provide a custom value, in order to override the system's
   /// value.
-  const AngelEnv([this._customValue]);
+  const AngelEnvironment([this._customValue]);
 
   /// Returns the value of the `ANGEL_ENV` variable; defaults to `'development'`.
   String get value =>
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 658d822a..25669c8d 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -90,7 +90,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
   /// Adds hooks to this instance.
   void addHooks(Angel app) {
-    Hooks hooks = getAnnotation(inner, Hooks, app.container.reflector);
+    Hooks hooks = getAnnotation<Hooks>(inner, app.container.reflector);
     List<HookedServiceEventListener<Id, Data, T>> before = [], after = [];
 
     if (hooks != null) {
@@ -101,7 +101,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
     void applyListeners(
         Function fn, HookedServiceEventDispatcher<Id, Data, T> dispatcher,
         [bool isAfter]) {
-      Hooks hooks = getAnnotation(fn, Hooks, app.container.reflector);
+      Hooks hooks = getAnnotation<Hooks>(fn, app.container.reflector);
       final listeners = <HookedServiceEventListener<Id, Data, T>>[]
         ..addAll(isAfter == true ? after : before);
 
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 98c4cb84..dd14e81b 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -53,8 +53,8 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
       requirement.length == 2 &&
       requirement.first is String &&
       requirement.last is Type) {
-    String key = requirement.first;
-    Type type = requirement.last;
+    var key = requirement.first;
+    var type = requirement.last;
     if (req.params.containsKey(key) ||
         req.app.configuration.containsKey(key) ||
         _primitiveTypes.contains(type)) {
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index adcc854e..75eef3df 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -51,7 +51,7 @@ class MapService extends Service<String, Map<String, dynamic>> {
     if (allowQuery == false || params == null || params['query'] is! Map)
       return new Future.value(items);
     else {
-      Map query = params['query'];
+      var query = params['query'] as Map;
 
       return new Future.value(items.where((item) {
         for (var key in query.keys) {
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 2a51f01a..01cfe1a9 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -99,7 +99,7 @@ class Routable extends Router<RequestHandler> {
     final handlers = <RequestHandler>[];
     // Merge @Middleware declaration, if any
     Middleware middlewareDeclaration =
-        getAnnotation(handler, Middleware, _container?.reflector);
+        getAnnotation<Middleware>(handler, _container?.reflector);
     if (middlewareDeclaration != null) {
       handlers.addAll(middlewareDeclaration.handlers);
     }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index af9cc062..8e944e60 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -15,6 +15,7 @@ import 'package:mime/mime.dart';
 import 'package:tuple/tuple.dart';
 
 import 'controller.dart';
+import 'env.dart';
 import 'hooked_service.dart';
 import 'request_context.dart';
 import 'response_context.dart';
@@ -42,7 +43,6 @@ class Angel extends Routable {
           MiddlewarePipeline>> handlerCache = new HashMap();
 
   Router<RequestHandler> _flattened;
-  bool _isProduction;
   Angel _parent;
 
   /// A global Map of converters that can transform responses bodies.
@@ -75,6 +75,8 @@ class Angel extends Routable {
   /// A set of [Controller] objects that have been loaded into the application.
   Map<Pattern, Controller> get controllers => _controllers;
 
+  /// Now *deprecated*, in favor of [AngelEnv] and [angelEnv].
+  ///
   /// Indicates whether the application is running in a production environment.
   ///
   /// The criteria for this is the `ANGEL_ENV` environment variable being set to
@@ -82,10 +84,8 @@ class Angel extends Routable {
   ///
   /// This value is memoized the first time you call it, so do not change environment
   /// configuration at runtime!
-  bool get isProduction {
-    return _isProduction ??=
-        (Platform.environment['ANGEL_ENV'] == 'production');
-  }
+  @deprecated
+  bool get isProduction => angelEnv.isProduction;
 
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
@@ -282,7 +282,7 @@ class Angel extends Routable {
     return parent != null ? parent.findProperty(key) : null;
   }
 
-  /// Runs several optimizations, *if* [isProduction] is `true`.
+  /// Runs several optimizations, *if* [angelEnv.isProduction] is `true`.
   ///
   /// * Preprocesses all dependency injection, and eliminates the burden of reflecting handlers
   /// at run-time.
@@ -291,7 +291,6 @@ class Angel extends Routable {
   /// You may [force] the optimization to run, if you are not running in production.
   void optimizeForProduction({bool force: false}) {
     if (isProduction == true || force == true) {
-      _isProduction = true;
       _flattened ??= flatten(this);
       logger?.info('Angel is running in production mode.');
     }
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 755fb6b1..7eb6d840 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -195,12 +195,12 @@ class Service<Id, Data> extends Routable {
 
     // Add global middleware if declared on the instance itself
     Middleware before =
-        getAnnotation(service, Middleware, app.container.reflector);
+        getAnnotation<Middleware>(service, app.container.reflector);
 
     if (before != null) handlers.addAll(before.handlers);
 
     Middleware indexMiddleware =
-        getAnnotation(service.index, Middleware, app.container.reflector);
+        getAnnotation<Middleware>(service.index, app.container.reflector);
     get('/', (req, res) {
       return this.index(mergeMap([
         {'query': req.queryParameters},
@@ -213,7 +213,7 @@ class Service<Id, Data> extends Routable {
           ..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
 
     Middleware createMiddleware =
-        getAnnotation(service.create, Middleware, app.container.reflector);
+        getAnnotation<Middleware>(service.create, app.container.reflector);
     post('/', (req, ResponseContext res) {
       return req.parseBody().then((_) {
         return this
@@ -236,7 +236,7 @@ class Service<Id, Data> extends Routable {
               (createMiddleware == null) ? [] : createMiddleware.handlers));
 
     Middleware readMiddleware =
-        getAnnotation(service.read, Middleware, app.container.reflector);
+        getAnnotation<Middleware>(service.read, app.container.reflector);
 
     get('/:id', (req, res) {
       return this.read(
@@ -252,7 +252,7 @@ class Service<Id, Data> extends Routable {
           ..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
 
     Middleware modifyMiddleware =
-        getAnnotation(service.modify, Middleware, app.container.reflector);
+        getAnnotation<Middleware>(service.modify, app.container.reflector);
     patch('/:id', (req, res) {
       return req.parseBody().then((_) {
         return this.modify(
@@ -271,7 +271,7 @@ class Service<Id, Data> extends Routable {
               (modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
 
     Middleware updateMiddleware =
-        getAnnotation(service.update, Middleware, app.container.reflector);
+        getAnnotation<Middleware>(service.update, app.container.reflector);
     post('/:id', (req, res) {
       return req.parseBody().then((_) {
         return this.update(
@@ -306,7 +306,7 @@ class Service<Id, Data> extends Routable {
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
 
     Middleware removeMiddleware =
-        getAnnotation(service.remove, Middleware, app.container.reflector);
+        getAnnotation<Middleware>(service.remove, app.container.reflector);
     delete('/', (req, res) {
       return this.remove(
           null,
diff --git a/lib/src/util.dart b/lib/src/util.dart
index e3537a22..8ae812b8 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -2,26 +2,26 @@ import 'package:angel_container/angel_container.dart';
 
 final RegExp straySlashes = new RegExp(r'(^/+)|(/+$)');
 
-matchingAnnotation(List<ReflectedInstance> metadata, Type T) {
+T matchingAnnotation<T>(List<ReflectedInstance> metadata) {
   for (ReflectedInstance metaDatum in metadata) {
     if (metaDatum.type.reflectedType == T) {
-      return metaDatum.reflectee;
+      return metaDatum.reflectee as T;
     }
   }
 
   return null;
 }
 
-getAnnotation(obj, Type T, Reflector reflector) {
+T getAnnotation<T>(obj, Reflector reflector) {
   if (reflector == null) {
     return null;
   } else {
     if (obj is Function) {
       var methodMirror = reflector.reflectFunction(obj);
-      return matchingAnnotation(methodMirror.annotations, T);
+      return matchingAnnotation<T>(methodMirror.annotations);
     } else {
       var classMirror = reflector.reflectClass(obj.runtimeType as Type);
-      return matchingAnnotation(classMirror.annotations, T);
+      return matchingAnnotation<T>(classMirror.annotations);
     }
   }
 }
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 72277a20..2a470a29 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -122,7 +122,7 @@ main() {
 
     expect(rgx.firstMatch(response.body)?.start, equals(0));
 
-    Map todo = json.decode(response.body.replaceAll(rgx, ""));
+    var todo = json.decode(response.body.replaceAll(rgx, "")) as Map;
     print("Todo: $todo");
     expect(todo['text'], equals("Hello"));
     expect(todo['over'], equals("world"));
diff --git a/test/di_test.dart b/test/di_test.dart
index 70c2dc3e..00888dc7 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -73,19 +73,19 @@ main() {
 
   test("make in route", () async {
     var response = await client.get("$url/errands3");
-    String text = await json.decode(response.body);
+    var text = await json.decode(response.body) as String;
     expect(text, equals(TEXT));
   });
 
   test("make in controller", () async {
     var response = await client.get("$url/errands4");
-    String text = await json.decode(response.body);
+    var text = await json.decode(response.body) as String;
     expect(text, equals(TEXT));
   });
 }
 
 void validateTodoSingleton(response) {
-  Map todo = json.decode(response.body.toString());
+  var todo = json.decode(response.body.toString()) as Map;
   expect(todo["id"], equals(null));
   expect(todo["text"], equals(TEXT));
   expect(todo["over"], equals(OVER));
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index bee62afb..a153ac29 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -77,7 +77,7 @@ main() {
         body: json.encode({"arbitrary": "data"}),
         headers: headers as Map<String, String>);
     print(response.body);
-    Map result = json.decode(response.body);
+    var result = json.decode(response.body) as Map;
     expect(result["hello"], equals("hooked world"));
   });
 
@@ -95,7 +95,7 @@ main() {
 
     var response = await client.get("$url/todos");
     print(response.body);
-    List result = json.decode(response.body);
+    var result = json.decode(response.body) as List;
     expect(result[0]["angel"], equals("framework"));
   });
 

From ef45d98a45bd6ed429573998e6f43f2a3496e101 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 8 Apr 2019 18:51:22 -0400
Subject: [PATCH 346/414] Add warning when no reflector is given

---
 CHANGELOG.md             |  3 +++
 example/main.dart        | 17 +++++++----------
 lib/src/core/server.dart | 13 ++++++++++---
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7afe6886..c3f2a4ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-rc.0
+* Log a warning when no `reflector` is provided.
+
 # 2.0.0-alpha.24
 * Add `AngelEnv` class to `core`.
 * Deprecate `Angel.isProduction`, in favor of `AngelEnv`.
diff --git a/example/main.dart b/example/main.dart
index 0a07dcd5..9d618393 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -4,18 +4,15 @@ import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
 
 main() async {
-  var app = new Angel(
+  // Logging set up/boilerplate
+  Logger.root.onRecord.listen(print);
+
+  // Create our server.
+  var app = Angel(
     logger: Logger('angel'),
     reflector: MirrorsReflector(),
   );
 
-  app.logger = new Logger('angel')
-    ..onRecord.listen((rec) {
-      print(rec);
-      if (rec.error != null) print(rec.error);
-      if (rec.stackTrace != null) print(rec.stackTrace);
-    });
-
   // Index route. Returns JSON.
   app.get('/', (req, res) => 'Welcome to Angel!');
 
@@ -44,12 +41,12 @@ main() async {
 
   // Simple fallback to throw a 404 on unknown paths.
   app.fallback((req, res) {
-    throw new AngelHttpException.notFound(
+    throw AngelHttpException.notFound(
       message: 'Unknown path: "${req.uri.path}"',
     );
   });
 
-  var http = new AngelHttp(app);
+  var http = AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
   var url = 'http://${server.address.address}:${server.port}';
   print('Listening at $url');
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 8e944e60..e71e2a09 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -3,8 +3,6 @@ library angel_framework.http.server;
 import 'dart:async';
 import 'dart:collection' show HashMap;
 import 'dart:convert';
-import 'dart:io';
-
 import 'package:angel_container/angel_container.dart';
 import 'package:angel_http_exception/angel_http_exception.dart';
 import 'package:angel_route/angel_route.dart';
@@ -13,7 +11,6 @@ import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
 import 'package:mime/mime.dart';
 import 'package:tuple/tuple.dart';
-
 import 'controller.dart';
 import 'env.dart';
 import 'hooked_service.dart';
@@ -357,6 +354,16 @@ class Angel extends Routable {
       this.serializer,
       this.viewGenerator})
       : super(reflector) {
+    if (reflector == const EmptyReflector()) {
+      var msg =
+          'No `reflector` was passed to the Angel constructor, so reflection will not be available.\n'
+          'Features like controllers, constructor dependency injection, and `ioc` require reflection, '
+          'and will not work without it.\n\n'
+          'For more, see the documentation:\n'
+          'https://docs.angel-dart.dev/guides/dependency-injection#enabling-dart-mirrors-or-other-reflection';
+      logger?.warning(msg);
+    }
+
     bootstrapContainer();
     viewGenerator ??= noViewEngineConfigured;
     serializer ??= json.encode;

From 05199ce342ef2f82919181628590dbfaa0dacfa9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 8 Apr 2019 18:55:02 -0400
Subject: [PATCH 347/414] Bump to 2.0.0-rc.0

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index c330d3f8..3d105177 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-alpha.23
+version: 2.0.0-rc.0
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From a4fd32581bb486989caac938e23f877cbd3c3da6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 8 Apr 2019 19:03:35 -0400
Subject: [PATCH 348/414] Port to using angelEnv

---
 CHANGELOG.md             |  3 +++
 lib/src/core/driver.dart |  6 +++---
 lib/src/core/server.dart | 19 +++++++++++++------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3f2a4ca..71ccd172 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # 2.0.0-rc.0
 * Log a warning when no `reflector` is provided.
+* Add `AngelEnvironment` class.
+    * Add `Angel.environment`.
+    * Deprecated `app.isProduction` in favor of `app.environment.isProduction`.
 
 # 2.0.0-alpha.24
 * Add `AngelEnv` class to `core`.
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index 5ffce8d1..e49a8ab1 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -113,7 +113,7 @@ abstract class Driver<
           }
 
           var cacheKey = req.method + path;
-          var tuple = app.isProduction
+          var tuple = app.environment.isProduction
               ? app.handlerCache.putIfAbsent(cacheKey, resolveTuple)
               : resolveTuple();
           var line = tuple.item4 as MiddlewarePipeline<RequestHandler>;
@@ -129,7 +129,7 @@ abstract class Driver<
             ..registerSingleton<ParseResult<RouteResult>>(tuple.item3)
             ..registerSingleton<ParseResult>(tuple.item3);
 
-          if (!app.isProduction && app.logger != null) {
+          if (!app.environment.isProduction && app.logger != null) {
             req.container
                 .registerSingleton<Stopwatch>(new Stopwatch()..start());
           }
@@ -279,7 +279,7 @@ abstract class Driver<
       ResponseContext res,
       {bool ignoreFinalizers = false}) {
     void _cleanup(_) {
-      if (!app.isProduction && app.logger != null) {
+      if (!app.environment.isProduction && app.logger != null) {
         var sw = req.container.make<Stopwatch>();
         app.logger.info(
             "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index e71e2a09..b4d401f8 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -72,7 +72,8 @@ class Angel extends Routable {
   /// A set of [Controller] objects that have been loaded into the application.
   Map<Pattern, Controller> get controllers => _controllers;
 
-  /// Now *deprecated*, in favor of [AngelEnv] and [angelEnv].
+  /// Now *deprecated*, in favor of [AngelEnv] and [angelEnv]. Use `app.environment.isProduction`
+  /// instead.
   ///
   /// Indicates whether the application is running in a production environment.
   ///
@@ -82,7 +83,12 @@ class Angel extends Routable {
   /// This value is memoized the first time you call it, so do not change environment
   /// configuration at runtime!
   @deprecated
-  bool get isProduction => angelEnv.isProduction;
+  bool get isProduction => environment.isProduction;
+
+  /// The [AngelEnvironment] in which the application is running.
+  ///
+  /// By default, it is automatically inferred.
+  final AngelEnvironment environment;
 
   /// Returns the parent instance of this application, if any.
   Angel get parent => _parent;
@@ -213,14 +219,14 @@ class Angel extends Routable {
       String header: 'Dumping route tree:',
       String tab: '  ',
       bool showMatchers: false}) {
-    if (isProduction) {
+    if (environment.isProduction) {
       _flattened ??= flatten(this);
 
       _flattened.dumpTree(
           callback: callback,
           header: header?.isNotEmpty == true
               ? header
-              : (isProduction
+              : (environment.isProduction
                   ? 'Dumping flattened route tree:'
                   : 'Dumping route tree:'),
           tab: tab ?? '  ');
@@ -229,7 +235,7 @@ class Angel extends Routable {
           callback: callback,
           header: header?.isNotEmpty == true
               ? header
-              : (isProduction
+              : (environment.isProduction
                   ? 'Dumping flattened route tree:'
                   : 'Dumping route tree:'),
           tab: tab ?? '  ');
@@ -287,7 +293,7 @@ class Angel extends Routable {
   ///
   /// You may [force] the optimization to run, if you are not running in production.
   void optimizeForProduction({bool force: false}) {
-    if (isProduction == true || force == true) {
+    if (environment.isProduction || force == true) {
       _flattened ??= flatten(this);
       logger?.info('Angel is running in production mode.');
     }
@@ -349,6 +355,7 @@ class Angel extends Routable {
 
   Angel(
       {Reflector reflector: const EmptyReflector(),
+      this.environment: angelEnv,
       this.logger,
       this.allowMethodOverrides: true,
       this.serializer,

From 6ca21d67791cf3a2c927ff6a4c4a929271d88ca8 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 8 Apr 2019 19:08:19 -0400
Subject: [PATCH 349/414] AngelEnv test

---
 test/env_test.dart | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 test/env_test.dart

diff --git a/test/env_test.dart b/test/env_test.dart
new file mode 100644
index 00000000..c528e1c9
--- /dev/null
+++ b/test/env_test.dart
@@ -0,0 +1,18 @@
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('custom value', () => expect(AngelEnvironment('hey').value, 'hey'));
+
+  test('lowercases', () => expect(AngelEnvironment('HeY').value, 'hey'));
+  test(
+      'default to env or development',
+      () => expect(AngelEnvironment().value,
+          (Platform.environment['ANGEL_ENV'] ?? 'development').toLowerCase()));
+  test('isDevelopment',
+      () => expect(AngelEnvironment('development').isDevelopment, true));
+  test('isStaging', () => expect(AngelEnvironment('staging').isStaging, true));
+  test('isDevelopment',
+      () => expect(AngelEnvironment('production').isProduction, true));
+}

From 28f020f1e9f7c67dd1227f5efaca254801831ef2 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 8 Apr 2019 19:20:47 -0400
Subject: [PATCH 350/414] JSONP tests

---
 test/jsonp_test.dart | 57 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 test/jsonp_test.dart

diff --git a/test/jsonp_test.dart b/test/jsonp_test.dart
new file mode 100644
index 00000000..1517619c
--- /dev/null
+++ b/test/jsonp_test.dart
@@ -0,0 +1,57 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:http_parser/http_parser.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+void main() {
+  var app = Angel();
+  var http = AngelHttp(app);
+
+  app.get('/default', (req, res) => res.jsonp({'foo': 'bar'}));
+
+  app.get('/callback',
+      (req, res) => res.jsonp({'foo': 'bar'}, callbackName: 'doIt'));
+
+  app.get(
+      '/contentType',
+      (req, res) =>
+          res.jsonp({'foo': 'bar'}, contentType: MediaType('foo', 'bar')));
+
+  Future<MediaType> getContentType(String path) async {
+    var rq = MockHttpRequest('GET', Uri(path: '/$path'));
+    await rq.close();
+    await http.handleRequest(rq);
+    return MediaType.parse(rq.response.headers.contentType.toString());
+  }
+
+  Future<String> getText(String path) async {
+    var rq = MockHttpRequest('GET', Uri(path: '/$path'));
+    await rq.close();
+    await http.handleRequest(rq);
+    return await rq.response.transform(utf8.decoder).join();
+  }
+
+  test('default', () async {
+    var response = await getText('default');
+    var contentType = await getContentType('default');
+    expect(response, r'callback({"foo":"bar"})');
+    expect(contentType.mimeType, 'application/javascript');
+  });
+
+  test('callback', () async {
+    var response = await getText('callback');
+    var contentType = await getContentType('callback');
+    expect(response, r'doIt({"foo":"bar"})');
+    expect(contentType.mimeType, 'application/javascript');
+  });
+
+  test('content type', () async {
+    var response = await getText('contentType');
+    var contentType = await getContentType('contentType');
+    expect(response, r'callback({"foo":"bar"})');
+    expect(contentType.mimeType, 'foo/bar');
+  });
+}

From efbb09169a4c7f35dea1fe7be29b34089b6576be Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 10 Apr 2019 13:52:45 -0400
Subject: [PATCH 351/414] Body parsing tests; allow setting body ONCE

---
 CHANGELOG.md                      |  1 +
 lib/src/core/request_context.dart | 25 ++++++++
 test/body_test.dart               | 99 +++++++++++++++++++++++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 test/body_test.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71ccd172..3f6ccd62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * Add `AngelEnvironment` class.
     * Add `Angel.environment`.
     * Deprecated `app.isProduction` in favor of `app.environment.isProduction`.
+* Allow setting of `bodyAsObject`, `bodyAsMap`, or `bodyAsList` **exactly once**.
 
 # 2.0.0-alpha.24
 * Add `AngelEnv` class to `core`.
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 1f9a81a9..8d0cc337 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -113,6 +113,11 @@ abstract class RequestContext<RawRequest> {
     return _bodyFields;
   }
 
+  /// This setter allows you to explicitly set the request body **exactly once**.
+  ///
+  /// Use this if the format of the body is not natively parsed by Angel.
+  set bodyAsMap(Map<String, dynamic> value) => bodyAsObject = value;
+
   /// Returns a *mutable* [List] parsed from the request [body].
   ///
   /// Note that [parseBody] must be called first.
@@ -126,6 +131,11 @@ abstract class RequestContext<RawRequest> {
     return _bodyList;
   }
 
+  /// This setter allows you to explicitly set the request body **exactly once**.
+  ///
+  /// Use this if the format of the body is not natively parsed by Angel.
+  set bodyAsList(List value) => bodyAsObject = value;
+
   /// Returns the parsed request body, whatever it may be (typically a [Map] or [List]).
   ///
   /// Note that [parseBody] must be called first.
@@ -137,6 +147,21 @@ abstract class RequestContext<RawRequest> {
     return _bodyObject;
   }
 
+  /// This setter allows you to explicitly set the request body **exactly once**.
+  ///
+  /// Use this if the format of the body is not natively parsed by Angel.
+  set bodyAsObject(value) {
+    if (_bodyObject != null) {
+      throw StateError(
+          'The request body has already been parsed/set, and cannot be overwritten.');
+    } else {
+      if (value is List) _bodyList = value;
+      if (value is Map<String, dynamic>) _bodyFields = value;
+      _bodyObject = value;
+      _hasParsedBody = true;
+    }
+  }
+
   /// Returns a *mutable* map of the files parsed from the request [body].
   ///
   /// Note that [parseBody] must be called first.
diff --git a/test/body_test.dart b/test/body_test.dart
new file mode 100644
index 00000000..3c085df1
--- /dev/null
+++ b/test/body_test.dart
@@ -0,0 +1,99 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:mock_request/mock_request.dart';
+import 'package:test/test.dart';
+
+void main() {
+  var app = Angel();
+  var http = AngelHttp(app);
+
+  Future<RequestContext> request(
+      {bool asJson: true,
+      bool parse: true,
+      Map<String, dynamic> bodyFields,
+      List bodyList}) async {
+    var rq = MockHttpRequest('POST', Uri(path: '/'));
+
+    if (bodyFields != null) {
+      if (asJson) {
+        rq
+          ..headers.contentType = ContentType('application', 'json')
+          ..write(json.encode(bodyFields));
+      } else {
+        var b = StringBuffer();
+        var i = 0;
+        for (var entry in bodyFields.entries) {
+          if (i++ > 0) b.write('&');
+          b.write(entry.key);
+          b.write('=');
+          b.write(Uri.encodeComponent(entry.value.toString()));
+        }
+
+        rq
+          ..headers.contentType =
+              ContentType('application', 'x-www-form-urlencoded')
+          ..write(json.encode(b.toString()));
+      }
+    } else if (bodyList != null) {
+      rq
+        ..headers.contentType = ContentType('application', 'json')
+        ..write(json.encode(bodyList));
+    }
+
+    await rq.close();
+    var req = await http.createRequestContext(rq, rq.response);
+    if (parse) await req.parseBody();
+    return req;
+  }
+
+  test('parses json maps', () async {
+    var req = await request(bodyFields: {'hello': 'world'});
+    expect(req.bodyAsObject, TypeMatcher<Map<String, dynamic>>());
+    expect(req.bodyAsMap, {'hello': 'world'});
+  });
+
+  test('parses json lists', () async {
+    var req = await request(bodyList: ['foo', 'bar']);
+    expect(req.bodyAsObject, TypeMatcher<List>());
+    expect(req.bodyAsList, ['foo', 'bar']);
+  });
+
+  test('throws when body has not been parsed', () async {
+    var req = await request(parse: false);
+    expect(() => req.bodyAsObject, throwsStateError);
+    expect(() => req.bodyAsMap, throwsStateError);
+    expect(() => req.bodyAsList, throwsStateError);
+  });
+
+  test('can set body object exactly once', () async {
+    var req = await request(parse: false);
+    req.bodyAsObject = 23;
+    expect(req.bodyAsObject, 23);
+    expect(() => req.bodyAsObject = {45.6: '34'}, throwsStateError);
+  });
+
+  test('can set body map exactly once', () async {
+    var req = await request(parse: false);
+    req.bodyAsMap = {'hey': 'yes'};
+    expect(req.bodyAsMap, {'hey': 'yes'});
+    expect(() => req.bodyAsMap = {'hm': 'ok'}, throwsStateError);
+  });
+
+  test('can set body list exactly once', () async {
+    var req = await request(parse: false);
+    req.bodyAsList = [
+      {'hey': 'yes'}
+    ];
+    expect(req.bodyAsList, [
+      {'hey': 'yes'}
+    ]);
+    expect(
+        () => req.bodyAsList = [
+              {'hm': 'ok'}
+            ],
+        throwsStateError);
+  });
+}

From 47261f0a088dd60549786e9aa82a627544845a72 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 10 Apr 2019 19:01:04 -0400
Subject: [PATCH 352/414] resolveInjection supports named injections

---
 CHANGELOG.md                | 1 +
 lib/src/core/injection.dart | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f6ccd62..15e3a178 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
     * Add `Angel.environment`.
     * Deprecated `app.isProduction` in favor of `app.environment.isProduction`.
 * Allow setting of `bodyAsObject`, `bodyAsMap`, or `bodyAsList` **exactly once**.
+* Resolve named singletons in `resolveInjection`.
 
 # 2.0.0-alpha.24
 * Add `AngelEnv` class to `core`.
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index dd14e81b..4db5c9ca 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -39,6 +39,8 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     if (value == null && param.required != false) throw param.error;
     return value;
   } else if (requirement is String) {
+    if (req.container.hasNamed(requirement))
+      return req.container.findByName(requirement);
     if (req.params.containsKey(requirement)) {
       return req.params[requirement];
     } else if ((propFromApp = req.app.findProperty(requirement)) != null)

From 3802668cfcda543314ee616cb12ba60945afa43c Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 10 Apr 2019 19:05:53 -0400
Subject: [PATCH 353/414] Add parse ID tests

---
 CHANGELOG.md              |  1 +
 lib/src/core/service.dart |  2 +-
 test/parse_id_test.dart   | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 test/parse_id_test.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15e3a178..3d8763e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
     * Deprecated `app.isProduction` in favor of `app.environment.isProduction`.
 * Allow setting of `bodyAsObject`, `bodyAsMap`, or `bodyAsList` **exactly once**.
 * Resolve named singletons in `resolveInjection`.
+* Fix a bug where `Service.parseId<double>` would attempt to parse an `int`.
 
 # 2.0.0-alpha.24
 * Add `AngelEnv` class to `core`.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 7eb6d840..52104df0 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -177,7 +177,7 @@ class Service<Id, Data> extends Routable {
     else if (T == bool)
       return (id == true || id?.toString() == 'true') as T;
     else if (T == double)
-      return int.parse(id.toString()) as T;
+      return double.parse(id.toString()) as T;
     else if (T == num)
       return num.parse(id.toString()) as T;
     else
diff --git a/test/parse_id_test.dart b/test/parse_id_test.dart
new file mode 100644
index 00000000..7e427ec3
--- /dev/null
+++ b/test/parse_id_test.dart
@@ -0,0 +1,33 @@
+import 'package:angel_framework/angel_framework.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('null', () {
+    expect(Service.parseId('null'), null);
+    expect(Service.parseId(null), null);
+  });
+
+  test('String', () {
+    expect(Service.parseId('23'), '23');
+  });
+
+  test('int', () {
+    expect(Service.parseId<int>('23'), 23);
+  });
+
+  test('double', () {
+    expect(Service.parseId<double>('23.4'), 23.4);
+  });
+
+  test('num', () {
+    expect(Service.parseId<num>('23.4'), 23.4);
+  });
+
+  test('bool', () {
+    expect(Service.parseId<bool>('true'), true);
+    expect(Service.parseId<bool>(true), true);
+    expect(Service.parseId<bool>('false'), false);
+    expect(Service.parseId<bool>(false), false);
+    expect(Service.parseId<bool>('hmm'), false);
+  });
+}

From 53b47dd43f9afbab5aac371c52902f2d85522df2 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 10 Apr 2019 22:26:43 -0400
Subject: [PATCH 354/414] Replace as Data cast in Service.dart with a method
 that throws a 400 on error

---
 CHANGELOG.md              |  1 +
 lib/src/core/service.dart | 45 ++++++++++++++++++++++++++++-----------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d8763e2..dae87e95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Allow setting of `bodyAsObject`, `bodyAsMap`, or `bodyAsList` **exactly once**.
 * Resolve named singletons in `resolveInjection`.
 * Fix a bug where `Service.parseId<double>` would attempt to parse an `int`.
+* Replace as Data cast in Service.dart with a method that throws a 400 on error.
 
 # 2.0.0-alpha.24
 * Add `AngelEnv` class to `core`.
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 52104df0..0fcfc5a7 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -8,6 +8,7 @@ import '../util.dart';
 import 'anonymous_service.dart';
 import 'hooked_service.dart' show HookedService;
 import 'metadata.dart';
+import 'request_context.dart';
 import 'response_context.dart';
 import 'routable.dart';
 import 'server.dart';
@@ -72,6 +73,26 @@ class Service<Id, Data> extends Routable {
   /// Closes this service, including any database connections or stream controllers.
   void close() {}
 
+  /// An optional [readData] function can be passed to handle non-map/non-json bodies.
+  Service({FutureOr<Data> Function(RequestContext, ResponseContext) readData}) {
+    _readData = readData ??
+        (req, res) {
+          if (req.bodyAsObject is! Data) {
+            throw AngelHttpException.badRequest(
+                message:
+                    'Invalid request body. Expected $Data; found ${req.bodyAsObject} instead.');
+          } else {
+            return req.bodyAsObject as Data;
+          }
+        };
+  }
+
+  FutureOr<Data> Function(RequestContext, ResponseContext) _readData;
+
+  /// A [Function] that reads the request body and converts it into [Data].
+  FutureOr<Data> Function(RequestContext, ResponseContext) get readData =>
+      _readData;
+
   /// Retrieves the first object from the result of calling [index] with the given [params].
   ///
   /// If the result of [index] is `null`, OR an empty [Iterable], a 404 `AngelHttpException` will be thrown.
@@ -215,10 +236,10 @@ class Service<Id, Data> extends Routable {
     Middleware createMiddleware =
         getAnnotation<Middleware>(service.create, app.container.reflector);
     post('/', (req, ResponseContext res) {
-      return req.parseBody().then((_) {
-        return this
+      return req.parseBody().then((_) async {
+        return await this
             .create(
-                req.bodyAsMap as Data,
+                await readData(req, res),
                 mergeMap([
                   {'query': req.queryParameters},
                   restProvider,
@@ -254,10 +275,10 @@ class Service<Id, Data> extends Routable {
     Middleware modifyMiddleware =
         getAnnotation<Middleware>(service.modify, app.container.reflector);
     patch('/:id', (req, res) {
-      return req.parseBody().then((_) {
-        return this.modify(
+      return req.parseBody().then((_) async {
+        return await this.modify(
             parseId<Id>(req.params['id']),
-            req.bodyAsMap as Data,
+            await readData(req, res),
             mergeMap([
               {'query': req.queryParameters},
               restProvider,
@@ -273,10 +294,10 @@ class Service<Id, Data> extends Routable {
     Middleware updateMiddleware =
         getAnnotation<Middleware>(service.update, app.container.reflector);
     post('/:id', (req, res) {
-      return req.parseBody().then((_) {
-        return this.update(
+      return req.parseBody().then((_) async {
+        return await this.update(
             parseId<Id>(req.params['id']),
-            req.bodyAsMap as Data,
+            await readData(req, res),
             mergeMap([
               {'query': req.queryParameters},
               restProvider,
@@ -289,10 +310,10 @@ class Service<Id, Data> extends Routable {
           ..addAll(
               (updateMiddleware == null) ? [] : updateMiddleware.handlers));
     put('/:id', (req, res) {
-      return req.parseBody().then((_) {
-        return this.update(
+      return req.parseBody().then((_) async {
+        return await this.update(
             parseId<Id>(req.params['id']),
-            req.bodyAsMap as Data,
+            await readData(req, res),
             mergeMap([
               {'query': req.queryParameters},
               restProvider,

From d210456d44b1bc57b5d45e1ee9b6e5c66fd06ce9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 10 Apr 2019 22:37:05 -0400
Subject: [PATCH 355/414] Formatting + pedantic

---
 analysis_options.yaml                     |  3 +++
 lib/src/core/injection.dart               | 10 +++++-----
 lib/src/core/map_service.dart             |  8 ++++----
 lib/src/core/metadata.dart                | 18 +++++++++---------
 lib/src/core/request_context.dart         |  6 +++---
 lib/src/core/response_context.dart        |  4 ++--
 lib/src/core/routable.dart                |  2 +-
 lib/src/core/server.dart                  | 16 ++++++++--------
 lib/src/http/angel_http.dart              | 10 +++++-----
 lib/src/http/http_response_context.dart   |  2 +-
 lib/src/http2/angel_http2.dart            |  4 ++--
 lib/src/http2/http2_response_context.dart |  2 +-
 pubspec.yaml                              |  1 +
 test/body_test.dart                       |  4 ++--
 14 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index fb26f9d9..b3302c76 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,6 +1,9 @@
+include: package:pedantic/analysis_options.yaml
 analyzer:
   strong-mode:
     implicit-casts: false
+  errors:
+    unawaited_futures: ignore
 linter:
   rules:
     - avoid_slow_async_io
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 4db5c9ca..ededfb9b 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -7,7 +7,7 @@ const List<Type> _primitiveTypes = [String, int, num, double, Null];
 /// Use this to instantly create a request handler for a DI-enabled method.
 ///
 /// Calling [ioc] also auto-serializes the result of a [handler].
-RequestHandler ioc(Function handler, {Iterable<String> optional: const []}) {
+RequestHandler ioc(Function handler, {Iterable<String> optional = const []}) {
   InjectionRequest injection;
   RequestHandler contained;
 
@@ -129,10 +129,10 @@ class InjectionRequest {
   final Map<String, Parameter> parameters;
 
   const InjectionRequest.constant(
-      {this.named: const {},
-      this.required: const [],
-      this.optional: const [],
-      this.parameters: const {}});
+      {this.named = const {},
+      this.required = const [],
+      this.optional = const [],
+      this.parameters = const {}});
 
   InjectionRequest()
       : named = {},
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 75eef3df..511ce780 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -23,10 +23,10 @@ class MapService extends Service<String, Map<String, dynamic>> {
   final List<Map<String, dynamic>> items = [];
 
   MapService(
-      {this.allowRemoveAll: false,
-      this.allowQuery: true,
-      this.autoIdAndDateFields: true,
-      this.autoSnakeCaseNames: true})
+      {this.allowRemoveAll = false,
+      this.allowQuery = true,
+      this.autoIdAndDateFields = true,
+      this.autoSnakeCaseNames = true})
       : super();
 
   String get createdAtKey =>
diff --git a/lib/src/core/metadata.dart b/lib/src/core/metadata.dart
index 5e1f0f00..ebc917d6 100644
--- a/lib/src/core/metadata.dart
+++ b/lib/src/core/metadata.dart
@@ -18,7 +18,7 @@ class Hooks {
   final List<HookedServiceEventListener> before;
   final List<HookedServiceEventListener> after;
 
-  const Hooks({this.before: const [], this.after: const []});
+  const Hooks({this.before = const [], this.after = const []});
 }
 
 /// Exposes a [Controller] to the Internet.
@@ -30,10 +30,10 @@ class Expose {
   final List<String> allowNull;
 
   const Expose(this.path,
-      {this.method: "GET",
-      this.middleware: const [],
-      this.as: null,
-      this.allowNull: const []});
+      {this.method = "GET",
+      this.middleware = const [],
+      this.as,
+      this.allowNull = const []});
 }
 
 /// Used to apply special dependency injections or functionality to a function parameter.
@@ -101,7 +101,7 @@ class Parameter {
 
 /// Shortcut for declaring a request header [Parameter].
 class Header extends Parameter {
-  const Header(String header, {match, defaultValue, bool required: true})
+  const Header(String header, {match, defaultValue, bool required = true})
       : super(
             header: header,
             match: match,
@@ -111,7 +111,7 @@ class Header extends Parameter {
 
 /// Shortcut for declaring a request session [Parameter].
 class Session extends Parameter {
-  const Session(String session, {match, defaultValue, bool required: true})
+  const Session(String session, {match, defaultValue, bool required = true})
       : super(
             session: session,
             match: match,
@@ -121,7 +121,7 @@ class Session extends Parameter {
 
 /// Shortcut for declaring a request query [Parameter].
 class Query extends Parameter {
-  const Query(String query, {match, defaultValue, bool required: true})
+  const Query(String query, {match, defaultValue, bool required = true})
       : super(
             query: query,
             match: match,
@@ -131,7 +131,7 @@ class Query extends Parameter {
 
 /// Shortcut for declaring a request cookie [Parameter].
 class CookieValue extends Parameter {
-  const CookieValue(String cookie, {match, defaultValue, bool required: true})
+  const CookieValue(String cookie, {match, defaultValue, bool required = true})
       : super(
             cookie: cookie,
             match: match,
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 8d0cc337..0e1853e0 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -191,7 +191,7 @@ abstract class RequestContext<RawRequest> {
   /// [contentType] can be either of the following:
   /// * A [ContentType], in which case the `Accept` header will be compared against its `mimeType` property.
   /// * Any other Dart value, in which case the `Accept` header will be compared against the result of a `toString()` call.
-  bool accepts(contentType, {bool strict: false}) {
+  bool accepts(contentType, {bool strict = false}) {
     var contentTypeString = contentType is MediaType
         ? contentType.mimeType
         : contentType?.toString();
@@ -215,7 +215,7 @@ abstract class RequestContext<RawRequest> {
   bool get acceptsAll => _acceptsAllCache ??= accepts('*/*');
 
   /// Manually parses the request body, if it has not already been parsed.
-  Future<void> parseBody({Encoding encoding: utf8}) async {
+  Future<void> parseBody({Encoding encoding = utf8}) async {
     if (contentType == null) {
       throw FormatException('Missing "content-type" header.');
     }
@@ -322,7 +322,7 @@ class UploadedFile {
   }
 
   /// Reads the contents of the file as [String], using the given [encoding].
-  Future<String> readAsString({Encoding encoding: utf8}) {
+  Future<String> readAsString({Encoding encoding = utf8}) {
     return data.transform(encoding.decoder).join();
   }
 }
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index eb4de267..f4fa7f0b 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -173,7 +173,7 @@ abstract class ResponseContext<RawResponse>
   /// Returns a JSONP response.
   ///
   /// You can override the [contentType] sent; by default it is `application/javascript`.
-  void jsonp(value, {String callbackName: "callback", MediaType contentType}) {
+  void jsonp(value, {String callbackName = "callback", MediaType contentType}) {
     if (!isOpen) throw closed();
     this.contentType =
         contentType ?? new MediaType('application', 'javascript');
@@ -201,7 +201,7 @@ abstract class ResponseContext<RawResponse>
   /// based on the provided params.
   ///
   /// See [Router]#navigate for more. :)
-  void redirect(url, {bool absolute: true, int code: 302}) {
+  void redirect(url, {bool absolute = true, int code = 302}) {
     if (!isOpen) throw closed();
     headers
       ..['content-type'] = 'text/html'
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 01cfe1a9..05463d70 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -95,7 +95,7 @@ class Routable extends Router<RequestHandler> {
   @override
   Route<RequestHandler> addRoute(
       String method, String path, RequestHandler handler,
-      {Iterable<RequestHandler> middleware: const <RequestHandler>[]}) {
+      {Iterable<RequestHandler> middleware = const []}) {
     final handlers = <RequestHandler>[];
     // Merge @Middleware declaration, if any
     Middleware middlewareDeclaration =
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index b4d401f8..8055f6ca 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -150,7 +150,7 @@ class Angel extends Routable {
   @override
   Route<RequestHandler> addRoute(
       String method, String path, RequestHandler handler,
-      {Iterable<RequestHandler> middleware: const <RequestHandler>[]}) {
+      {Iterable<RequestHandler> middleware = const []}) {
     if (_flattened != null) {
       logger?.warning(
           'WARNING: You added a route ($method $path) to the router, after it had been optimized.');
@@ -216,9 +216,9 @@ class Angel extends Routable {
   @override
   void dumpTree(
       {callback(String tree),
-      String header: 'Dumping route tree:',
-      String tab: '  ',
-      bool showMatchers: false}) {
+      String header = 'Dumping route tree:',
+      String tab = '  ',
+      bool showMatchers = false}) {
     if (environment.isProduction) {
       _flattened ??= flatten(this);
 
@@ -292,7 +292,7 @@ class Angel extends Routable {
   /// * [flatten]s the route tree into a linear one.
   ///
   /// You may [force] the optimization to run, if you are not running in production.
-  void optimizeForProduction({bool force: false}) {
+  void optimizeForProduction({bool force = false}) {
     if (environment.isProduction || force == true) {
       _flattened ??= flatten(this);
       logger?.info('Angel is running in production mode.');
@@ -354,10 +354,10 @@ class Angel extends Routable {
   }
 
   Angel(
-      {Reflector reflector: const EmptyReflector(),
-      this.environment: angelEnv,
+      {Reflector reflector = const EmptyReflector(),
+      this.environment = angelEnv,
       this.logger,
-      this.allowMethodOverrides: true,
+      this.allowMethodOverrides = true,
       this.serializer,
       this.viewGenerator})
       : super(reflector) {
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index cb6ff71a..9eea0a9b 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -26,19 +26,19 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
       Future<HttpServer> Function(dynamic, int) serverGenerator, bool useZone)
       : super(app, serverGenerator, useZone: useZone);
 
-  factory AngelHttp(Angel app, {bool useZone: true}) {
+  factory AngelHttp(Angel app, {bool useZone = true}) {
     return new AngelHttp._(app, HttpServer.bind, useZone);
   }
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory AngelHttp.custom(
       Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator,
-      {bool useZone: true}) {
+      {bool useZone = true}) {
     return new AngelHttp._(app, serverGenerator, useZone);
   }
 
   factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context,
-      {bool useZone: true}) {
+      {bool useZone = true}) {
     return new AngelHttp._(app, (address, int port) {
       return HttpServer.bindSecure(address, port, context);
     }, useZone);
@@ -51,7 +51,7 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
   /// the server.
   factory AngelHttp.secure(
       Angel app, String certificateChainPath, String serverKeyPath,
-      {String password, bool useZone: true}) {
+      {String password, bool useZone = true}) {
     var certificateChain =
         Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
@@ -86,7 +86,7 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
   Future<HttpRequestContext> createRequestContext(
       HttpRequest request, HttpResponse response) {
     var path = request.uri.path.replaceAll(_straySlashes, '');
-    if (path.length == 0) path = '/';
+    if (path.isEmpty) path = '/';
     return HttpRequestContext.from(request, app, path);
   }
 
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 50e3c546..a4d140e2 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -71,7 +71,7 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   }
 
   @override
-  void set contentType(MediaType value) {
+  set contentType(MediaType value) {
     super.contentType = value;
     if (!_streamInitialized)
       rawResponse.headers.contentType =
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index 3a90e58f..86e64c97 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -30,7 +30,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
         );
 
   factory AngelHttp2(Angel app, SecurityContext securityContext,
-      {bool useZone: true, ServerSettings settings}) {
+      {bool useZone = true, ServerSettings settings}) {
     return new AngelHttp2.custom(app, securityContext, SecureServerSocket.bind,
         settings: settings);
   }
@@ -40,7 +40,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
       SecurityContext ctx,
       Future<SecureServerSocket> serverGenerator(
           address, int port, SecurityContext ctx),
-      {bool useZone: true,
+      {bool useZone = true,
       ServerSettings settings}) {
     return new AngelHttp2._(app, (address, port) {
       var addr = address is InternetAddress
diff --git a/lib/src/http2/http2_response_context.dart b/lib/src/http2/http2_response_context.dart
index 0e1224db..bc5c0e4d 100644
--- a/lib/src/http2/http2_response_context.dart
+++ b/lib/src/http2/http2_response_context.dart
@@ -204,7 +204,7 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
 
   /// Pushes a resource to the client.
   Http2ResponseContext push(String path,
-      {Map<String, String> headers: const {}, String method: 'GET'}) {
+      {Map<String, String> headers = const {}, String method = 'GET'}) {
     var targetUri = _req.uri.replace(path: path);
 
     var h = <Header>[
diff --git a/pubspec.yaml b/pubspec.yaml
index 3d105177..fc678f71 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -30,4 +30,5 @@ dependencies:
 dev_dependencies:
   http: ^0.11.3
   io: ^0.3.0
+  pedantic: ^1.0.0
   test: ^1.0.0
diff --git a/test/body_test.dart b/test/body_test.dart
index 3c085df1..2f69b541 100644
--- a/test/body_test.dart
+++ b/test/body_test.dart
@@ -11,8 +11,8 @@ void main() {
   var http = AngelHttp(app);
 
   Future<RequestContext> request(
-      {bool asJson: true,
-      bool parse: true,
+      {bool asJson = true,
+      bool parse = true,
       Map<String, dynamic> bodyFields,
       List bodyList}) async {
     var rq = MockHttpRequest('POST', Uri(path: '/'));

From 13538b5ddbd0859cf36dfa5f92c079296ab32708 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 11 Apr 2019 10:34:13 -0400
Subject: [PATCH 356/414] Prevent "add" after "close" on stream, 2.0.0-rc.1

---
 CHANGELOG.md                              |  3 ++
 lib/src/http/http_response_context.dart   | 34 ++++++++++++-----------
 lib/src/http2/http2_response_context.dart | 32 +++++++++++----------
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dae87e95..015f93cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-rc.1
+* Fix logic error that allowed content to be written to streaming responses after `close` was closed.
+
 # 2.0.0-rc.0
 * Log a warning when no `reflector` is provided.
 * Add `AngelEnvironment` class.
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index a4d140e2..3fc87659 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -159,29 +159,31 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
     if (_isClosed && isBuffered)
       throw ResponseContext.closed();
     else if (!isBuffered) {
-      _openStream();
+      if (!_isClosed) {
+        _openStream();
 
-      if (encoders.isNotEmpty && correspondingRequest != null) {
-        if (_allowedEncodings != null) {
-          for (var encodingName in _allowedEncodings) {
-            Converter<List<int>, List<int>> encoder;
-            String key = encodingName;
+        if (encoders.isNotEmpty && correspondingRequest != null) {
+          if (_allowedEncodings != null) {
+            for (var encodingName in _allowedEncodings) {
+              Converter<List<int>, List<int>> encoder;
+              String key = encodingName;
 
-            if (encoders.containsKey(encodingName))
-              encoder = encoders[encodingName];
-            else if (encodingName == '*') {
-              encoder = encoders[key = encoders.keys.first];
-            }
+              if (encoders.containsKey(encodingName))
+                encoder = encoders[encodingName];
+              else if (encodingName == '*') {
+                encoder = encoders[key = encoders.keys.first];
+              }
 
-            if (encoder != null) {
-              data = encoders[key].convert(data);
-              break;
+              if (encoder != null) {
+                data = encoders[key].convert(data);
+                break;
+              }
             }
           }
         }
-      }
 
-      rawResponse.add(data);
+        rawResponse.add(data);
+      }
     } else
       buffer.add(data);
   }
diff --git a/lib/src/http2/http2_response_context.dart b/lib/src/http2/http2_response_context.dart
index bc5c0e4d..99557e53 100644
--- a/lib/src/http2/http2_response_context.dart
+++ b/lib/src/http2/http2_response_context.dart
@@ -166,27 +166,29 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
     else if (!isBuffered) {
       _openStream();
 
-      if (encoders.isNotEmpty && correspondingRequest != null) {
-        if (_allowedEncodings != null) {
-          for (var encodingName in _allowedEncodings) {
-            Converter<List<int>, List<int>> encoder;
-            String key = encodingName;
+      if (!_isClosed) {
+        if (encoders.isNotEmpty && correspondingRequest != null) {
+          if (_allowedEncodings != null) {
+            for (var encodingName in _allowedEncodings) {
+              Converter<List<int>, List<int>> encoder;
+              String key = encodingName;
 
-            if (encoders.containsKey(encodingName))
-              encoder = encoders[encodingName];
-            else if (encodingName == '*') {
-              encoder = encoders[key = encoders.keys.first];
-            }
+              if (encoders.containsKey(encodingName))
+                encoder = encoders[encodingName];
+              else if (encodingName == '*') {
+                encoder = encoders[key = encoders.keys.first];
+              }
 
-            if (encoder != null) {
-              data = encoders[key].convert(data);
-              break;
+              if (encoder != null) {
+                data = encoders[key].convert(data);
+                break;
+              }
             }
           }
         }
-      }
 
-      stream.sendData(data);
+        stream.sendData(data);
+      }
     } else
       buffer.add(data);
   }

From 1ee93ab42f62dc851167b27db0d65f6df358d9b9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 11 Apr 2019 10:34:24 -0400
Subject: [PATCH 357/414] Bump to 2.0.0-rc.1

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index fc678f71..9aeb3e67 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.0
+version: 2.0.0-rc.1
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 1ba5ffd1679a06c2c89095197bca67bd9b2f5893 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 11 Apr 2019 11:54:46 -0400
Subject: [PATCH 358/414] Bump to 2.0.0-rc.2

---
 CHANGELOG.md               | 3 +++
 lib/src/core/routable.dart | 3 ++-
 lib/src/core/server.dart   | 3 ++-
 pubspec.yaml               | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 015f93cd..2cb68f3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-rc.2
+* Fixes Pub analyzer lints (see `angel_route@3.0.6`)
+
 # 2.0.0-rc.1
 * Fix logic error that allowed content to be written to streaming responses after `close` was closed.
 
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 05463d70..f98bc074 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -95,7 +95,8 @@ class Routable extends Router<RequestHandler> {
   @override
   Route<RequestHandler> addRoute(
       String method, String path, RequestHandler handler,
-      {Iterable<RequestHandler> middleware = const []}) {
+      {Iterable<RequestHandler> middleware}) {
+    middleware ??= [];
     final handlers = <RequestHandler>[];
     // Merge @Middleware declaration, if any
     Middleware middlewareDeclaration =
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 8055f6ca..f75b2787 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -150,7 +150,8 @@ class Angel extends Routable {
   @override
   Route<RequestHandler> addRoute(
       String method, String path, RequestHandler handler,
-      {Iterable<RequestHandler> middleware = const []}) {
+      {Iterable<RequestHandler> middleware}) {
+    middleware ??= [];
     if (_flattened != null) {
       logger?.warning(
           'WARNING: You added a route ($method $path) to the router, after it had been optimized.');
diff --git a/pubspec.yaml b/pubspec.yaml
index 9aeb3e67..df1bf31f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.1
+version: 2.0.0-rc.2
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 106a5683dd165d12e381b832afdc7a9720d33ed6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 11 Apr 2019 13:44:09 -0400
Subject: [PATCH 359/414] Fix MapService.modify

---
 CHANGELOG.md                  |  3 +++
 example/map_service.dart      | 22 ++++++++++++++++++++++
 lib/src/core/map_service.dart |  4 +++-
 pubspec.yaml                  |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 example/map_service.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cb68f3d..ad7599d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-rc.3
+* `MapService.modify` was not actually modifying items.
+
 # 2.0.0-rc.2
 * Fixes Pub analyzer lints (see `angel_route@3.0.6`)
 
diff --git a/example/map_service.dart b/example/map_service.dart
new file mode 100644
index 00000000..4650dd09
--- /dev/null
+++ b/example/map_service.dart
@@ -0,0 +1,22 @@
+import 'package:angel_container/mirrors.dart';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:logging/logging.dart';
+
+main() async {
+  // Logging set up/boilerplate
+  Logger.root.onRecord.listen(print);
+
+  // Create our server.
+  var app = Angel(
+    logger: Logger('angel'),
+    reflector: MirrorsReflector(),
+  );
+
+  // Create a RESTful service that manages an in-memory collection.
+  app.use('/api/todos', MapService());
+
+  var http = AngelHttp(app);
+  await http.startServer('127.0.0.1', 0);
+  print('Listening at ${http.uri}');
+}
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 511ce780..c7d64d8a 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -102,13 +102,15 @@ class MapService extends Service<String, Map<String, dynamic>> {
     if (!items.any(_matchesId(id))) return create(data, params);
 
     return read(id).then((item) {
+      var idx = items.indexOf(item);
+      if (idx < 0) return create(data, params);
       var result = new Map<String, dynamic>.from(item)..addAll(data);
 
       if (autoIdAndDateFields == true)
         result
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
               new DateTime.now().toIso8601String();
-      return new Future.value(result);
+      return new Future.value(items[idx] = result);
     });
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index df1bf31f..c655f684 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.2
+version: 2.0.0-rc.3
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 09ff68f5adeb21adf5c5e4785a1eb5a89de4b9bd Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 17 Apr 2019 11:15:46 -0400
Subject: [PATCH 360/414] 2.0.0-rc.4 (async injections)

---
 CHANGELOG.md                |  4 ++++
 lib/src/core/driver.dart    |  2 ++
 lib/src/core/injection.dart | 31 ++++++++++++++++++++-----------
 test/di_test.dart           | 29 ++++++++++++++++++++++++++++-
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad7599d6..56c07b0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-rc.4
+* Support resolution of asynchronous injections in controllers and `ioc`.
+* Inject `RequestContext` and `ResponseContext` into requests.
+
 # 2.0.0-rc.3
 * `MapService.modify` was not actually modifying items.
 
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index e49a8ab1..fdb75c39 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -122,6 +122,8 @@ abstract class Driver<
           req.params.addAll(tuple.item2);
 
           req.container
+            ..registerSingleton<RequestContext>(req)
+            ..registerSingleton<ResponseContext>(res)
             ..registerSingleton<MiddlewarePipeline>(tuple.item4)
             ..registerSingleton<MiddlewarePipeline<RequestHandler>>(line)
             ..registerSingleton<MiddlewarePipelineIterator>(it)
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index ededfb9b..9eb26d66 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -24,7 +24,7 @@ RequestHandler ioc(Function handler, {Iterable<String> optional = const []}) {
 
 resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     ResponseContext res, bool throwOnUnresolved,
-    [Container container]) {
+    [Container container]) async {
   var propFromApp;
   container ??= req?.container ?? res?.app?.container;
 
@@ -60,12 +60,19 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     if (req.params.containsKey(key) ||
         req.app.configuration.containsKey(key) ||
         _primitiveTypes.contains(type)) {
-      return resolveInjection(
+      return await resolveInjection(
           key, injection, req, res, throwOnUnresolved, container);
     } else
-      return resolveInjection(
+      return await resolveInjection(
           type, injection, req, res, throwOnUnresolved, container);
   } else if (requirement is Type && requirement != dynamic) {
+    try {
+      var futureType = container.reflector.reflectFutureOf(requirement);
+      return await container.make(futureType.reflectedType);
+    } on UnsupportedError {
+      // Ignore this; it just means that the reflector doesn't support futures.
+    }
+
     return container.make(requirement);
   } else if (throwOnUnresolved) {
     throw new ArgumentError(
@@ -86,7 +93,7 @@ bool suitableForInjection(
 /// Handles a request with a DI-enabled handler.
 RequestHandler handleContained(Function handler, InjectionRequest injection,
     [Container container]) {
-  return (RequestContext req, ResponseContext res) {
+  return (RequestContext req, ResponseContext res) async {
     if (injection.parameters.isNotEmpty &&
         injection.parameters.values.any((p) => p.match != null) &&
         !suitableForInjection(req, res, injection))
@@ -95,14 +102,16 @@ RequestHandler handleContained(Function handler, InjectionRequest injection,
     List args = [];
 
     Map<Symbol, dynamic> named = {};
-    args.addAll(injection.required
-        .map((r) => resolveInjection(r, injection, req, res, true, container)));
 
-    injection.named.forEach((k, v) {
-      var name = new Symbol(k);
-      named[name] =
-          resolveInjection([k, v], injection, req, res, false, container);
-    });
+    for (var r in injection.required) {
+      args.add(await resolveInjection(r, injection, req, res, true, container));
+    }
+
+    for (var entry in injection.named.entries) {
+      var name = new Symbol(entry.key);
+      named[name] = await resolveInjection(
+          [entry.key, entry.value], injection, req, res, false, container);
+    }
 
     return Function.apply(handler, args, named);
   };
diff --git a/test/di_test.dart b/test/di_test.dart
index 00888dc7..ea7205cb 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -1,6 +1,6 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-
 import 'package:angel_container/angel_container.dart';
 import 'package:angel_framework/http.dart';
 import 'package:angel_container/mirrors.dart';
@@ -26,12 +26,18 @@ main() {
 
     // Inject some todos
     app.container.registerSingleton(new Todo(text: TEXT, over: OVER));
+    app.container.registerFactory<Future<Foo>>((container) async {
+      var req = container.make<RequestContext>();
+      var text = await req.body.transform(utf8.decoder).join();
+      return Foo(text);
+    });
 
     app.get("/errands", ioc((Todo singleton) => singleton));
     app.get(
         "/errands3",
         ioc(({Errand singleton, Todo foo, RequestContext req}) =>
             singleton.text));
+    app.post('/async', ioc((Foo foo) => {'baz': foo.bar}));
     await app.configure(new SingletonController().configureServer);
     await app.configure(new ErrandController().configureServer);
 
@@ -82,6 +88,16 @@ main() {
     var text = await json.decode(response.body) as String;
     expect(text, equals(TEXT));
   });
+
+  test('resolve from future in controller', () async {
+    var response = await client.post('$url/errands4/async', body: 'hey');
+    expect(response.body, json.encode({'bar': 'hey'}));
+  });
+
+  test('resolve from future in route', () async {
+    var response = await client.post('$url/async', body: 'yes');
+    expect(response.body, json.encode({'baz': 'yes'}));
+  });
 }
 
 void validateTodoSingleton(response) {
@@ -103,6 +119,17 @@ class ErrandController extends Controller {
   errand(Errand errand) {
     return errand.text;
   }
+
+  @Expose('/async', method: 'POST')
+  asyncResolve(Foo foo) {
+    return {'bar': foo.bar};
+  }
+}
+
+class Foo {
+  final String bar;
+
+  Foo(this.bar);
 }
 
 class Errand {

From d834fda6cb972452ad9b7e77f9f4b93bd295bd97 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 17 Apr 2019 11:16:00 -0400
Subject: [PATCH 361/414] Bump

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index c655f684..7ef0ef86 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.3
+version: 2.0.0-rc.4
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From ef8e343ccd7ebb23b3c009b7c57f839830a82a25 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 17 Apr 2019 12:41:59 -0400
Subject: [PATCH 362/414] 2.0.0-rc.5

---
 CHANGELOG.md                       |  4 ++++
 lib/src/core/response_context.dart |  8 ++++----
 lib/src/core/server.dart           |  2 +-
 pubspec.yaml                       |  2 +-
 test/all.dart                      | 10 ++++++++--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56c07b0e..561082ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-rc.5
+* Make `serializer` `FutureOr<String> Function(Object)`.
+* Make `ResponseContext.serialize` return `Future<bool>`.
+
 # 2.0.0-rc.4
 * Support resolution of asynchronous injections in controllers and `ioc`.
 * Inject `RequestContext` and `ResponseContext` into requests.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index f4fa7f0b..67eebcba 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -71,7 +71,7 @@ abstract class ResponseContext<RawResponse>
   /// ```dart
   /// app.injectSerializer(JSON.encode);
   /// ```
-  String Function(dynamic) serializer = c.json.encode;
+  FutureOr<String> Function(dynamic) serializer = c.json.encode;
 
   /// This response's status code.
   int get statusCode => _statusCode;
@@ -295,13 +295,13 @@ abstract class ResponseContext<RawResponse>
   }
 
   /// Serializes data to the response.
-  bool serialize(value, {MediaType contentType}) {
+  Future<bool> serialize(value, {MediaType contentType}) async {
     if (!isOpen) throw closed();
     this.contentType = contentType ?? new MediaType('application', 'json');
-    var text = serializer(value);
+    var text = await serializer(value);
     if (text.isEmpty) return true;
     write(text);
-    close();
+    await close();
     return false;
   }
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index f75b2787..8d5d00d8 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -51,7 +51,7 @@ class Angel extends Routable {
   final MimeTypeResolver mimeTypeResolver = new MimeTypeResolver();
 
   /// A middleware to inject a serialize on every request.
-  String Function(dynamic) serializer;
+  FutureOr<String> Function(dynamic) serializer;
 
   /// A [Map] of dependency data obtained via reflection.
   ///
diff --git a/pubspec.yaml b/pubspec.yaml
index 7ef0ef86..e092d03b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.4
+version: 2.0.0-rc.5
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/all.dart b/test/all.dart
index 10051ce7..8a944ff6 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -1,18 +1,20 @@
 import 'dart:io';
-
 import 'package:io/ansi.dart';
-
 import 'accepts_test.dart' as accepts;
 import 'anonymous_service_test.dart' as anonymous_service;
+import 'body_test.dart' as body;
 import 'controller_test.dart' as controller;
+import 'detach_test.dart' as detach;
 import 'di_test.dart' as di;
 import 'encoders_buffer_test.dart' as encoders_buffer;
+import 'env_test.dart' as env;
 import 'exception_test.dart' as exception;
 import 'extension_test.dart' as extension;
 import 'find_one_test.dart' as find_one;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
 import 'parameter_meta_test.dart' as parameter_meta;
+import 'parse_id_test.dart' as parse_id;
 import 'precontained_test.dart' as precontained;
 import 'primitives_test.dart' as primitives;
 import 'repeat_request_test.dart' as repeat_request;
@@ -30,15 +32,19 @@ main() {
   print(cyan.wrap('Running tests on ${Platform.version}'));
   group('accepts', accepts.main);
   group('anonymous service', anonymous_service.main);
+  group('body', body.main);
   group('controller', controller.main);
+  group('detach', detach.main);
   group('di', di.main);
   group('encoders_buffer', encoders_buffer.main);
+  group('env', env.main);
   group('exception', exception.main);
   group('extension', extension.main);
   group('find_one', find_one.main);
   group('general', general.main);
   group('hooked', hooked.main);
   group('parameter_meta', parameter_meta.main);
+  group('parse_id', parse_id.main);
   group('precontained', precontained.main);
   group('primitives', primitives.main);
   group('repeat request', repeat_request.main);

From 3a9bd27d6def1833cc3093b08441dd6e7bcd09d0 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 17 Apr 2019 15:34:30 -0400
Subject: [PATCH 363/414] fix async resolutions

---
 lib/src/core/injection.dart | 7 ++++---
 pubspec.yaml                | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 9eb26d66..2e7ed073 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -68,12 +68,13 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
   } else if (requirement is Type && requirement != dynamic) {
     try {
       var futureType = container.reflector.reflectFutureOf(requirement);
-      return await container.make(futureType.reflectedType);
+      if (container.has(futureType.reflectedType))
+        return await container.make(futureType.reflectedType);
     } on UnsupportedError {
-      // Ignore this; it just means that the reflector doesn't support futures.
+      // Ignore.
     }
 
-    return container.make(requirement);
+    return await container.make(requirement);
   } else if (throwOnUnresolved) {
     throw new ArgumentError(
         '$requirement cannot be injected into a request handler.');
diff --git a/pubspec.yaml b/pubspec.yaml
index e092d03b..3ad3dc10 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ homepage: https://github.com/angel-dart/angel_framework
 environment:
   sdk: ">=2.0.0-dev <3.0.0"
 dependencies:
-  angel_container: ^1.0.0-alpha
+  angel_container: ^1.0.4
   angel_http_exception: ^1.0.0
   angel_model: ^1.0.0
   angel_route: ^3.0.0

From 1c07aa5243f7d4b5369525ad8a726223cb93412f Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 17 Apr 2019 15:42:24 -0400
Subject: [PATCH 364/414] apply pkg:pedantic lints

---
 analysis_options.yaml          |  2 --
 lib/src/http2/angel_http2.dart |  9 ++++----
 pubspec.yaml                   |  2 +-
 test/detach_test.dart          |  8 +++----
 test/di_test.dart              |  3 ++-
 test/encoders_buffer_test.dart | 11 +++++-----
 test/http2/adapter_test.dart   | 10 ++++-----
 test/http2/http2_client.dart   |  3 ++-
 test/parameter_meta_test.dart  | 38 ++++++++++++++++++++--------------
 test/precontained_test.dart    |  3 ++-
 test/primitives_test.dart      | 14 ++++++++-----
 test/server_test.dart          | 24 ++++++++++++---------
 test/streaming_test.dart       | 10 ++++++---
 13 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index b3302c76..55411a32 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -2,8 +2,6 @@ include: package:pedantic/analysis_options.yaml
 analyzer:
   strong-mode:
     implicit-casts: false
-  errors:
-    unawaited_futures: ignore
 linter:
   rules:
     - avoid_slow_async_io
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index 86e64c97..c062f0de 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:angel_framework/angel_framework.dart' hide Header;
 import 'package:http2/transport.dart';
 import 'package:mock_request/mock_request.dart';
+import 'package:pedantic/pedantic.dart';
 import 'http2_request_context.dart';
 import 'http2_response_context.dart';
 import 'package:uuid/uuid.dart';
@@ -148,7 +149,7 @@ class _FakeServerSocket extends Stream<Socket> implements ServerSocket {
 
   @override
   Future<ServerSocket> close() async {
-    _ctrl.close();
+    unawaited(_ctrl.close());
     return this;
   }
 
@@ -202,9 +203,9 @@ class _AngelHttp2ServerSocket extends Stream<SecureSocket>
   int get port => socket.port;
 
   Future<SecureServerSocket> close() async {
-    _sub?.cancel();
-    _fake.close();
-    _ctrl.close();
+    unawaited(_sub?.cancel());
+    unawaited(_fake.close());
+    unawaited(_ctrl.close());
     return await socket.close();
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 3ad3dc10..35018389 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -23,6 +23,7 @@ dependencies:
   mime: ^0.9.3
   mock_request: ^1.0.0
   path: ^1.0.0
+  pedantic: ^1.0.0
   quiver_hashcode: ^2.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0
@@ -30,5 +31,4 @@ dependencies:
 dev_dependencies:
   http: ^0.11.3
   io: ^0.3.0
-  pedantic: ^1.0.0
   test: ^1.0.0
diff --git a/test/detach_test.dart b/test/detach_test.dart
index 57f4d628..481557fa 100644
--- a/test/detach_test.dart
+++ b/test/detach_test.dart
@@ -14,9 +14,8 @@ void main() {
     app.get('/detach', (req, res) async {
       if (res is HttpResponseContext) {
         var io = await res.detach();
-        io
-          ..write('Hey!')
-          ..close();
+        io..write('Hey!');
+        await io.close();
       } else {
         throw new StateError('This endpoint only supports HTTP/1.1.');
       }
@@ -26,7 +25,8 @@ void main() {
   tearDown(() => http.close());
 
   test('detach response', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/detach'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/detach'));
+    await rq.close();
     var rs = rq.response;
     await http.handleRequest(rq);
     var body = await rs.transform(utf8.decoder).join();
diff --git a/test/di_test.dart b/test/di_test.dart
index ea7205cb..c46315b7 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -62,7 +62,8 @@ main() {
       return app.runContained((Todo t) => t.text, req, res, c);
     });
 
-    var rq = new MockHttpRequest('GET', new Uri(path: '/'))..close();
+    var rq = new MockHttpRequest('GET', new Uri(path: '/'));
+    await rq.close();
     var rs = rq.response;
     await new AngelHttp(app).handleRequest(rq);
     var text = await rs.transform(utf8.decoder).join();
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 09fa887d..07aea608 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -51,7 +51,8 @@ void encodingTests(Angel getApp()) {
     });
 
     test('sends plaintext if no accept-encoding', () async {
-      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))..close();
+      var rq = new MockHttpRequest('GET', Uri.parse('/hello'));
+      await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
@@ -61,8 +62,8 @@ void encodingTests(Angel getApp()) {
 
     test('encodes if wildcard', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set('accept-encoding', '*')
-        ..close();
+        ..headers.set('accept-encoding', '*');
+      await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
@@ -74,8 +75,8 @@ void encodingTests(Angel getApp()) {
 
     test('encodes if wildcard + multiple', () async {
       var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
-        ..headers.set('accept-encoding', ['foo', 'bar', '*'])
-        ..close();
+        ..headers.set('accept-encoding', ['foo', 'bar', '*']);
+      await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
 
diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
index ea625790..dddfa503 100644
--- a/test/http2/adapter_test.dart
+++ b/test/http2/adapter_test.dart
@@ -76,13 +76,11 @@ void main() {
       res.write('ok');
 
       if (res is Http2ResponseContext && res.canPush) {
-        res.push('a')
-          ..write('a')
-          ..close();
+        var a = res.push('a')..write('a');
+        await a.close();
 
-        res.push('b')
-          ..write('b')
-          ..close();
+        var b = res.push('b')..write('b');
+        await b.close();
       }
 
       await res.close();
diff --git a/test/http2/http2_client.dart b/test/http2/http2_client.dart
index 8a63e145..5bf3d320 100644
--- a/test/http2/http2_client.dart
+++ b/test/http2/http2_client.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:http/http.dart';
 import 'package:http2/transport.dart';
+import 'package:pedantic/pedantic.dart';
 
 /// Simple HTTP/2 client
 class Http2Client extends BaseClient {
@@ -46,7 +47,7 @@ class Http2Client extends BaseClient {
     if (body.isNotEmpty) {
       stream.sendData(body, endStream: true);
     } else {
-      stream.outgoingMessages.close();
+      unawaited(stream.outgoingMessages.close());
     }
 
     return stream;
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 6b65ca70..2c12c9e4 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -5,6 +5,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
+import 'package:pedantic/pedantic.dart';
 import 'package:test/test.dart';
 
 Future<String> readResponse(MockHttpResponse rs) {
@@ -68,19 +69,20 @@ parameterMetaTests() {
 
   test('injects header or throws', () async {
     // Invalid request
-    var rq = new MockHttpRequest('GET', Uri.parse('/header'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/header'));
+    unawaited(rq.close());
     var rs = rq.response;
-    http.handleRequest(rq);
+    unawaited(http.handleRequest(rq));
 
     await printResponse(rs);
     expect(rs.statusCode, 400);
 
     // Valid request
     rq = new MockHttpRequest('GET', Uri.parse('/header'))
-      ..headers.add('x-foo', 'bar')
-      ..close();
+      ..headers.add('x-foo', 'bar');
+    unawaited(rq.close());
     rs = rq.response;
-    await http.handleRequest(rq);
+    await unawaited(http.handleRequest(rq));
 
     var body = await readResponse(rs);
     print('Body: $body');
@@ -90,21 +92,22 @@ parameterMetaTests() {
 
   test('injects session or throws', () async {
     // Invalid request
-    var rq = new MockHttpRequest('GET', Uri.parse('/session'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/session'));
+    unawaited(rq.close());
     var rs = rq.response;
-    http
+    unawaited(http
         .handleRequest(rq)
         .timeout(const Duration(seconds: 5))
-        .catchError((_) => null);
+        .catchError((_) => null));
 
     await printResponse(rs);
     expect(rs.statusCode, 500);
 
     rq = new MockHttpRequest('GET', Uri.parse('/session'));
     rq.session['foo'] = 'bar';
-    rq.close();
+    unawaited(rq.close());
     rs = rq.response;
-    http.handleRequest(rq);
+    unawaited(http.handleRequest(rq));
 
     await printResponse(rs);
     expect(rs.statusCode, 200);
@@ -115,26 +118,29 @@ parameterMetaTests() {
   // they will all function the same way.
 
   test('pattern matching', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/match?mode=pos'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/match?mode=pos'));
+    unawaited(rq.close());
     var rs = rq.response;
-    http.handleRequest(rq);
+    unawaited(http.handleRequest(rq));
     var body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
     expect(body, json.encode('YES pos'));
 
-    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=neg'))..close();
+    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=neg'));
+    unawaited(rq.close());
     rs = rq.response;
-    http.handleRequest(rq);
+    unawaited(http.handleRequest(rq));
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
     expect(body, json.encode('NO neg'));
 
     // Fallback
-    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=ambi'))..close();
+    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=ambi'));
+    unawaited(rq.close());
     rs = rq.response;
-    http.handleRequest(rq);
+    unawaited(http.handleRequest(rq));
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index dd2e42dd..736ee372 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -4,6 +4,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
+import 'package:pedantic/pedantic.dart';
 import 'package:test/test.dart';
 
 main() {
@@ -16,7 +17,7 @@ main() {
     expect(app.preContained.keys, contains(echoAppFoo));
 
     var rq = new MockHttpRequest('GET', new Uri(path: '/foo'));
-    rq.close();
+    unawaited(rq.close());
     await new AngelHttp(app).handleRequest(rq);
     var rs = rq.response;
     var body = await rs.transform(utf8.decoder).join();
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 200fd8eb..904f88f6 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -5,6 +5,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
+import 'package:pedantic/pedantic.dart';
 import 'package:test/test.dart';
 
 main() {
@@ -38,21 +39,24 @@ main() {
   tearDown(() => app.close());
 
   test('String type annotation', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/string/hello'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/string/hello'));
+    unawaited(rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
     expect(rs, json.encode('hello'));
   });
 
   test('Primitive after parsed param injection', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/num/parsed/24'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/num/parsed/24'));
+    unawaited(rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
     expect(rs, json.encode(24));
   });
 
   test('globally-injected primitive', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/num/global'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/num/global'));
+    unawaited(rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
     expect(rs, json.encode(305));
@@ -60,8 +64,8 @@ main() {
 
   test('unparsed primitive throws error', () async {
     try {
-      var rq = new MockHttpRequest('GET', Uri.parse('/num/unparsed/32'))
-        ..close();
+      var rq = new MockHttpRequest('GET', Uri.parse('/num/unparsed/32'));
+      unawaited(rq.close());
       var req = await http.createRequestContext(rq, rq.response);
       var res = await http.createResponseContext(rq, rq.response, req);
       await app.runContained((num unparsed) => unparsed, req, res);
diff --git a/test/server_test.dart b/test/server_test.dart
index 079cf1e5..d00e9ce2 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -7,6 +7,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:matcher/matcher.dart';
 import 'package:mock_request/mock_request.dart';
+import 'package:pedantic/pedantic.dart';
 import 'package:test/test.dart';
 
 final Uri $foo = Uri.parse('http://localhost:3000/foo');
@@ -42,7 +43,7 @@ main() {
     var app = new Angel(reflector: MirrorsReflector());
     var http = new AngelHttp(app);
     var rq = new MockHttpRequest('GET', $foo);
-    rq.close();
+    unawaited(rq.close());
     var rs = rq.response;
     var req = await http.createRequestContext(rq, rs);
     var res = await http.createResponseContext(rq, rs);
@@ -94,7 +95,8 @@ main() {
       ..configuration['a'] = 'b';
     var http = new AngelHttp(app);
     app.get('/', ioc((String a) => a));
-    var rq = new MockHttpRequest('GET', Uri.parse('/'))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse('/'));
+    unawaited(rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
     expect(body, json.encode('b'));
@@ -104,7 +106,8 @@ main() {
     var app = new Angel(reflector: MirrorsReflector())..serializer = (_) => 'x';
     var http = new AngelHttp(app);
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
-    var rq = new MockHttpRequest('GET', $foo)..close();
+    var rq = new MockHttpRequest('GET', $foo);
+    unawaited(rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'x');
@@ -119,7 +122,8 @@ main() {
     ResponseContext res;
 
     setUp(() async {
-      var rq = new MockHttpRequest('GET', $foo)..close();
+      var rq = new MockHttpRequest('GET', $foo);
+      unawaited(rq.close());
       req = await http.createRequestContext(rq, rq.response);
       res = await http.createResponseContext(rq, rq.response);
     });
@@ -176,8 +180,8 @@ main() {
     test('can send json', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
         ..headers.set('accept', 'application/json');
-      rq.close();
-      http.handleRequest(rq);
+      unawaited(rq.close());
+      unawaited(http.handleRequest(rq));
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
       expect(rq.response.headers.contentType.mimeType, 'application/json');
@@ -186,8 +190,8 @@ main() {
     test('can throw in finalizer', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
         ..headers.set('accept', 'application/json');
-      rq.close();
-      http.handleRequest(rq);
+      unawaited(rq.close());
+      unawaited(http.handleRequest(rq));
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
       expect(rq.response.headers.contentType.mimeType, 'application/json');
@@ -196,8 +200,8 @@ main() {
     test('can send html', () async {
       var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
       rq.headers.set('accept', 'text/html');
-      rq.close();
-      http.handleRequest(rq);
+      unawaited(rq.close());
+      unawaited(http.handleRequest(rq));
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
       expect(rq.response.headers.contentType?.mimeType, 'text/html');
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index a7d21d15..6661b8f9 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -8,6 +8,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
+import 'package:pedantic/pedantic.dart';
 import 'package:test/test.dart';
 
 import 'encoders_buffer_test.dart' show encodingTests;
@@ -76,7 +77,8 @@ main() {
   tearDown(() => http.close());
 
   _expectHelloBye(String path) async {
-    var rq = new MockHttpRequest('GET', Uri.parse(path))..close();
+    var rq = new MockHttpRequest('GET', Uri.parse(path));
+    unawaited(rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'Hello, world!bye');
@@ -88,7 +90,8 @@ main() {
 
   test('cannot write after close', () async {
     try {
-      var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
+      var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'));
+      unawaited(rq.close());
       await http.handleRequest(rq);
       var body = await rq.response.transform(utf8.decoder).join();
 
@@ -101,7 +104,8 @@ main() {
 
   test('res => addError', () async {
     try {
-      var rq = new MockHttpRequest('GET', Uri.parse('/error'))..close();
+      var rq = new MockHttpRequest('GET', Uri.parse('/error'));
+      unawaited(rq.close());
       await http.handleRequest(rq);
       var body = await rq.response.transform(utf8.decoder).join();
       throw 'addError should throw error; response: $body';

From 20048776962bcd2dbbd859f69ba8725bc1aff467 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 19 Apr 2019 03:46:44 -0400
Subject: [PATCH 365/414] Make redirects + download async

---
 CHANGELOG.md                       |  3 +++
 lib/src/core/response_context.dart | 29 +++++++++++++++--------------
 pubspec.yaml                       |  2 +-
 test/hooked_test.dart              |  6 ++++++
 test/routing_test.dart             |  2 +-
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 561082ab..d16a8a41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-rc.6
+* Make `redirect` and `download` methods asynchronous.
+
 # 2.0.0-rc.5
 * Make `serializer` `FutureOr<String> Function(Object)`.
 * Make `ResponseContext.serialize` return `Future<bool>`.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 67eebcba..57775285 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -139,7 +139,7 @@ abstract class ResponseContext<RawResponse>
       new StateError('Cannot modify a closed response.');
 
   /// Sends a download as a response.
-  void download(File file, {String filename}) {
+  Future<void> download(File file, {String filename}) async {
     if (!isOpen) throw closed();
 
     headers["Content-Disposition"] =
@@ -148,15 +148,15 @@ abstract class ResponseContext<RawResponse>
     headers['content-length'] = file.lengthSync().toString();
 
     if (!isBuffered) {
-      file.openRead().pipe(this);
+      await file.openRead().pipe(this);
     } else {
       buffer.add(file.readAsBytesSync());
-      close();
+      await close();
     }
   }
 
   /// Prevents more data from being written to the response, and locks it entire from further editing.
-  Future close() {
+  Future<void> close() {
     if (buffer is LockableBytesBuilder) {
       (buffer as LockableBytesBuilder).lock();
     }
@@ -173,16 +173,17 @@ abstract class ResponseContext<RawResponse>
   /// Returns a JSONP response.
   ///
   /// You can override the [contentType] sent; by default it is `application/javascript`.
-  void jsonp(value, {String callbackName = "callback", MediaType contentType}) {
+  Future<void> jsonp(value,
+      {String callbackName = "callback", MediaType contentType}) {
     if (!isOpen) throw closed();
     this.contentType =
         contentType ?? new MediaType('application', 'javascript');
     write("$callbackName(${serializer(value)})");
-    close();
+    return close();
   }
 
   /// Renders a view to the response stream, and closes the response.
-  Future render(String view, [Map<String, dynamic> data]) {
+  Future<void> render(String view, [Map<String, dynamic> data]) {
     if (!isOpen) throw closed();
     contentType = new MediaType('text', 'html', {'charset': 'utf-8'});
     return Future<String>.sync(() => app.viewGenerator(
@@ -190,7 +191,7 @@ abstract class ResponseContext<RawResponse>
         new Map<String, dynamic>.from(renderParams)
           ..addAll(data ?? <String, dynamic>{}))).then((content) {
       write(content);
-      close();
+      return close();
     });
   }
 
@@ -201,7 +202,7 @@ abstract class ResponseContext<RawResponse>
   /// based on the provided params.
   ///
   /// See [Router]#navigate for more. :)
-  void redirect(url, {bool absolute = true, int code = 302}) {
+  Future<void> redirect(url, {bool absolute = true, int code = 302}) {
     if (!isOpen) throw closed();
     headers
       ..['content-type'] = 'text/html'
@@ -226,11 +227,11 @@ abstract class ResponseContext<RawResponse>
       </body>
     </html>
     ''');
-    close();
+    return close();
   }
 
   /// Redirects to the given named [Route].
-  void redirectTo(String name, [Map params, int code]) {
+  Future<void> redirectTo(String name, [Map params, int code]) async {
     if (!isOpen) throw closed();
     Route _findRoute(Router r) {
       for (Route route in r.routes) {
@@ -247,7 +248,7 @@ abstract class ResponseContext<RawResponse>
     Route matched = _findRoute(app);
 
     if (matched != null) {
-      redirect(
+      await redirect(
           matched.makeUri(params.keys.fold<Map<String, dynamic>>({}, (out, k) {
             return out..[k.toString()] = params[k];
           })),
@@ -259,7 +260,7 @@ abstract class ResponseContext<RawResponse>
   }
 
   /// Redirects to the given [Controller] action.
-  void redirectToAction(String action, [Map params, int code]) {
+  Future<void> redirectToAction(String action, [Map params, int code]) {
     if (!isOpen) throw closed();
     // UserController@show
     List<String> split = action.split("@");
@@ -291,7 +292,7 @@ abstract class ResponseContext<RawResponse>
         }))
         .replaceAll(_straySlashes, '');
 
-    redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
+    return redirect('$head/$tail'.replaceAll(_straySlashes, ''), code: code);
   }
 
   /// Serializes data to the response.
diff --git a/pubspec.yaml b/pubspec.yaml
index 35018389..d2fca7fe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.5
+version: 2.0.0-rc.6
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index a153ac29..db162309 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -99,6 +99,12 @@ main() {
     expect(result[0]["angel"], equals("framework"));
   });
 
+  test('asStream() fires', () async {
+    var stream = todoService.afterCreated.asStream();
+    await todoService.create({'angel': 'framework'});
+    expect(await stream.first.then((e) => e.result['angel']), 'framework');
+  });
+
   test('metadata', () async {
     final service = new HookedService(new IncrementService())..addHooks(app);
     expect(service.inner, isNot(const IsInstanceOf<MapService>()));
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 15424b19..fb4c0a38 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -85,7 +85,7 @@ main() {
             (RequestContext req, res) async => "Hello ${req.params['name']}")
         .name = 'Named routes';
     app.get('/named', (req, ResponseContext res) async {
-      res.redirectTo('Named routes', {'name': 'tests'});
+      await res.redirectTo('Named routes', {'name': 'tests'});
     });
     app.get('/log', (RequestContext req, res) async {
       print("Query: ${req.queryParameters}");

From 0bb19fe7bc18d6f0fb62ff06fa97e0b267027d3b Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 20 Apr 2019 12:15:09 -0400
Subject: [PATCH 366/414] Readdata for map and anon

---
 CHANGELOG.md                        | 4 ++++
 lib/src/core/anonymous_service.dart | 8 +++++---
 lib/src/core/service.dart           | 9 ++++++++-
 pubspec.yaml                        | 2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d16a8a41..b091fb68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-rc.7
+* `AnonymousService` can override `readData`.
+* `Service.map` now overrides `readData`.
+
 # 2.0.0-rc.6
 * Make `redirect` and `download` methods asynchronous.
 
diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index 2da73870..73324795 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
-
+import 'request_context.dart';
+import 'response_context.dart';
 import 'service.dart';
 
 /// An easy helper class to create one-off services without having to create an entire class.
@@ -17,8 +18,9 @@ class AnonymousService<Id, Data> extends Service<Id, Data> {
       FutureOr<Data> create(Data data, [Map<String, dynamic> params]),
       FutureOr<Data> modify(Id id, Data data, [Map<String, dynamic> params]),
       FutureOr<Data> update(Id id, Data data, [Map<String, dynamic> params]),
-      FutureOr<Data> remove(Id id, [Map<String, dynamic> params])})
-      : super() {
+      FutureOr<Data> remove(Id id, [Map<String, dynamic> params]),
+      FutureOr<Data> Function(RequestContext, ResponseContext) readData})
+      : super(readData: readData) {
     _index = index;
     _read = read;
     _create = create;
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 0fcfc5a7..8b383023 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -160,8 +160,15 @@ class Service<Id, Data> extends Routable {
   /// using two converter functions.
   ///
   /// Handy utility for handling data in a type-safe manner.
-  Service<Id, U> map<U>(U Function(Data) encoder, Data Function(U) decoder) {
+  Service<Id, U> map<U>(U Function(Data) encoder, Data Function(U) decoder,
+      {FutureOr<U> Function(RequestContext, ResponseContext) readData}) {
+    readData ??= (req, res) async {
+      var inner = await this.readData(req, res);
+      return encoder(inner);
+    };
+
     return new AnonymousService<Id, U>(
+      readData: readData,
       index: ([params]) {
         return index(params).then((it) => it.map(encoder).toList());
       },
diff --git a/pubspec.yaml b/pubspec.yaml
index d2fca7fe..7cce6681 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.6
+version: 2.0.0-rc.7
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 5e1004f7a88ddc98bf110b3e83f6b3b229f9445e Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 20 Apr 2019 12:22:52 -0400
Subject: [PATCH 367/414] 2.0.0-rc.7

---
 CHANGELOG.md                     | 1 +
 lib/src/core/hooked_service.dart | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b091fb68..a6ef7a34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 2.0.0-rc.7
 * `AnonymousService` can override `readData`.
 * `Service.map` now overrides `readData`.
+* `HookedService.readData` forwards to `inner`.
 
 # 2.0.0-rc.6
 * Make `redirect` and `download` methods asynchronous.
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 25669c8d..f2585246 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -48,6 +48,10 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
     if (inner.app != null) this.app = inner.app;
   }
 
+  @override
+  FutureOr<Data> Function(RequestContext, ResponseContext) get readData =>
+      inner.readData;
+
   RequestContext _getRequest(Map params) {
     if (params == null) return null;
     return params['__requestctx'] as RequestContext;

From 3202329490601c69051a1e85424fd3c97a639902 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 20 Apr 2019 15:04:59 -0400
Subject: [PATCH 368/414] Bump to 2.0.0-rc.8 (patch remove all)

---
 CHANGELOG.md                  |  3 +++
 lib/src/core/map_service.dart | 16 ++++++++++------
 pubspec.yaml                  |  2 +-
 test/services_test.dart       |  7 ++++++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6ef7a34..75bfc50c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0-rc.8
+* Fix `MapService` flaw where clients could remove all records, even if `allowRemoveAll` were `false`.
+
 # 2.0.0-rc.7
 * `AnonymousService` can override `readData`.
 * `Service.map` now overrides `readData`.
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index c7d64d8a..1295e61c 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -145,12 +145,16 @@ class MapService extends Service<String, Map<String, dynamic>> {
   @override
   Future<Map<String, dynamic>> remove(String id,
       [Map<String, dynamic> params]) {
-    if (id == null ||
-        id == 'null' &&
-            (allowRemoveAll == true ||
-                params?.containsKey('provider') != true)) {
-      items.clear();
-      return new Future.value({});
+    if (id == null || id == 'null') {
+      // Remove everything...
+      if (!(allowRemoveAll == true ||
+          params?.containsKey('provider') != true)) {
+        throw AngelHttpException.forbidden(
+            message: 'Clients are not allowed to delete all items.');
+      } else {
+        items.clear();
+        return new Future.value({});
+      }
     }
 
     return read(id, params).then((result) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 7cce6681..40d8b3dd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.7
+version: 2.0.0-rc.8
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/services_test.dart b/test/services_test.dart
index 8b881be3..52232a84 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -25,7 +25,7 @@ main() {
     app = new Angel(reflector: MirrorsReflector())
       ..use('/todos', service = new MapService())
       ..errorHandler = (e, req, res) {
-        print('Whoops: ${e.error}');
+        if (e.error != null) print('Whoops: ${e.error}');
         if (e.stackTrace != null) print(new Chain.forTrace(e.stackTrace).terse);
       };
 
@@ -124,5 +124,10 @@ main() {
       print(json_);
       expect(json_['text'], equals('Hello, world!'));
     });
+
+    test('cannot remove all unless explicitly set', () async {
+      var response = await client.delete('$url/todos/null');
+      expect(response.statusCode, 403);
+    });
   });
 }

From 0420046d7e501dd73231af606716474cf9c414e3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 25 Apr 2019 22:24:15 -0400
Subject: [PATCH 369/414] Fix up hooked service

---
 CHANGELOG.md                     |  4 +++
 lib/src/core/hooked_service.dart | 56 ++++++++++++++++++--------------
 pubspec.yaml                     |  2 +-
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75bfc50c..85a80a33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-rc.9
+* Fix some bugs in the `HookedService` implementation that skipped
+the outputs of `before` events.
+
 # 2.0.0-rc.8
 * Fix `MapService` flaw where clients could remove all records, even if `allowRemoveAll` were `false`.
 
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index f2585246..5a68a028 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -276,7 +276,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             params: params))
         .then((before) {
       if (before._canceled) {
-        return beforeIndexed
+        return afterIndexed
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.indexed,
                 params: params, result: before.result))
@@ -302,7 +302,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             id: id, params: params))
         .then((before) {
       if (before._canceled) {
-        return beforeRead
+        return afterRead
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.read,
                 id: id, params: params, result: before.result))
@@ -328,18 +328,18 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             data: data, params: params))
         .then((before) {
       if (before._canceled) {
-        return beforeCreated
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
-                _getResponse(_params), inner, HookedServiceEvent.created,
-                data: data, params: params, result: before.result))
-            .then((after) => after.result as Data);
-      }
-
-      return inner.create(data, params).then((result) {
         return afterCreated
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
-                data: data, params: params, result: result))
+                data: before.data, params: params, result: before.result))
+            .then((after) => after.result as Data);
+      }
+
+      return inner.create(before.data, params).then((result) {
+        return afterCreated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.created,
+                data: before.data, params: params, result: result))
             .then((after) => after.result as Data);
       });
     });
@@ -354,18 +354,21 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             id: id, data: data, params: params))
         .then((before) {
       if (before._canceled) {
-        return beforeModified
+        return afterModified
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.modified,
-                id: id, data: data, params: params, result: before.result))
+                id: id,
+                data: before.data,
+                params: params,
+                result: before.result))
             .then((after) => after.result as Data);
       }
 
-      return inner.modify(id, data, params).then((result) {
+      return inner.modify(id, before.data, params).then((result) {
         return afterModified
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
-                id: id, data: data, params: params, result: result))
+                id: id, data: before.data, params: params, result: result))
             .then((after) => after.result as Data);
       });
     });
@@ -380,18 +383,21 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             id: id, data: data, params: params))
         .then((before) {
       if (before._canceled) {
-        return beforeUpdated
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
-                _getResponse(_params), inner, HookedServiceEvent.updated,
-                id: id, data: data, params: params, result: before.result))
-            .then((after) => after.result as Data);
-      }
-
-      return inner.update(id, data, params).then((result) {
         return afterUpdated
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.updated,
-                id: id, data: data, params: params, result: result))
+                id: id,
+                data: before.data,
+                params: params,
+                result: before.result))
+            .then((after) => after.result as Data);
+      }
+
+      return inner.update(id, before.data, params).then((result) {
+        return afterUpdated
+            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+                _getResponse(_params), inner, HookedServiceEvent.updated,
+                id: id, data: before.data, params: params, result: result))
             .then((after) => after.result as Data);
       });
     });
@@ -406,7 +412,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
             id: id, params: params))
         .then((before) {
       if (before._canceled) {
-        return beforeRemoved
+        return afterRemoved
             ._emit(new HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.removed,
                 id: id, params: params, result: before.result))
diff --git a/pubspec.yaml b/pubspec.yaml
index 40d8b3dd..dc609baf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.8
+version: 2.0.0-rc.9
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From e692f27972b237fa24c22d147c05076d1b3c6702 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sun, 28 Apr 2019 13:44:47 -0400
Subject: [PATCH 370/414] 2.0.0-rc.10

---
 CHANGELOG.md                   | 4 ++++
 lib/src/http/http.dart         | 2 +-
 lib/src/http2/angel_http2.dart | 9 ++++++++-
 pubspec.yaml                   | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a80a33..739dacb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.0-rc.10
+* Fix an error that prevented `AngelHttp2.custom` from working properly.
+* Add `startSharedHttp2`.
+
 # 2.0.0-rc.9
 * Fix some bugs in the `HookedService` implementation that skipped
 the outputs of `before` events.
diff --git a/lib/src/http/http.dart b/lib/src/http/http.dart
index 3784acb8..44ab4cdb 100644
--- a/lib/src/http/http.dart
+++ b/lib/src/http/http.dart
@@ -7,7 +7,7 @@ export 'angel_http.dart';
 export 'http_request_context.dart';
 export 'http_response_context.dart';
 
-/// Boots a shared server instance. Use this if launching multiple isolates
+/// Boots a shared server instance. Use this if launching multiple isolates.
 Future<HttpServer> startShared(address, int port) =>
     HttpServer.bind(address ?? '127.0.0.1', port ?? 0, shared: true);
 
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index c062f0de..06e5875b 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -9,6 +9,13 @@ import 'http2_request_context.dart';
 import 'http2_response_context.dart';
 import 'package:uuid/uuid.dart';
 
+/// Boots a shared server instance. Use this if launching multiple isolates.
+Future<SecureServerSocket> startSharedHttp2(
+    address, int port, SecurityContext ctx) {
+  return SecureServerSocket.bind(address, port, ctx, shared: true);
+}
+
+/// Adapts `package:http2`'s [ServerTransportConnection] to serve Angel.
 class AngelHttp2 extends Driver<Socket, ServerTransportStream,
     SecureServerSocket, Http2RequestContext, Http2ResponseContext> {
   final ServerSettings settings;
@@ -47,7 +54,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
       var addr = address is InternetAddress
           ? address
           : new InternetAddress(address.toString());
-      return SecureServerSocket.bind(addr, port, ctx);
+      return Future.sync(() => serverGenerator(addr, port, ctx));
     }, useZone, settings);
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index dc609baf..5135371c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.9
+version: 2.0.0-rc.10
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 5b67f3a240d14b667ed4a2717eb7fa1588bb5bb3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 29 Apr 2019 00:18:31 -0400
Subject: [PATCH 371/414] Bump to 2.0.0

---
 CHANGELOG.md | 3 +++
 pubspec.yaml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 739dacb5..ad5a71a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.0
+* Angel 2! :angel: :rocket:
+
 # 2.0.0-rc.10
 * Fix an error that prevented `AngelHttp2.custom` from working properly.
 * Add `startSharedHttp2`.
diff --git a/pubspec.yaml b/pubspec.yaml
index 5135371c..129e1a39 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0-rc.10
+version: 2.0.0
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 23bc65e257a251bbdfd14442f6dfda47db3dead3 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 29 Apr 2019 00:19:07 -0400
Subject: [PATCH 372/414] Update homepage link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9c4cec80..016e8fd5 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 A high-powered HTTP server with support for dependency injection, sophisticated routing and more.
 
 This is the core of the [Angel](https://github.com/angel-dart/angel) framework.
-To build real-world applications, please see the [homepage](https://angel-dart.github.io).
+To build real-world applications, please see the [homepage](https://angel-dart.dev).
 
 ```dart
 import 'package:angel_container/mirrors.dart';

From 28b6f84051693d449ab31a39273ea189847caaf5 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 2 May 2019 18:37:32 -0400
Subject: [PATCH 373/414] Fix 404 hole

---
 CHANGELOG.md             |  4 +++
 lib/src/core/driver.dart |  8 +++--
 pubspec.yaml             |  2 +-
 test/404_hole_test.dart  | 78 ++++++++++++++++++++++++++++++++++++++++
 test/pretty_log.dart     | 36 +++++++++++++++++++
 5 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 test/404_hole_test.dart
 create mode 100644 test/pretty_log.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad5a71a8..7801bfa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.1
+* Tracked down a bug in `Driver.runPipeline` that allowed fallback
+handlers to run, even after the response was closed.
+
 # 2.0.0
 * Angel 2! :angel: :rocket:
 
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index fdb75c39..2be90faa 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -354,12 +354,16 @@ abstract class Driver<
       RequestContextType req,
       ResponseContextType res,
       Angel app) async {
+    var broken = false;
     while (it.moveNext()) {
       var current = it.current.handlers.iterator;
 
-      while (current.moveNext()) {
+      while (!broken && current.moveNext()) {
         var result = await app.executeHandler(current.current, req, res);
-        if (result != true) break;
+        if (result != true) {
+          broken = true;
+          break;
+        }
       }
     }
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 129e1a39..76da324c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,6 +29,6 @@ dependencies:
   tuple: ^1.0.0
   uuid: ^2.0.0-rc.1
 dev_dependencies:
-  http: ^0.11.3
+  http: ^0.12.0
   io: ^0.3.0
   test: ^1.0.0
diff --git a/test/404_hole_test.dart b/test/404_hole_test.dart
new file mode 100644
index 00000000..c0b04a59
--- /dev/null
+++ b/test/404_hole_test.dart
@@ -0,0 +1,78 @@
+import 'dart:async';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:charcode/ascii.dart';
+import 'package:http/io_client.dart' as http;
+import 'package:logging/logging.dart';
+import 'package:test/test.dart';
+import 'pretty_log.dart';
+
+void main() {
+  http.IOClient client;
+  AngelHttp driver;
+  Logger logger;
+
+  setUp(() async {
+    client = http.IOClient();
+    hierarchicalLoggingEnabled = true;
+
+    logger = Logger.detached('404_hole')
+      ..level = Level.ALL
+      ..onRecord.listen(prettyLog);
+
+    var app = Angel(logger: logger);
+
+    app.fallback(hello);
+    app.fallback(throw404);
+
+    // The error handler in the boilerplate.
+    var oldErrorHandler = app.errorHandler;
+    app.errorHandler = (e, req, res) async {
+      if (req.accepts('text/html', strict: true)) {
+        if (e.statusCode == 404 && req.accepts('text/html', strict: true)) {
+          await res
+              .render('error', {'message': 'No file exists at ${req.uri}.'});
+        } else {
+          await res.render('error', {'message': e.message});
+        }
+      } else {
+        return await oldErrorHandler(e, req, res);
+      }
+    };
+
+    driver = AngelHttp(app);
+    await driver.startServer();
+  });
+
+  tearDown(() {
+    logger.clearListeners();
+    client.close();
+    scheduleMicrotask(driver.close);
+  });
+
+  test('does not continue processing after streaming', () async {
+    var url = driver.uri.replace(path: '/hey');
+    for (int i = 0; i < 100; i++) {
+      var r = await client.get(url);
+      print('#$i: ${r.statusCode}: ${r.body}');
+      expect(r.statusCode, 200);
+      expect(r.body, 'Hello!');
+    }
+  });
+}
+
+/// Simulate angel_static
+Future<void> hello(RequestContext req, ResponseContext res) {
+  if (req.path == 'hey') {
+    var bytes = [$H, $e, $l, $l, $o, $exclamation];
+    var s = Stream<List<int>>.fromIterable([bytes]);
+    return s.pipe(res);
+  } else {
+    return Future.value(true);
+  }
+}
+
+/// 404
+void throw404(RequestContext req, ResponseContext res) {
+  throw AngelHttpException.notFound();
+}
diff --git a/test/pretty_log.dart b/test/pretty_log.dart
new file mode 100644
index 00000000..9c03c110
--- /dev/null
+++ b/test/pretty_log.dart
@@ -0,0 +1,36 @@
+import 'package:logging/logging.dart';
+import 'package:io/ansi.dart';
+
+/// Prints the contents of a [LogRecord] with pretty colors.
+void prettyLog(LogRecord record) {
+  var code = chooseLogColor(record.level);
+
+  if (record.error == null) print(code.wrap(record.toString()));
+
+  if (record.error != null) {
+    var err = record.error;
+    print(code.wrap(record.toString() + '\n'));
+    print(code.wrap(err.toString()));
+
+    if (record.stackTrace != null) {
+      print(code.wrap(record.stackTrace.toString()));
+    }
+  }
+}
+
+/// Chooses a color based on the logger [level].
+AnsiCode chooseLogColor(Level level) {
+  if (level == Level.SHOUT)
+    return backgroundRed;
+  else if (level == Level.SEVERE)
+    return red;
+  else if (level == Level.WARNING)
+    return yellow;
+  else if (level == Level.INFO)
+    return cyan;
+  else if (level == Level.CONFIG ||
+      level == Level.FINE ||
+      level == Level.FINER ||
+      level == Level.FINEST) return lightGray;
+  return resetAll;
+}

From 1ed6736257429aafc215f633197367d472213b5c Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 2 May 2019 18:46:07 -0400
Subject: [PATCH 374/414] Call `RequestContext.close` in `Driver.sendResponse`.

---
 CHANGELOG.md                      |  4 ++++
 lib/src/core/driver.dart          |  7 +++++--
 lib/src/core/request_context.dart | 23 ++++++++++++++++-------
 lib/src/core/server.dart          |  2 +-
 test/all.dart                     |  2 ++
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7801bfa7..cbd058d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # 2.0.1
 * Tracked down a bug in `Driver.runPipeline` that allowed fallback
 handlers to run, even after the response was closed.
+* Add `RequestContext.shutdownHooks`.
+* Call `RequestContext.close` in `Driver.sendResponse`.
+* AngelConfigurer is now `FutureOr<void>`, instead of just `FutureOr`.
+* Use a `Container.has<Stopwatch>` check in `Driver.sendResponse`.
 
 # 2.0.0
 * Angel 2! :angel: :rocket:
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index 2be90faa..ecc6fce1 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -280,12 +280,15 @@ abstract class Driver<
   Future sendResponse(Request request, Response response, RequestContext req,
       ResponseContext res,
       {bool ignoreFinalizers = false}) {
-    void _cleanup(_) {
-      if (!app.environment.isProduction && app.logger != null) {
+    Future<void> _cleanup(_) {
+      if (!app.environment.isProduction &&
+          app.logger != null &&
+          req.container.has<Stopwatch>()) {
         var sw = req.container.make<Stopwatch>();
         app.logger.info(
             "${res.statusCode} ${req.method} ${req.uri} (${sw?.elapsedMilliseconds ?? 'unknown'} ms)");
       }
+      return req.close();
     }
 
     if (!res.isBuffered) return res.close().then(_cleanup);
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 0e1853e0..db823fe8 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -14,6 +14,7 @@ import 'dart:io'
 import 'package:angel_container/angel_container.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:http_server/http_server.dart';
+import 'package:meta/meta.dart';
 import 'package:mime/mime.dart';
 import 'package:path/path.dart' as p;
 
@@ -26,8 +27,12 @@ part 'injection.dart';
 
 /// A convenience wrapper around an incoming [RawRequest].
 abstract class RequestContext<RawRequest> {
+  /// Similar to [Angel.shutdownHooks], allows for logic to be executed
+  /// when a [RequestContext] is done being processed.
+  final List<FutureOr<void> Function()> shutdownHooks = [];
+
   String _acceptHeaderCache, _extensionCache;
-  bool _acceptsAllCache, _hasParsedBody = false;
+  bool _acceptsAllCache, _hasParsedBody = false, _closed = false;
   Map<String, dynamic> _bodyFields, _queryParameters;
   List _bodyList;
   Object _bodyObject;
@@ -271,12 +276,16 @@ abstract class RequestContext<RawRequest> {
   }
 
   /// Disposes of all resources.
-  Future close() {
-    _acceptsAllCache = null;
-    _acceptHeaderCache = null;
-    serviceParams.clear();
-    params.clear();
-    return new Future.value();
+  @mustCallSuper
+  Future<void> close() async {
+    if (!_closed) {
+      _closed = true;
+      _acceptsAllCache = null;
+      _acceptHeaderCache = null;
+      serviceParams.clear();
+      params.clear();
+      await Future.forEach(shutdownHooks, (hook) => hook());
+    }
   }
 }
 
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 8d5d00d8..82758ead 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -22,7 +22,7 @@ import 'service.dart';
 //final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
 
 /// A function that configures an [Angel] server in some way.
-typedef FutureOr AngelConfigurer(Angel app);
+typedef FutureOr<void> AngelConfigurer(Angel app);
 
 /// A function that asynchronously generates a view from the given path and data.
 typedef FutureOr<String> ViewGenerator(String path,
diff --git a/test/all.dart b/test/all.dart
index 8a944ff6..54196b46 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 import 'package:io/ansi.dart';
+import '404_hole_test.dart' as hole404;
 import 'accepts_test.dart' as accepts;
 import 'anonymous_service_test.dart' as anonymous_service;
 import 'body_test.dart' as body;
@@ -30,6 +31,7 @@ import 'package:test/test.dart';
 /// For running with coverage
 main() {
   print(cyan.wrap('Running tests on ${Platform.version}'));
+  group('404_hole', hole404.main);
   group('accepts', accepts.main);
   group('anonymous service', anonymous_service.main);
   group('body', body.main);

From e57de0bd04153b02a769d71a6285a76723bea502 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 2 May 2019 18:48:31 -0400
Subject: [PATCH 375/414] unnecessary new/const removal

---
 CHANGELOG.md                              |  3 +-
 README.md                                 |  6 +-
 analysis_options.yaml                     |  2 +
 example/handle_error.dart                 |  8 +-
 example/http2/body_parsing.dart           | 12 +--
 example/http2/main.dart                   | 12 +--
 example/http2/server_push.dart            | 12 +--
 example/json.dart                         |  8 +-
 example/status.dart                       |  4 +-
 example/view.dart                         |  4 +-
 lib/src/core/anonymous_service.dart       | 14 ++--
 lib/src/core/controller.dart              |  7 +-
 lib/src/core/driver.dart                  | 35 ++++-----
 lib/src/core/env.dart                     |  2 +-
 lib/src/core/hooked_service.dart          | 94 +++++++++++------------
 lib/src/core/injection.dart               | 13 ++--
 lib/src/core/map_service.dart             | 38 ++++-----
 lib/src/core/metadata.dart                |  9 +--
 lib/src/core/request_context.dart         | 28 +++----
 lib/src/core/response_context.dart        | 41 +++++-----
 lib/src/core/routable.dart                | 19 ++---
 lib/src/core/server.dart                  | 20 ++---
 lib/src/core/service.dart                 | 24 +++---
 lib/src/http/angel_http.dart              | 21 +++--
 lib/src/http/http_request_context.dart    |  8 +-
 lib/src/http/http_response_context.dart   |  6 +-
 lib/src/http2/angel_http2.dart            | 36 ++++-----
 lib/src/http2/http2_request_context.dart  | 20 ++---
 lib/src/http2/http2_response_context.dart | 24 +++---
 lib/src/safe_stream_controller.dart       |  8 +-
 lib/src/util.dart                         |  2 +-
 performance/hello/main.dart               |  4 +-
 test/accepts_test.dart                    |  6 +-
 test/anonymous_service_test.dart          |  8 +-
 test/common.dart                          |  4 +-
 test/controller_test.dart                 | 28 +++----
 test/detach_test.dart                     |  8 +-
 test/di_test.dart                         | 22 +++---
 test/encoders_buffer_test.dart            | 16 ++--
 test/exception_test.dart                  | 41 +++++-----
 test/extension_test.dart                  |  6 +-
 test/find_one_test.dart                   |  6 +-
 test/general_test.dart                    |  8 +-
 test/hm.dart                              |  2 +-
 test/hooked_test.dart                     | 14 ++--
 test/http2/adapter_test.dart              | 38 +++++----
 test/http2/http2_client.dart              | 24 +++---
 test/parameter_meta_test.dart             | 20 ++---
 test/precontained_test.dart               |  6 +-
 test/primitives_test.dart                 | 14 ++--
 test/repeat_request_test.dart             |  6 +-
 test/routing_test.dart                    | 14 ++--
 test/serialize_test.dart                  |  8 +-
 test/server_test.dart                     | 68 ++++++++--------
 test/service_map_test.dart                | 14 ++--
 test/services_test.dart                   | 10 +--
 test/streaming_test.dart                  | 27 ++++---
 test/view_generator_test.dart             |  2 +-
 58 files changed, 473 insertions(+), 491 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbd058d3..7b35bedc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ handlers to run, even after the response was closed.
 * Call `RequestContext.close` in `Driver.sendResponse`.
 * AngelConfigurer is now `FutureOr<void>`, instead of just `FutureOr`.
 * Use a `Container.has<Stopwatch>` check in `Driver.sendResponse`.
+* Remove unnecessary `new` and `const`.
 
 # 2.0.0
 * Angel 2! :angel: :rocket:
@@ -124,7 +125,7 @@ stable, there'll be a conversion, perhaps.
 
 - All calls to `Service.parseId` are now affixed with the `<Id>` argument.
 - Added `uri` getter to `AngelHttp`.
-- The default for `parseQuery` now wraps query parameters in `new Map<String, dynamic>.from`.
+- The default for `parseQuery` now wraps query parameters in `Map<String, dynamic>.from`.
   This resolves a bug in `package:angel_validate`.
 
 # 2.0.0-alpha.9
diff --git a/README.md b/README.md
index 016e8fd5..7aecfc36 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 
 main() async {
-    var app = new Angel(reflector: MirrorsReflector());
+    var app = Angel(reflector: MirrorsReflector());
 
     // Index route. Returns JSON.
     app.get('/', (req, res) => res.write('Welcome to Angel!'));
@@ -43,12 +43,12 @@ main() async {
     
     // Simple fallback to throw a 404 on unknown paths.
     app.fallback((req, res) {
-      throw new AngelHttpException.notFound(
+      throw AngelHttpException.notFound(
         message: 'Unknown path: "${req.uri.path}"',
       );
     });
 
-    var http = new AngelHttp(app);
+    var http = AngelHttp(app);
     var server = await http.startServer('127.0.0.1', 3000);
     var url = 'http://${server.address.address}:${server.port}';
     print('Listening at $url');
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 55411a32..fa8474b6 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -5,3 +5,5 @@ analyzer:
 linter:
   rules:
     - avoid_slow_async_io
+    - unnecessary_const
+    - unnecessary_new
\ No newline at end of file
diff --git a/example/handle_error.dart b/example/handle_error.dart
index ea058457..e159a3ce 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -6,8 +6,8 @@ import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
 
 main() async {
-  var app = new Angel(reflector: MirrorsReflector())
-    ..logger = (new Logger('angel')
+  var app = Angel(reflector: MirrorsReflector())
+    ..logger = (Logger('angel')
       ..onRecord.listen((rec) {
         print(rec);
         if (rec.error != null) print(rec.error);
@@ -16,9 +16,9 @@ main() async {
     ..encoders.addAll({'gzip': gzip.encoder});
 
   app.fallback(
-      (req, res) => new Future.error('Throwing just because I feel like!'));
+      (req, res) => Future.error('Throwing just because I feel like!'));
 
-  var http = new AngelHttp(app);
+  var http = AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
   var url = 'http://${server.address.address}:${server.port}';
   print('Listening at $url');
diff --git a/example/http2/body_parsing.dart b/example/http2/body_parsing.dart
index 2cb8110b..a0c27a9c 100644
--- a/example/http2/body_parsing.dart
+++ b/example/http2/body_parsing.dart
@@ -6,15 +6,15 @@ import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 
 main() async {
-  var app = new Angel();
-  app.logger = new Logger('angel')
+  var app = Angel();
+  app.logger = Logger('angel')
     ..onRecord.listen((rec) {
       print(rec);
       if (rec.error != null) print(rec.error);
       if (rec.stackTrace != null) print(rec.stackTrace);
     });
 
-  var publicDir = new Directory('example/public');
+  var publicDir = Directory('example/public');
   var indexHtml =
       const LocalFileSystem().file(publicDir.uri.resolve('body_parsing.html'));
 
@@ -22,7 +22,7 @@ main() async {
 
   app.post('/', (req, res) => req.parseBody().then((_) => req.bodyAsMap));
 
-  var ctx = new SecurityContext()
+  var ctx = SecurityContext()
     ..useCertificateChain('dev.pem')
     ..usePrivateKey('dev.key', password: 'dartdart');
 
@@ -35,8 +35,8 @@ main() async {
         st);
   }
 
-  var http1 = new AngelHttp(app);
-  var http2 = new AngelHttp2(app, ctx);
+  var http1 = AngelHttp(app);
+  var http2 = AngelHttp2(app, ctx);
 
   // HTTP/1.x requests will fallback to `AngelHttp`
   http2.onHttp1.listen(http1.handleRequest);
diff --git a/example/http2/main.dart b/example/http2/main.dart
index f2a7be38..d8218ae2 100644
--- a/example/http2/main.dart
+++ b/example/http2/main.dart
@@ -6,19 +6,19 @@ import 'package:logging/logging.dart';
 import 'common.dart';
 
 main() async {
-  var app = new Angel()
+  var app = Angel()
     ..encoders.addAll({
       'gzip': gzip.encoder,
       'deflate': zlib.encoder,
     });
-  app.logger = new Logger('angel')..onRecord.listen(dumpError);
+  app.logger = Logger('angel')..onRecord.listen(dumpError);
 
   app.get('/', (req, res) => 'Hello HTTP/2!!!');
 
-  app.fallback((req, res) => throw new AngelHttpException.notFound(
+  app.fallback((req, res) => throw AngelHttpException.notFound(
       message: 'No file exists at ${req.uri}'));
 
-  var ctx = new SecurityContext()
+  var ctx = SecurityContext()
     ..useCertificateChain('dev.pem')
     ..usePrivateKey('dev.key', password: 'dartdart');
 
@@ -32,8 +32,8 @@ main() async {
     );
   }
 
-  var http1 = new AngelHttp(app);
-  var http2 = new AngelHttp2(app, ctx);
+  var http1 = AngelHttp(app);
+  var http2 = AngelHttp2(app, ctx);
 
   // HTTP/1.x requests will fallback to `AngelHttp`
   http2.onHttp1.listen(http1.handleRequest);
diff --git a/example/http2/server_push.dart b/example/http2/server_push.dart
index 0c99420b..41a1170f 100644
--- a/example/http2/server_push.dart
+++ b/example/http2/server_push.dart
@@ -6,15 +6,15 @@ import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 
 main() async {
-  var app = new Angel();
-  app.logger = new Logger('angel')
+  var app = Angel();
+  app.logger = Logger('angel')
     ..onRecord.listen((rec) {
       print(rec);
       if (rec.error != null) print(rec.error);
       if (rec.stackTrace != null) print(rec.stackTrace);
     });
 
-  var publicDir = new Directory('example/http2/public');
+  var publicDir = Directory('example/http2/public');
   var indexHtml =
       const LocalFileSystem().file(publicDir.uri.resolve('index.html'));
   var styleCss =
@@ -38,7 +38,7 @@ main() async {
     }
   });
 
-  var ctx = new SecurityContext()
+  var ctx = SecurityContext()
     ..useCertificateChain('dev.pem')
     ..usePrivateKey('dev.key', password: 'dartdart');
 
@@ -51,8 +51,8 @@ main() async {
         st);
   }
 
-  var http1 = new AngelHttp(app);
-  var http2 = new AngelHttp2(app, ctx);
+  var http1 = AngelHttp(app);
+  var http2 = AngelHttp2(app, ctx);
 
   // HTTP/1.x requests will fallback to `AngelHttp`
   http2.onHttp1.listen(http1.handleRequest);
diff --git a/example/json.dart b/example/json.dart
index 23dac1a2..f71a48dc 100644
--- a/example/json.dart
+++ b/example/json.dart
@@ -6,8 +6,8 @@ import 'package:angel_framework/http.dart';
 
 main() async {
   int x = 0;
-  var c = new Completer();
-  var exit = new ReceivePort();
+  var c = Completer();
+  var exit = ReceivePort();
   List<Isolate> isolates = [];
 
   exit.listen((_) {
@@ -31,9 +31,9 @@ main() async {
 }
 
 serverMain(_) async {
-  var app = new Angel();
+  var app = Angel();
   var http =
-      new AngelHttp.custom(app, startShared, useZone: false); // Run a cluster
+      AngelHttp.custom(app, startShared, useZone: false); // Run a cluster
 
   app.get('/', (req, res) {
     return res.serialize({
diff --git a/example/status.dart b/example/status.dart
index fb15fd4e..a434dd90 100644
--- a/example/status.dart
+++ b/example/status.dart
@@ -2,8 +2,8 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 
 main() async {
-  var app = new Angel();
-  var http = new AngelHttp(app);
+  var app = Angel();
+  var http = AngelHttp(app);
 
   app.fallback((req, res) {
     res.statusCode = 304;
diff --git a/example/view.dart b/example/view.dart
index 570d4a32..c90fd3cd 100644
--- a/example/view.dart
+++ b/example/view.dart
@@ -3,7 +3,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 
 main() async {
-  var app = new Angel(reflector: MirrorsReflector());
+  var app = Angel(reflector: MirrorsReflector());
 
   app.viewGenerator = (name, [data]) async =>
       'View generator invoked with name $name and data: $data';
@@ -11,7 +11,7 @@ main() async {
   // Index route. Returns JSON.
   app.get('/', (req, res) => res.render('index', {'foo': 'bar'}));
 
-  var http = new AngelHttp(app);
+  var http = AngelHttp(app);
   var server = await http.startServer('127.0.0.1', 3000);
   var url = 'http://${server.address.address}:${server.port}';
   print('Listening at $url');
diff --git a/lib/src/core/anonymous_service.dart b/lib/src/core/anonymous_service.dart
index 73324795..f4d86f72 100644
--- a/lib/src/core/anonymous_service.dart
+++ b/lib/src/core/anonymous_service.dart
@@ -30,30 +30,30 @@ class AnonymousService<Id, Data> extends Service<Id, Data> {
   }
 
   @override
-  index([Map<String, dynamic> params]) => new Future.sync(
-      () => _index != null ? _index(params) : super.index(params));
+  index([Map<String, dynamic> params]) =>
+      Future.sync(() => _index != null ? _index(params) : super.index(params));
 
   @override
-  read(Id id, [Map<String, dynamic> params]) => new Future.sync(
+  read(Id id, [Map<String, dynamic> params]) => Future.sync(
       () => _read != null ? _read(id, params) : super.read(id, params));
 
   @override
-  create(Data data, [Map<String, dynamic> params]) => new Future.sync(() =>
+  create(Data data, [Map<String, dynamic> params]) => Future.sync(() =>
       _create != null ? _create(data, params) : super.create(data, params));
 
   @override
   modify(Id id, Data data, [Map<String, dynamic> params]) =>
-      new Future.sync(() => _modify != null
+      Future.sync(() => _modify != null
           ? _modify(id, data, params)
           : super.modify(id, data, params));
 
   @override
   update(Id id, Data data, [Map<String, dynamic> params]) =>
-      new Future.sync(() => _update != null
+      Future.sync(() => _update != null
           ? _update(id, data, params)
           : super.update(id, data, params));
 
   @override
-  remove(Id id, [Map<String, dynamic> params]) => new Future.sync(
+  remove(Id id, [Map<String, dynamic> params]) => Future.sync(
       () => _remove != null ? _remove(id, params) : super.remove(id, params));
 }
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 01ba1713..738ec014 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -40,11 +40,10 @@ class Controller {
     Expose exposeDecl = findExpose(app.container.reflector);
 
     if (exposeDecl == null) {
-      throw new Exception(
-          "All controllers must carry an @Expose() declaration.");
+      throw Exception("All controllers must carry an @Expose() declaration.");
     }
 
-    var routable = new Routable();
+    var routable = Routable();
     app.mount(exposeDecl.path, routable);
     var typeMirror = app.container.reflector.reflectType(this.runtimeType);
     String name =
@@ -60,7 +59,7 @@ class Controller {
     final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
     classMirror.declarations.forEach(routeBuilder);
     configureRoutes(routable);
-    return new Future.value();
+    return Future.value();
   }
 
   void Function(ReflectedDeclaration) _routeBuilder(
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index ecc6fce1..c78faa33 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -57,7 +57,7 @@ abstract class Driver<
 
   /// Shuts down the underlying server.
   Future<Server> close() {
-    if (_closed) return new Future.value(_server);
+    if (_closed) return Future.value(_server);
     _closed = true;
     _sub?.cancel();
     return app.close().then((_) =>
@@ -102,8 +102,8 @@ abstract class Driver<
             var r = app.optimizedRouter;
             var resolved =
                 r.resolveAbsolute(path, method: req.method, strip: false);
-            var pipeline = new MiddlewarePipeline<RequestHandler>(resolved);
-            return new Tuple4(
+            var pipeline = MiddlewarePipeline<RequestHandler>(resolved);
+            return Tuple4(
               pipeline.handlers,
               resolved.fold<Map<String, dynamic>>(
                   <String, dynamic>{}, (out, r) => out..addAll(r.allParams)),
@@ -132,8 +132,7 @@ abstract class Driver<
             ..registerSingleton<ParseResult>(tuple.item3);
 
           if (!app.environment.isProduction && app.logger != null) {
-            req.container
-                .registerSingleton<Stopwatch>(new Stopwatch()..start());
+            req.container.registerSingleton<Stopwatch>(Stopwatch()..start());
           }
 
           return runPipeline(it, req, res, app)
@@ -151,9 +150,9 @@ abstract class Driver<
 
           return f.catchError((e, StackTrace st) {
             if (e is FormatException)
-              throw new AngelHttpException.badRequest(message: e.message)
+              throw AngelHttpException.badRequest(message: e.message)
                 ..stackTrace = st;
-            throw new AngelHttpException(e,
+            throw AngelHttpException(e,
                 stackTrace: st,
                 statusCode: 500,
                 message: e?.toString() ?? '500 Internal Server Error');
@@ -163,8 +162,7 @@ abstract class Driver<
 
             if (app.logger != null) {
               var error = e.error ?? e;
-              var trace =
-                  new Trace.from(e.stackTrace ?? StackTrace.current).terse;
+              var trace = Trace.from(e.stackTrace ?? StackTrace.current).terse;
               app.logger.severe(e.message ?? e.toString(), error, trace);
             }
 
@@ -172,7 +170,7 @@ abstract class Driver<
                 e, e.stackTrace ?? st, req, res, request, response);
           });
         } else {
-          var zoneSpec = new ZoneSpecification(
+          var zoneSpec = ZoneSpecification(
             print: (self, parent, zone, line) {
               if (app.logger != null)
                 app.logger.info(line);
@@ -180,18 +178,17 @@ abstract class Driver<
                 parent.print(zone, line);
             },
             handleUncaughtError: (self, parent, zone, error, stackTrace) {
-              var trace =
-                  new Trace.from(stackTrace ?? StackTrace.current).terse;
+              var trace = Trace.from(stackTrace ?? StackTrace.current).terse;
 
-              return new Future(() {
+              return Future(() {
                 AngelHttpException e;
 
                 if (error is FormatException) {
-                  e = new AngelHttpException.badRequest(message: error.message);
+                  e = AngelHttpException.badRequest(message: error.message);
                 } else if (error is AngelHttpException) {
                   e = error;
                 } else {
-                  e = new AngelHttpException(error,
+                  e = AngelHttpException(error,
                       stackTrace: stackTrace,
                       message:
                           error?.toString() ?? '500 Internal Server Error');
@@ -204,7 +201,7 @@ abstract class Driver<
                 return handleAngelHttpException(
                     e, trace, req, res, request, response);
               }).catchError((e, StackTrace st) {
-                var trace = new Trace.from(st ?? StackTrace.current).terse;
+                var trace = Trace.from(st ?? StackTrace.current).terse;
                 closeResponse(response);
                 // Ideally, we won't be in a position where an absolutely fatal error occurs,
                 // but if so, we'll need to log it.
@@ -263,11 +260,11 @@ abstract class Driver<
     Future handleError;
 
     if (!res.isOpen)
-      handleError = new Future.value();
+      handleError = Future.value();
     else {
       res.statusCode = e.statusCode;
       handleError =
-          new Future.sync(() => app.errorHandler(e, req, res)).then((result) {
+          Future.sync(() => app.errorHandler(e, req, res)).then((result) {
         return app.executeHandler(result, req, res).then((_) => res.close());
       });
     }
@@ -294,7 +291,7 @@ abstract class Driver<
     if (!res.isBuffered) return res.close().then(_cleanup);
 
     Future finalizers = ignoreFinalizers == true
-        ? new Future.value()
+        ? Future.value()
         : Future.forEach(app.responseFinalizers, (f) => f(req, res));
 
     return finalizers.then((_) {
diff --git a/lib/src/core/env.dart b/lib/src/core/env.dart
index b43e0bfa..a513c93a 100644
--- a/lib/src/core/env.dart
+++ b/lib/src/core/env.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 /// A constant instance of [AngelEnv].
-const AngelEnvironment angelEnv = const AngelEnvironment();
+const AngelEnvironment angelEnv = AngelEnvironment();
 
 /// Queries the environment's `ANGEL_ENV` value.
 class AngelEnvironment {
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 5a68a028..8e9e60d2 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -19,29 +19,29 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   final T inner;
 
   final HookedServiceEventDispatcher<Id, Data, T> beforeIndexed =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> beforeRead =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> beforeCreated =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> beforeModified =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> beforeUpdated =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> beforeRemoved =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> afterIndexed =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> afterRead =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> afterCreated =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> afterModified =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> afterUpdated =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
   final HookedServiceEventDispatcher<Id, Data, T> afterRemoved =
-      new HookedServiceEventDispatcher<Id, Data, T>();
+      HookedServiceEventDispatcher<Id, Data, T>();
 
   HookedService(this.inner) {
     // Clone app instance
@@ -89,7 +89,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
     afterUpdated._close();
     afterRemoved._close();
     inner.close();
-    return new Future.value();
+    return Future.value();
   }
 
   /// Adds hooks to this instance.
@@ -130,7 +130,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   List<RequestHandler> get bootstrappers =>
-      new List<RequestHandler>.from(super.bootstrappers)
+      List<RequestHandler>.from(super.bootstrappers)
         ..add((RequestContext req, ResponseContext res) {
           req.serviceParams
             ..['__requestctx'] = req
@@ -160,7 +160,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
         case HookedServiceEvent.removed:
           return beforeRemoved;
         default:
-          throw new ArgumentError('Invalid service method: ${name}');
+          throw ArgumentError('Invalid service method: ${name}');
       }
     }).forEach((HookedServiceEventDispatcher<Id, Data, T> dispatcher) =>
         dispatcher.listen(listener));
@@ -184,7 +184,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
         case HookedServiceEvent.removed:
           return afterRemoved;
         default:
-          throw new ArgumentError('Invalid service method: ${name}');
+          throw ArgumentError('Invalid service method: ${name}');
       }
     }).forEach((HookedServiceEventDispatcher<Id, Data, T> dispatcher) =>
         dispatcher.listen(listener));
@@ -216,7 +216,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// that events coming out of this [Stream] will see changes you make within the [Stream]
   /// callback.
   Stream<HookedServiceEvent<Id, Data, T>> beforeAllStream() {
-    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
+    var ctrl = StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     before(HookedServiceEvent.all, ctrl.add);
     return ctrl.stream;
@@ -228,7 +228,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// that events coming out of this [Stream] will see changes you make within the [Stream]
   /// callback.
   Stream<HookedServiceEvent<Id, Data, T>> afterAllStream() {
-    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
+    var ctrl = StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     before(HookedServiceEvent.all, ctrl.add);
     return ctrl.stream;
@@ -241,7 +241,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// callback.
   Stream<HookedServiceEvent<Id, Data, T>> beforeStream(
       Iterable<String> eventNames) {
-    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
+    var ctrl = StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     before(eventNames, ctrl.add);
     return ctrl.stream;
@@ -254,7 +254,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   /// callback.
   Stream<HookedServiceEvent<Id, Data, T>> afterStream(
       Iterable<String> eventNames) {
-    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
+    var ctrl = StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     after(eventNames, ctrl.add);
     return ctrl.stream;
@@ -271,13 +271,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   Future<List<Data>> index([Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeIndexed
-        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+        ._emit(HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.indexed,
             params: params))
         .then((before) {
       if (before._canceled) {
         return afterIndexed
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.indexed,
                 params: params, result: before.result))
             .then((after) => after.result as List<Data>);
@@ -285,7 +285,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
       return inner.index(params).then((result) {
         return afterIndexed
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.indexed,
                 params: params, result: result))
             .then((after) => after.result as List<Data>);
@@ -297,13 +297,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   Future<Data> read(Id id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRead
-        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+        ._emit(HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.read,
             id: id, params: params))
         .then((before) {
       if (before._canceled) {
         return afterRead
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.read,
                 id: id, params: params, result: before.result))
             .then((after) => after.result as Data);
@@ -311,7 +311,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
       return inner.read(id, params).then((result) {
         return afterRead
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.read,
                 id: id, params: params, result: result))
             .then((after) => after.result as Data);
@@ -323,13 +323,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   Future<Data> create(Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeCreated
-        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+        ._emit(HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.created,
             data: data, params: params))
         .then((before) {
       if (before._canceled) {
         return afterCreated
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
                 data: before.data, params: params, result: before.result))
             .then((after) => after.result as Data);
@@ -337,7 +337,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
       return inner.create(before.data, params).then((result) {
         return afterCreated
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
                 data: before.data, params: params, result: result))
             .then((after) => after.result as Data);
@@ -349,13 +349,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   Future<Data> modify(Id id, Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeModified
-        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+        ._emit(HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.modified,
             id: id, data: data, params: params))
         .then((before) {
       if (before._canceled) {
         return afterModified
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.modified,
                 id: id,
                 data: before.data,
@@ -366,7 +366,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
       return inner.modify(id, before.data, params).then((result) {
         return afterModified
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.created,
                 id: id, data: before.data, params: params, result: result))
             .then((after) => after.result as Data);
@@ -378,13 +378,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   Future<Data> update(Id id, Data data, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeUpdated
-        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+        ._emit(HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.updated,
             id: id, data: data, params: params))
         .then((before) {
       if (before._canceled) {
         return afterUpdated
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.updated,
                 id: id,
                 data: before.data,
@@ -395,7 +395,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
       return inner.update(id, before.data, params).then((result) {
         return afterUpdated
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.updated,
                 id: id, data: before.data, params: params, result: result))
             .then((after) => after.result as Data);
@@ -407,13 +407,13 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   Future<Data> remove(Id id, [Map<String, dynamic> _params]) {
     var params = _stripReq(_params);
     return beforeRemoved
-        ._emit(new HookedServiceEvent(false, _getRequest(_params),
+        ._emit(HookedServiceEvent(false, _getRequest(_params),
             _getResponse(_params), inner, HookedServiceEvent.removed,
             id: id, params: params))
         .then((before) {
       if (before._canceled) {
         return afterRemoved
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.removed,
                 id: id, params: params, result: before.result))
             .then((after) => after.result) as Data;
@@ -421,7 +421,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
       return inner.remove(id, params).then((result) {
         return afterRemoved
-            ._emit(new HookedServiceEvent(true, _getRequest(_params),
+            ._emit(HookedServiceEvent(true, _getRequest(_params),
                 _getResponse(_params), inner, HookedServiceEvent.removed,
                 id: id, params: params, result: result))
             .then((after) => after.result as Data);
@@ -455,11 +455,11 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
         dispatcher = afterRemoved;
         break;
       default:
-        throw new ArgumentError("Invalid service event name: '$eventName'");
+        throw ArgumentError("Invalid service event name: '$eventName'");
     }
 
     var ev =
-        new HookedServiceEvent<Id, Data, T>(true, null, null, inner, eventName);
+        HookedServiceEvent<Id, Data, T>(true, null, null, inner, eventName);
     return fireEvent(dispatcher, ev, callback);
   }
 
@@ -470,8 +470,8 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
       [HookedServiceEventListener<Id, Data, T> callback]) {
     Future f;
     if (callback != null && event?._canceled != true)
-      f = new Future.sync(() => callback(event));
-    f ??= new Future.value();
+      f = Future.sync(() => callback(event));
+    f ??= Future.value();
     return f.then((_) => dispatcher._emit(event));
   }
 }
@@ -485,7 +485,7 @@ class HookedServiceEvent<Id, Data, T extends Service<Id, Data>> {
   static const String updated = 'updated';
   static const String removed = 'removed';
 
-  static const List<String> all = const [
+  static const List<String> all = [
     indexed,
     read,
     created,
@@ -558,14 +558,14 @@ class HookedServiceEventDispatcher<Id, Data, T extends Service<Id, Data>> {
   Future<HookedServiceEvent<Id, Data, T>> _emit(
       HookedServiceEvent<Id, Data, T> event) {
     if (event?._canceled == true || event == null || listeners.isEmpty)
-      return new Future.value(event);
+      return Future.value(event);
 
-    var f = new Future<HookedServiceEvent<Id, Data, T>>.value(event);
+    var f = Future<HookedServiceEvent<Id, Data, T>>.value(event);
 
     for (var listener in listeners) {
       f = f.then((event) {
         if (event._canceled) return event;
-        return new Future.sync(() => listener(event)).then((_) => event);
+        return Future.sync(() => listener(event)).then((_) => event);
       });
     }
 
@@ -577,7 +577,7 @@ class HookedServiceEventDispatcher<Id, Data, T extends Service<Id, Data>> {
   /// *NOTE*: Callbacks on the returned [Stream] cannot be guaranteed to run before other [listeners].
   /// Use this only if you need a read-only stream of events.
   Stream<HookedServiceEvent<Id, Data, T>> asStream() {
-    var ctrl = new StreamController<HookedServiceEvent<Id, Data, T>>();
+    var ctrl = StreamController<HookedServiceEvent<Id, Data, T>>();
     _ctrl.add(ctrl);
     listen(ctrl.add);
     return ctrl.stream;
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 2e7ed073..078320eb 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -48,7 +48,7 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     else if (injection.optional.contains(requirement))
       return null;
     else if (throwOnUnresolved) {
-      throw new ArgumentError(
+      throw ArgumentError(
           "Cannot resolve parameter '$requirement' within handler.");
     }
   } else if (requirement is List &&
@@ -76,7 +76,7 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
 
     return await container.make(requirement);
   } else if (throwOnUnresolved) {
-    throw new ArgumentError(
+    throw ArgumentError(
         '$requirement cannot be injected into a request handler.');
   }
 }
@@ -97,8 +97,7 @@ RequestHandler handleContained(Function handler, InjectionRequest injection,
   return (RequestContext req, ResponseContext res) async {
     if (injection.parameters.isNotEmpty &&
         injection.parameters.values.any((p) => p.match != null) &&
-        !suitableForInjection(req, res, injection))
-      return new Future.value(true);
+        !suitableForInjection(req, res, injection)) return Future.value(true);
 
     List args = [];
 
@@ -109,7 +108,7 @@ RequestHandler handleContained(Function handler, InjectionRequest injection,
     }
 
     for (var entry in injection.named.entries) {
-      var name = new Symbol(entry.key);
+      var name = Symbol(entry.key);
       named[name] = await resolveInjection(
           [entry.key, entry.value], injection, req, res, false, container);
     }
@@ -153,7 +152,7 @@ class InjectionRequest {
 
 /// Predetermines what needs to be injected for a handler to run.
 InjectionRequest preInject(Function handler, Reflector reflector) {
-  var injection = new InjectionRequest();
+  var injection = InjectionRequest();
 
   var closureMirror = reflector.reflectFunction(handler);
 
@@ -172,7 +171,7 @@ InjectionRequest preInject(Function handler, Reflector reflector) {
         ?.reflectee as Parameter;
     //print(p);
     if (p != null) {
-      injection.parameters[name] = new Parameter(
+      injection.parameters[name] = Parameter(
         cookie: p.cookie,
         header: p.header,
         query: p.query,
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 1295e61c..29e443dd 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -49,11 +49,11 @@ class MapService extends Service<String, Map<String, dynamic>> {
   @override
   Future<List<Map<String, dynamic>>> index([Map<String, dynamic> params]) {
     if (allowQuery == false || params == null || params['query'] is! Map)
-      return new Future.value(items);
+      return Future.value(items);
     else {
       var query = params['query'] as Map;
 
-      return new Future.value(items.where((item) {
+      return Future.value(items.where((item) {
         for (var key in query.keys) {
           if (!item.containsKey(key))
             return false;
@@ -67,8 +67,8 @@ class MapService extends Service<String, Map<String, dynamic>> {
 
   @override
   Future<Map<String, dynamic>> read(String id, [Map<String, dynamic> params]) {
-    return new Future.value(items.firstWhere(_matchesId(id),
-        orElse: () => throw new AngelHttpException.notFound(
+    return Future.value(items.firstWhere(_matchesId(id),
+        orElse: () => throw AngelHttpException.notFound(
             message: 'No record found for ID $id')));
   }
 
@@ -76,11 +76,11 @@ class MapService extends Service<String, Map<String, dynamic>> {
   Future<Map<String, dynamic>> create(Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
     if (data is! Map)
-      throw new AngelHttpException.badRequest(
+      throw AngelHttpException.badRequest(
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
-    var now = new DateTime.now().toIso8601String();
-    var result = new Map<String, dynamic>.from(data);
+    var now = DateTime.now().toIso8601String();
+    var result = Map<String, dynamic>.from(data);
 
     if (autoIdAndDateFields == true) {
       result
@@ -89,14 +89,14 @@ class MapService extends Service<String, Map<String, dynamic>> {
         ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] = now;
     }
     items.add(result);
-    return new Future.value(result);
+    return Future.value(result);
   }
 
   @override
   Future<Map<String, dynamic>> modify(String id, Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
     if (data is! Map)
-      throw new AngelHttpException.badRequest(
+      throw AngelHttpException.badRequest(
           message:
               'MapService does not support `modify` with ${data.runtimeType}.');
     if (!items.any(_matchesId(id))) return create(data, params);
@@ -104,13 +104,13 @@ class MapService extends Service<String, Map<String, dynamic>> {
     return read(id).then((item) {
       var idx = items.indexOf(item);
       if (idx < 0) return create(data, params);
-      var result = new Map<String, dynamic>.from(item)..addAll(data);
+      var result = Map<String, dynamic>.from(item)..addAll(data);
 
       if (autoIdAndDateFields == true)
         result
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-              new DateTime.now().toIso8601String();
-      return new Future.value(items[idx] = result);
+              DateTime.now().toIso8601String();
+      return Future.value(items[idx] = result);
     });
   }
 
@@ -118,27 +118,27 @@ class MapService extends Service<String, Map<String, dynamic>> {
   Future<Map<String, dynamic>> update(String id, Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
     if (data is! Map)
-      throw new AngelHttpException.badRequest(
+      throw AngelHttpException.badRequest(
           message:
               'MapService does not support `update` with ${data.runtimeType}.');
     if (!items.any(_matchesId(id))) return create(data, params);
 
     return read(id).then((old) {
       if (!items.remove(old))
-        throw new AngelHttpException.notFound(
+        throw AngelHttpException.notFound(
             message: 'No record found for ID $id');
 
-      var result = new Map<String, dynamic>.from(data);
+      var result = Map<String, dynamic>.from(data);
       if (autoIdAndDateFields == true) {
         result
           ..['id'] = id?.toString()
           ..[autoSnakeCaseNames == false ? 'createdAt' : 'created_at'] =
               old[autoSnakeCaseNames == false ? 'createdAt' : 'created_at']
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
-              new DateTime.now().toIso8601String();
+              DateTime.now().toIso8601String();
       }
       items.add(result);
-      return new Future.value(result);
+      return Future.value(result);
     });
   }
 
@@ -153,7 +153,7 @@ class MapService extends Service<String, Map<String, dynamic>> {
             message: 'Clients are not allowed to delete all items.');
       } else {
         items.clear();
-        return new Future.value({});
+        return Future.value({});
       }
     }
 
@@ -161,7 +161,7 @@ class MapService extends Service<String, Map<String, dynamic>> {
       if (items.remove(result))
         return result;
       else
-        throw new AngelHttpException.notFound(
+        throw AngelHttpException.notFound(
             message: 'No record found for ID $id');
     });
   }
diff --git a/lib/src/core/metadata.dart b/lib/src/core/metadata.dart
index ebc917d6..03c497a4 100644
--- a/lib/src/core/metadata.dart
+++ b/lib/src/core/metadata.dart
@@ -71,17 +71,16 @@ class Parameter {
   /// Returns an error that can be thrown when the parameter is not present.
   get error {
     if (cookie?.isNotEmpty == true)
-      return new AngelHttpException.badRequest(
+      return AngelHttpException.badRequest(
           message: 'Missing required cookie "$cookie".');
     if (header?.isNotEmpty == true)
-      return new AngelHttpException.badRequest(
+      return AngelHttpException.badRequest(
           message: 'Missing required header "$header".');
     if (query?.isNotEmpty == true)
-      return new AngelHttpException.badRequest(
+      return AngelHttpException.badRequest(
           message: 'Missing required query parameter "$query".');
     if (session?.isNotEmpty == true)
-      return new StateError(
-          'Session does not contain required key "$session".');
+      return StateError('Session does not contain required key "$session".');
   }
 
   /// Obtains a value for this parameter from a [RequestContext].
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index db823fe8..381964e2 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -76,7 +76,7 @@ abstract class RequestContext<RawRequest> {
 
   /// The content type of an incoming request.
   MediaType get contentType =>
-      _contentType ??= new MediaType.parse(headers.contentType.toString());
+      _contentType ??= MediaType.parse(headers.contentType.toString());
 
   /// The URL parameters extracted from the request URI.
   Map<String, dynamic> params = <String, dynamic>{};
@@ -110,9 +110,9 @@ abstract class RequestContext<RawRequest> {
   /// Note that [parseBody] must be called first.
   Map<String, dynamic> get bodyAsMap {
     if (!hasParsedBody) {
-      throw new StateError('The request body has not been parsed yet.');
+      throw StateError('The request body has not been parsed yet.');
     } else if (_bodyFields == null) {
-      throw new StateError('The request body, $_bodyObject, is not a Map.');
+      throw StateError('The request body, $_bodyObject, is not a Map.');
     }
 
     return _bodyFields;
@@ -128,9 +128,9 @@ abstract class RequestContext<RawRequest> {
   /// Note that [parseBody] must be called first.
   List get bodyAsList {
     if (!hasParsedBody) {
-      throw new StateError('The request body has not been parsed yet.');
+      throw StateError('The request body has not been parsed yet.');
     } else if (_bodyList == null) {
-      throw new StateError('The request body, $_bodyObject, is not a List.');
+      throw StateError('The request body, $_bodyObject, is not a List.');
     }
 
     return _bodyList;
@@ -146,7 +146,7 @@ abstract class RequestContext<RawRequest> {
   /// Note that [parseBody] must be called first.
   Object get bodyAsObject {
     if (!hasParsedBody) {
-      throw new StateError('The request body has not been parsed yet.');
+      throw StateError('The request body has not been parsed yet.');
     }
 
     return _bodyObject;
@@ -172,7 +172,7 @@ abstract class RequestContext<RawRequest> {
   /// Note that [parseBody] must be called first.
   List<UploadedFile> get uploadedFiles {
     if (!hasParsedBody) {
-      throw new StateError('The request body has not been parsed yet.');
+      throw StateError('The request body has not been parsed yet.');
     }
 
     return _uploadedFiles;
@@ -180,7 +180,7 @@ abstract class RequestContext<RawRequest> {
 
   /// Returns a *mutable* map of the fields contained in the query.
   Map<String, dynamic> get queryParameters =>
-      _queryParameters ??= new Map<String, dynamic>.from(uri.queryParameters);
+      _queryParameters ??= Map<String, dynamic>.from(uri.queryParameters);
 
   /// Returns the file extension of the requested path, if any.
   ///
@@ -203,7 +203,7 @@ abstract class RequestContext<RawRequest> {
 
     // Change to assert
     if (contentTypeString == null)
-      throw new ArgumentError(
+      throw ArgumentError(
           'RequestContext.accepts expects the `contentType` parameter to NOT be null.');
 
     _acceptHeaderCache ??= headers.value('accept');
@@ -235,7 +235,7 @@ abstract class RequestContext<RawRequest> {
             await body.transform(encoding.decoder).join().then(json.decode);
 
         if (parsed is Map) {
-          _bodyFields = new Map<String, dynamic>.from(parsed);
+          _bodyFields = Map<String, dynamic>.from(parsed);
         } else if (parsed is List) {
           _bodyList = parsed;
         }
@@ -246,12 +246,12 @@ abstract class RequestContext<RawRequest> {
             .transform(encoding.decoder)
             .join()
             .then((s) => Uri.splitQueryString(s, encoding: encoding));
-        _bodyFields = new Map<String, dynamic>.from(parsed);
+        _bodyFields = Map<String, dynamic>.from(parsed);
       } else if (contentType.type == 'multipart' &&
           contentType.subtype == 'form-data' &&
           contentType.parameters.containsKey('boundary')) {
         var boundary = contentType.parameters['boundary'];
-        var transformer = new MimeMultipartTransformer(boundary);
+        var transformer = MimeMultipartTransformer(boundary);
         var parts = body.transform(transformer).map((part) =>
             HttpMultipartFormData.parse(part, defaultEncoding: encoding));
         _bodyFields = {};
@@ -259,7 +259,7 @@ abstract class RequestContext<RawRequest> {
 
         await for (var part in parts) {
           if (part.isBinary) {
-            _uploadedFiles.add(new UploadedFile(part));
+            _uploadedFiles.add(UploadedFile(part));
           } else if (part.isText &&
               part.contentDisposition.parameters.containsKey('name')) {
             // If there is no name, then don't parse it.
@@ -313,7 +313,7 @@ class UploadedFile {
   /// Returns [:null:] if not present.
   MediaType get contentType => _contentType ??= (formData.contentType == null
       ? null
-      : new MediaType.parse(formData.contentType.toString()));
+      : MediaType.parse(formData.contentType.toString()));
 
   /// The parsed [:Content-Transfer-Encoding:] header of the
   /// [:HttpMultipartFormData:]. This field is used to determine how to decode
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 57775285..35d8b537 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -14,14 +14,13 @@ import 'controller.dart';
 import 'request_context.dart';
 import 'server.dart' show Angel;
 
-final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)');
 
 /// A convenience wrapper around an outgoing HTTP request.
 abstract class ResponseContext<RawResponse>
     implements StreamSink<List<int>>, StringSink {
   final Map properties = {};
-  final CaseInsensitiveMap<String> _headers =
-      new CaseInsensitiveMap<String>.from({
+  final CaseInsensitiveMap<String> _headers = CaseInsensitiveMap<String>.from({
     'content-type': 'text/plain',
     'server': 'angel',
   });
@@ -52,7 +51,7 @@ abstract class ResponseContext<RawResponse>
   RequestContext get correspondingRequest;
 
   @override
-  Future get done => (_done ?? new Completer()).future;
+  Future get done => (_done ?? Completer()).future;
 
   /// Headers that will be sent to the user.
   ///
@@ -124,9 +123,9 @@ abstract class ResponseContext<RawResponse>
   /// Gets or sets the content type to send back to a client.
   MediaType get contentType {
     try {
-      return new MediaType.parse(headers['content-type']);
+      return MediaType.parse(headers['content-type']);
     } catch (_) {
-      return new MediaType('text', 'plain');
+      return MediaType('text', 'plain');
     }
   }
 
@@ -135,8 +134,7 @@ abstract class ResponseContext<RawResponse>
     headers['content-type'] = value.toString();
   }
 
-  static StateError closed() =>
-      new StateError('Cannot modify a closed response.');
+  static StateError closed() => StateError('Cannot modify a closed response.');
 
   /// Sends a download as a response.
   Future<void> download(File file, {String filename}) async {
@@ -162,7 +160,7 @@ abstract class ResponseContext<RawResponse>
     }
 
     if (_done?.isCompleted == false) _done.complete();
-    return new Future.value();
+    return Future.value();
   }
 
   /// Serializes JSON to the response.
@@ -176,8 +174,7 @@ abstract class ResponseContext<RawResponse>
   Future<void> jsonp(value,
       {String callbackName = "callback", MediaType contentType}) {
     if (!isOpen) throw closed();
-    this.contentType =
-        contentType ?? new MediaType('application', 'javascript');
+    this.contentType = contentType ?? MediaType('application', 'javascript');
     write("$callbackName(${serializer(value)})");
     return close();
   }
@@ -185,10 +182,10 @@ abstract class ResponseContext<RawResponse>
   /// Renders a view to the response stream, and closes the response.
   Future<void> render(String view, [Map<String, dynamic> data]) {
     if (!isOpen) throw closed();
-    contentType = new MediaType('text', 'html', {'charset': 'utf-8'});
+    contentType = MediaType('text', 'html', {'charset': 'utf-8'});
     return Future<String>.sync(() => app.viewGenerator(
         view,
-        new Map<String, dynamic>.from(renderParams)
+        Map<String, dynamic>.from(renderParams)
           ..addAll(data ?? <String, dynamic>{}))).then((content) {
       write(content);
       return close();
@@ -256,7 +253,7 @@ abstract class ResponseContext<RawResponse>
       return;
     }
 
-    throw new ArgumentError.notNull('Route to redirect to ($name)');
+    throw ArgumentError.notNull('Route to redirect to ($name)');
   }
 
   /// Redirects to the given [Controller] action.
@@ -266,19 +263,19 @@ abstract class ResponseContext<RawResponse>
     List<String> split = action.split("@");
 
     if (split.length < 2)
-      throw new Exception(
+      throw Exception(
           "Controller redirects must take the form of 'Controller@action'. You gave: $action");
 
     Controller controller =
         app.controllers[split[0].replaceAll(_straySlashes, '')];
 
     if (controller == null)
-      throw new Exception("Could not find a controller named '${split[0]}'");
+      throw Exception("Could not find a controller named '${split[0]}'");
 
     Route matched = controller.routeMappings[split[1]];
 
     if (matched == null)
-      throw new Exception(
+      throw Exception(
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
 
     final head = controller
@@ -298,7 +295,7 @@ abstract class ResponseContext<RawResponse>
   /// Serializes data to the response.
   Future<bool> serialize(value, {MediaType contentType}) async {
     if (!isOpen) throw closed();
-    this.contentType = contentType ?? new MediaType('application', 'json');
+    this.contentType = contentType ?? MediaType('application', 'json');
     var text = await serializer(value);
     if (text.isEmpty) return true;
     write(text);
@@ -314,7 +311,7 @@ abstract class ResponseContext<RawResponse>
     var mimeType = app.mimeTypeResolver.lookup(file.path);
     contentLength = await file.length();
     contentType = mimeType == null
-        ? new MediaType('application', 'octet-stream')
+        ? MediaType('application', 'octet-stream')
         : MediaType.parse(mimeType);
 
     if (correspondingRequest.method != 'HEAD')
@@ -375,18 +372,18 @@ abstract class ResponseContext<RawResponse>
 
 abstract class LockableBytesBuilder extends BytesBuilder {
   factory LockableBytesBuilder() {
-    return new _LockableBytesBuilderImpl();
+    return _LockableBytesBuilderImpl();
   }
 
   void lock();
 }
 
 class _LockableBytesBuilderImpl implements LockableBytesBuilder {
-  final BytesBuilder _buf = new BytesBuilder(copy: false);
+  final BytesBuilder _buf = BytesBuilder(copy: false);
   bool _closed = false;
 
   StateError _deny() =>
-      new StateError('Cannot modified a closed response\'s buffer.');
+      StateError('Cannot modified a closed response\'s buffer.');
 
   @override
   void lock() {
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index f98bc074..1253e8a8 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -12,7 +12,7 @@ import 'request_context.dart';
 import 'response_context.dart';
 import 'service.dart';
 
-final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)');
 
 /// A function that receives an incoming [RequestContext] and responds to it.
 typedef FutureOr RequestHandler(RequestContext req, ResponseContext res);
@@ -31,12 +31,12 @@ RequestHandler chain(Iterable<RequestHandler> handlers) {
       else {
         var current = runPipeline;
         runPipeline = () => current().then((result) => !res.isOpen
-            ? new Future.value(result)
+            ? Future.value(result)
             : req.app.executeHandler(handler, req, res));
       }
     }
 
-    runPipeline ??= () => new Future.value();
+    runPipeline ??= () => Future.value();
     return runPipeline();
   };
 }
@@ -50,7 +50,7 @@ class Routable extends Router<RequestHandler> {
   final Container _container;
 
   Routable([Reflector reflector])
-      : _container = reflector == null ? null : new Container(reflector),
+      : _container = reflector == null ? null : Container(reflector),
         super();
 
   /// A [Container] used to inject dependencies.
@@ -65,8 +65,7 @@ class Routable extends Router<RequestHandler> {
   /// A set of [Service] objects that have been mapped into routes.
   Map<Pattern, Service> get services => _services;
 
-  StreamController<Service> _onService =
-      new StreamController<Service>.broadcast();
+  StreamController<Service> _onService = StreamController<Service>.broadcast();
 
   /// Fired whenever a service is added to this instance.
   ///
@@ -119,11 +118,9 @@ class Routable extends Router<RequestHandler> {
   /// events dispatched by this service.
   HookedService<Id, Data, T> use<Id, Data, T extends Service<Id, Data>>(
       String path, T service) {
-    var hooked = new HookedService<Id, Data, T>(service);
-    _services[path
-        .toString()
-        .trim()
-        .replaceAll(new RegExp(r'(^/+)|(/+$)'), '')] = hooked;
+    var hooked = HookedService<Id, Data, T>(service);
+    _services[path.toString().trim().replaceAll(RegExp(r'(^/+)|(/+$)'), '')] =
+        hooked;
     hooked.addRoutes();
     mount(path.toString(), hooked);
     service.onHooked(hooked);
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 82758ead..b6a62b7e 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -19,7 +19,7 @@ import 'response_context.dart';
 import 'routable.dart';
 import 'service.dart';
 
-//final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+//final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)');
 
 /// A function that configures an [Angel] server in some way.
 typedef FutureOr<void> AngelConfigurer(Angel app);
@@ -37,7 +37,7 @@ class Angel extends Routable {
   final Map<
       String,
       Tuple4<List, Map<String, dynamic>, ParseResult<RouteResult>,
-          MiddlewarePipeline>> handlerCache = new HashMap();
+          MiddlewarePipeline>> handlerCache = HashMap();
 
   Router<RequestHandler> _flattened;
   Angel _parent;
@@ -48,7 +48,7 @@ class Angel extends Routable {
   final Map<dynamic, InjectionRequest> _preContained = {};
 
   /// A [MimeTypeResolver] that can be used to specify the MIME types of files not known by `package:mime`.
-  final MimeTypeResolver mimeTypeResolver = new MimeTypeResolver();
+  final MimeTypeResolver mimeTypeResolver = MimeTypeResolver();
 
   /// A middleware to inject a serialize on every request.
   FutureOr<String> Function(dynamic) serializer;
@@ -65,7 +65,7 @@ class Angel extends Routable {
   bool allowMethodOverrides = true;
 
   /// All child application mounted on this instance.
-  List<Angel> get children => new List<Angel>.unmodifiable(_children);
+  List<Angel> get children => List<Angel>.unmodifiable(_children);
 
   final Map<Pattern, Controller> _controllers = {};
 
@@ -134,7 +134,7 @@ class Angel extends Routable {
       return;
     }
 
-    res.contentType = new MediaType('text', 'html', {'charset': 'utf8'});
+    res.contentType = MediaType('text', 'html', {'charset': 'utf8'});
     res.statusCode = e.statusCode;
     res.write("<!DOCTYPE html><html><head><title>${e.message}</title>");
     res.write("</head><body><h1>${e.message}</h1><ul>");
@@ -211,7 +211,7 @@ class Angel extends Routable {
     shutdownHooks.clear();
     responseFinalizers.clear();
     _flattened = null;
-    return new Future.value();
+    return Future.value();
   }
 
   @override
@@ -262,7 +262,7 @@ class Angel extends Routable {
       return getHandlerResult(handler.toList(), req, res);
     }
 
-    return new Future.value(handler);
+    return Future.value(handler);
   }
 
   /// Runs some [handler]. Returns `true` if request execution should continue.
@@ -305,7 +305,7 @@ class Angel extends Routable {
   /// the execution will be faster, as the injection requirements were stored beforehand.
   Future runContained(Function handler, RequestContext req, ResponseContext res,
       [Container container]) {
-    return new Future.sync(() {
+    return Future.sync(() {
       if (_preContained.containsKey(handler)) {
         return handleContained(handler, _preContained[handler], container)(
             req, res);
@@ -323,13 +323,13 @@ class Angel extends Routable {
         handler,
         _preContained[handler] = preInject(handler, container.reflector),
         container);
-    return new Future.sync(() => h(req, res));
+    return Future.sync(() => h(req, res));
     // return   closureMirror.apply(args).reflectee;
   }
 
   /// Applies an [AngelConfigurer] to this instance.
   Future configure(AngelConfigurer configurer) {
-    return new Future.sync(() => configurer(this));
+    return Future.sync(() => configurer(this));
   }
 
   /// Shorthand for using the [container] to instantiate, and then mount a [Controller].
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 8b383023..25e70816 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -107,10 +107,10 @@ class Service<Id, Data> extends Routable {
       String errorMessage = 'No record was found matching the given query.']) {
     return index(params).then((result) {
       if (result == null) {
-        throw new AngelHttpException.notFound(message: errorMessage);
+        throw AngelHttpException.notFound(message: errorMessage);
       } else {
         if (result.isEmpty) {
-          throw new AngelHttpException.notFound(message: errorMessage);
+          throw AngelHttpException.notFound(message: errorMessage);
         } else {
           return result.first;
         }
@@ -120,12 +120,12 @@ class Service<Id, Data> extends Routable {
 
   /// Retrieves all resources.
   Future<List<Data>> index([Map<String, dynamic> params]) {
-    throw new AngelHttpException.methodNotAllowed();
+    throw AngelHttpException.methodNotAllowed();
   }
 
   /// Retrieves the desired resource.
   Future<Data> read(Id id, [Map<String, dynamic> params]) {
-    throw new AngelHttpException.methodNotAllowed();
+    throw AngelHttpException.methodNotAllowed();
   }
 
   /// Reads multiple resources at once.
@@ -138,22 +138,22 @@ class Service<Id, Data> extends Routable {
 
   /// Creates a resource.
   Future<Data> create(Data data, [Map<String, dynamic> params]) {
-    throw new AngelHttpException.methodNotAllowed();
+    throw AngelHttpException.methodNotAllowed();
   }
 
   /// Modifies a resource.
   Future<Data> modify(Id id, Data data, [Map<String, dynamic> params]) {
-    throw new AngelHttpException.methodNotAllowed();
+    throw AngelHttpException.methodNotAllowed();
   }
 
   /// Overwrites a resource.
   Future<Data> update(Id id, Data data, [Map<String, dynamic> params]) {
-    throw new AngelHttpException.methodNotAllowed();
+    throw AngelHttpException.methodNotAllowed();
   }
 
   /// Removes the given resource.
   Future<Data> remove(Id id, [Map<String, dynamic> params]) {
-    throw new AngelHttpException.methodNotAllowed();
+    throw AngelHttpException.methodNotAllowed();
   }
 
   /// Creates an [AnonymousService] that wraps over this one, and maps input and output
@@ -167,7 +167,7 @@ class Service<Id, Data> extends Routable {
       return encoder(inner);
     };
 
-    return new AnonymousService<Id, U>(
+    return AnonymousService<Id, U>(
       readData: readData,
       index: ([params]) {
         return index(params).then((it) => it.map(encoder).toList());
@@ -219,7 +219,7 @@ class Service<Id, Data> extends Routable {
 
   void _addRoutesInner(Service service, Iterable<RequestHandler> handlerss) {
     var restProvider = {'provider': Providers.rest};
-    var handlers = new List<RequestHandler>.from(handlerss);
+    var handlers = List<RequestHandler>.from(handlerss);
 
     // Add global middleware if declared on the instance itself
     Middleware before =
@@ -363,8 +363,8 @@ class Service<Id, Data> extends Routable {
               (removeMiddleware == null) ? [] : removeMiddleware.handlers));
 
     // REST compliance
-    put('/', (req, res) => throw new AngelHttpException.notFound());
-    patch('/', (req, res) => throw new AngelHttpException.notFound());
+    put('/', (req, res) => throw AngelHttpException.notFound());
+    patch('/', (req, res) => throw AngelHttpException.notFound());
   }
 
   /// Invoked when this service is wrapped within a [HookedService].
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 9eea0a9b..996c5481 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -13,33 +13,33 @@ import '../core/core.dart';
 import 'http_request_context.dart';
 import 'http_response_context.dart';
 
-final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)');
 
 /// Adapts `dart:io`'s [HttpServer] to serve Angel.
 class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
     HttpRequestContext, HttpResponseContext> {
   @override
   Uri get uri =>
-      new Uri(scheme: 'http', host: server.address.address, port: server.port);
+      Uri(scheme: 'http', host: server.address.address, port: server.port);
 
   AngelHttp._(Angel app,
       Future<HttpServer> Function(dynamic, int) serverGenerator, bool useZone)
       : super(app, serverGenerator, useZone: useZone);
 
   factory AngelHttp(Angel app, {bool useZone = true}) {
-    return new AngelHttp._(app, HttpServer.bind, useZone);
+    return AngelHttp._(app, HttpServer.bind, useZone);
   }
 
   /// An instance mounted on a server started by the [serverGenerator].
   factory AngelHttp.custom(
       Angel app, Future<HttpServer> Function(dynamic, int) serverGenerator,
       {bool useZone = true}) {
-    return new AngelHttp._(app, serverGenerator, useZone);
+    return AngelHttp._(app, serverGenerator, useZone);
   }
 
   factory AngelHttp.fromSecurityContext(Angel app, SecurityContext context,
       {bool useZone = true}) {
-    return new AngelHttp._(app, (address, int port) {
+    return AngelHttp._(app, (address, int port) {
       return HttpServer.bindSecure(address, port, context);
     }, useZone);
   }
@@ -55,11 +55,10 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
     var certificateChain =
         Platform.script.resolve(certificateChainPath).toFilePath();
     var serverKey = Platform.script.resolve(serverKeyPath).toFilePath();
-    var serverContext = new SecurityContext();
+    var serverContext = SecurityContext();
     serverContext.useCertificateChain(certificateChain, password: password);
     serverContext.usePrivateKey(serverKey, password: password);
-    return new AngelHttp.fromSecurityContext(app, serverContext,
-        useZone: useZone);
+    return AngelHttp.fromSecurityContext(app, serverContext, useZone: useZone);
   }
 
   /// Use [server] instead.
@@ -94,8 +93,8 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
   Future<HttpResponseContext> createResponseContext(
       HttpRequest request, HttpResponse response,
       [HttpRequestContext correspondingRequest]) {
-    return new Future<HttpResponseContext>.value(
-        new HttpResponseContext(response, app, correspondingRequest)
+    return Future<HttpResponseContext>.value(
+        HttpResponseContext(response, app, correspondingRequest)
           ..serializer = (app.serializer ?? json.encode)
           ..encoders.addAll(app.encoders ?? {}));
   }
@@ -103,7 +102,7 @@ class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
   @override
   Stream<HttpResponse> createResponseStreamFromRawRequest(
           HttpRequest request) =>
-      new Stream.fromIterable([request.response]);
+      Stream.fromIterable([request.response]);
 
   @override
   void setChunkedEncoding(HttpResponse response, bool value) =>
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index f9408580..264a9474 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -75,7 +75,7 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
   /// Magically transforms an [HttpRequest] into a [RequestContext].
   static Future<HttpRequestContext> from(
       HttpRequest request, Angel app, String path) {
-    HttpRequestContext ctx = new HttpRequestContext()
+    HttpRequestContext ctx = HttpRequestContext()
       .._container = app.container.createChild();
 
     String override = request.method;
@@ -114,15 +114,15 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
     }
 
     if (lastSlash > -1)
-      ctx._path = new String.fromCharCodes(_path.take(lastSlash));
+      ctx._path = String.fromCharCodes(_path.take(lastSlash));
     else
-      ctx._path = new String.fromCharCodes(_path);
+      ctx._path = String.fromCharCodes(_path);
       */
 
     ctx._path = path;
     ctx._io = request;
 
-    return new Future.value(ctx);
+    return Future.value(ctx);
   }
 
   @override
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 3fc87659..eb4b49e9 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -51,7 +51,7 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   void useBuffer() {
-    _buffer = new LockableBytesBuilder();
+    _buffer = LockableBytesBuilder();
   }
 
   Iterable<String> __allowedEncodings;
@@ -92,7 +92,7 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
             rawResponse.contentLength;
       }
 
-      rawResponse.headers.contentType = new ContentType(
+      rawResponse.headers.contentType = ContentType(
           contentType.type, contentType.subtype,
           charset: contentType.parameters['charset'],
           parameters: contentType.parameters);
@@ -209,6 +209,6 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
       super.close();
     }
-    return new Future.value();
+    return Future.value();
   }
 }
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index 06e5875b..00b96a19 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -19,9 +19,9 @@ Future<SecureServerSocket> startSharedHttp2(
 class AngelHttp2 extends Driver<Socket, ServerTransportStream,
     SecureServerSocket, Http2RequestContext, Http2ResponseContext> {
   final ServerSettings settings;
-  final StreamController<HttpRequest> _onHttp1 = new StreamController();
+  final StreamController<HttpRequest> _onHttp1 = StreamController();
   final Map<String, MockHttpSession> _sessions = {};
-  final Uuid _uuid = new Uuid();
+  final Uuid _uuid = Uuid();
   _AngelHttp2ServerSocket _artificial;
 
   SecureServerSocket get socket => _artificial;
@@ -39,7 +39,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
 
   factory AngelHttp2(Angel app, SecurityContext securityContext,
       {bool useZone = true, ServerSettings settings}) {
-    return new AngelHttp2.custom(app, securityContext, SecureServerSocket.bind,
+    return AngelHttp2.custom(app, securityContext, SecureServerSocket.bind,
         settings: settings);
   }
 
@@ -50,10 +50,10 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
           address, int port, SecurityContext ctx),
       {bool useZone = true,
       ServerSettings settings}) {
-    return new AngelHttp2._(app, (address, port) {
+    return AngelHttp2._(app, (address, port) {
       var addr = address is InternetAddress
           ? address
-          : new InternetAddress(address.toString());
+          : InternetAddress(address.toString());
       return Future.sync(() => serverGenerator(addr, port, ctx));
     }, useZone, settings);
   }
@@ -64,7 +64,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
   @override
   Future<SecureServerSocket> generateServer([address, int port]) async {
     var s = await serverGenerator(address ?? '127.0.0.1', port ?? 0);
-    return _artificial = new _AngelHttp2ServerSocket(s, this);
+    return _artificial = _AngelHttp2ServerSocket(s, this);
   }
 
   @override
@@ -75,15 +75,15 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
 
   @override
   void addCookies(ServerTransportStream response, Iterable<Cookie> cookies) {
-    var headers = cookies
-        .map((cookie) => new Header.ascii('set-cookie', cookie.toString()));
+    var headers =
+        cookies.map((cookie) => Header.ascii('set-cookie', cookie.toString()));
     response.sendHeaders(headers.toList());
   }
 
   @override
   Future closeResponse(ServerTransportStream response) {
     response.terminate();
-    return new Future.value();
+    return Future.value();
   }
 
   @override
@@ -96,7 +96,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
   Future<Http2ResponseContext> createResponseContext(
       Socket request, ServerTransportStream response,
       [Http2RequestContext correspondingRequest]) async {
-    return new Http2ResponseContext(app, response, correspondingRequest)
+    return Http2ResponseContext(app, response, correspondingRequest)
       ..encoders.addAll(app.encoders);
   }
 
@@ -104,7 +104,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
   Stream<ServerTransportStream> createResponseStreamFromRawRequest(
       Socket request) {
     var connection =
-        new ServerTransportConnection.viaSocket(request, settings: settings);
+        ServerTransportConnection.viaSocket(request, settings: settings);
     return connection.incomingStreams;
   }
 
@@ -120,12 +120,12 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
 
   @override
   void setHeader(ServerTransportStream response, String key, String value) {
-    response.sendHeaders([new Header.ascii(key, value)]);
+    response.sendHeaders([Header.ascii(key, value)]);
   }
 
   @override
   void setStatusCode(ServerTransportStream response, int value) {
-    response.sendHeaders([new Header.ascii(':status', value.toString())]);
+    response.sendHeaders([Header.ascii(':status', value.toString())]);
   }
 
   @override
@@ -147,7 +147,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
 
 class _FakeServerSocket extends Stream<Socket> implements ServerSocket {
   final _AngelHttp2ServerSocket angel;
-  final _ctrl = new StreamController<Socket>();
+  final _ctrl = StreamController<Socket>();
 
   _FakeServerSocket(this.angel);
 
@@ -175,13 +175,13 @@ class _AngelHttp2ServerSocket extends Stream<SecureSocket>
     implements SecureServerSocket {
   final SecureServerSocket socket;
   final AngelHttp2 driver;
-  final _ctrl = new StreamController<SecureSocket>();
+  final _ctrl = StreamController<SecureSocket>();
   _FakeServerSocket _fake;
   StreamSubscription _sub;
 
   _AngelHttp2ServerSocket(this.socket, this.driver) {
-    _fake = new _FakeServerSocket(this);
-    new HttpServer.listenOn(_fake).pipe(driver._onHttp1);
+    _fake = _FakeServerSocket(this);
+    HttpServer.listenOn(_fake).pipe(driver._onHttp1);
     _sub = socket.listen(
       (socket) {
         if (socket.selectedProtocol == null ||
@@ -193,7 +193,7 @@ class _AngelHttp2ServerSocket extends Stream<SecureSocket>
           _ctrl.add(socket);
         } else {
           socket.destroy();
-          throw new Exception(
+          throw Exception(
               'AngelHttp2 does not support ${socket.selectedProtocol} as an ALPN protocol.');
         }
       },
diff --git a/lib/src/http2/http2_request_context.dart b/lib/src/http2/http2_request_context.dart
index 4c61286a..de4953d8 100644
--- a/lib/src/http2/http2_request_context.dart
+++ b/lib/src/http2/http2_request_context.dart
@@ -7,11 +7,11 @@ import 'package:http2/transport.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:uuid/uuid.dart';
 
-final RegExp _comma = new RegExp(r',\s*');
-final RegExp _straySlashes = new RegExp(r'(^/+)|(/+$)');
+final RegExp _comma = RegExp(r',\s*');
+final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)');
 
 class Http2RequestContext extends RequestContext<ServerTransportStream> {
-  final StreamController<List<int>> _body = new StreamController();
+  final StreamController<List<int>> _body = StreamController();
   final Container container;
   List<Cookie> _cookies;
   HttpHeaders _headers;
@@ -32,13 +32,13 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
       Angel app,
       Map<String, MockHttpSession> sessions,
       Uuid uuid) {
-    var c = new Completer<Http2RequestContext>();
-    var req = new Http2RequestContext._(app.container.createChild())
+    var c = Completer<Http2RequestContext>();
+    var req = Http2RequestContext._(app.container.createChild())
       ..app = app
       .._socket = socket
       .._stream = stream;
 
-    var headers = req._headers = new MockHttpHeaders();
+    var headers = req._headers = MockHttpHeaders();
     // String scheme = 'https', host = socket.address.address, path = '';
     var uri =
         Uri(scheme: 'https', host: socket.address.address, port: socket.port);
@@ -46,7 +46,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
 
     void finalize() {
       req
-        .._cookies = new List.unmodifiable(cookies)
+        .._cookies = List.unmodifiable(cookies)
         .._uri = uri;
       if (!c.isCompleted) c.complete(req);
     }
@@ -97,7 +97,7 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
 
               for (var cookieString in cookieStrings) {
                 try {
-                  cookies.add(new Cookie.fromSetCookieValue(cookieString));
+                  cookies.add(Cookie.fromSetCookieValue(cookieString));
                 } catch (_) {
                   // Ignore malformed cookies, and just don't add them to the container.
                 }
@@ -127,12 +127,12 @@ class Http2RequestContext extends RequestContext<ServerTransportStream> {
         cookies.firstWhere((c) => c.name == 'DARTSESSID', orElse: () => null);
 
     if (dartSessId == null) {
-      dartSessId = new Cookie('DARTSESSID', uuid.v4());
+      dartSessId = Cookie('DARTSESSID', uuid.v4());
     }
 
     req._session = sessions.putIfAbsent(
       dartSessId.value,
-      () => new MockHttpSession(id: dartSessId.value),
+      () => MockHttpSession(id: dartSessId.value),
     );
 
     return c.future;
diff --git a/lib/src/http2/http2_response_context.dart b/lib/src/http2/http2_response_context.dart
index 99557e53..594ca7ec 100644
--- a/lib/src/http2/http2_response_context.dart
+++ b/lib/src/http2/http2_response_context.dart
@@ -34,7 +34,7 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
   bool get canPush => stream.canPush;
 
   /// Returns a [List] of all resources that have [push]ed to the client.
-  List<Http2ResponseContext> get pushes => new List.unmodifiable(_pushes);
+  List<Http2ResponseContext> get pushes => List.unmodifiable(_pushes);
 
   @override
   ServerTransportStream detach() {
@@ -65,7 +65,7 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
 
   @override
   void useBuffer() {
-    _buffer = new LockableBytesBuilder();
+    _buffer = LockableBytesBuilder();
   }
 
   /// Write headers, status, etc. to the underlying [stream].
@@ -73,7 +73,7 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
     if (_isPush || _streamInitialized) return false;
 
     var headers = <Header>[
-      new Header.ascii(':status', statusCode.toString()),
+      Header.ascii(':status', statusCode.toString()),
     ];
 
     if (encoders.isNotEmpty && correspondingRequest != null) {
@@ -98,15 +98,15 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
 
     // Add all normal headers
     for (var key in this.headers.keys) {
-      headers.add(new Header.ascii(key.toLowerCase(), this.headers[key]));
+      headers.add(Header.ascii(key.toLowerCase(), this.headers[key]));
     }
 
     // Persist session ID
-    cookies.add(new Cookie('DARTSESSID', _req.session.id));
+    cookies.add(Cookie('DARTSESSID', _req.session.id));
 
     // Send all cookies
     for (var cookie in cookies) {
-      headers.add(new Header.ascii('set-cookie', cookie.toString()));
+      headers.add(Header.ascii('set-cookie', cookie.toString()));
     }
 
     stream.sendHeaders(headers);
@@ -210,18 +210,18 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
     var targetUri = _req.uri.replace(path: path);
 
     var h = <Header>[
-      new Header.ascii(':authority', targetUri.authority),
-      new Header.ascii(':method', method),
-      new Header.ascii(':path', targetUri.path),
-      new Header.ascii(':scheme', targetUri.scheme),
+      Header.ascii(':authority', targetUri.authority),
+      Header.ascii(':method', method),
+      Header.ascii(':path', targetUri.path),
+      Header.ascii(':scheme', targetUri.scheme),
     ];
 
     for (var key in headers.keys) {
-      h.add(new Header.ascii(key, headers[key]));
+      h.add(Header.ascii(key, headers[key]));
     }
 
     var s = stream.push(h);
-    var r = new Http2ResponseContext(app, s, _req)
+    var r = Http2ResponseContext(app, s, _req)
       .._isPush = true
       .._targetUri = targetUri;
     _pushes.add(r);
diff --git a/lib/src/safe_stream_controller.dart b/lib/src/safe_stream_controller.dart
index 558d1082..836df164 100644
--- a/lib/src/safe_stream_controller.dart
+++ b/lib/src/safe_stream_controller.dart
@@ -4,9 +4,9 @@ typedef void _InitCallback();
 
 /// A [StreamController] boilerplate that prevents memory leaks.
 abstract class SafeCtrl<T> {
-  factory SafeCtrl() => new _SingleSafeCtrl();
+  factory SafeCtrl() => _SingleSafeCtrl();
 
-  factory SafeCtrl.broadcast() => new _BroadcastSafeCtrl();
+  factory SafeCtrl.broadcast() => _BroadcastSafeCtrl();
 
   Stream<T> get stream;
 
@@ -25,7 +25,7 @@ class _SingleSafeCtrl<T> implements SafeCtrl<T> {
   _InitCallback _initializer;
 
   _SingleSafeCtrl() {
-    _stream = new StreamController<T>(onListen: () {
+    _stream = StreamController<T>(onListen: () {
       _hasListener = true;
 
       if (!_initialized && _initializer != null) {
@@ -79,7 +79,7 @@ class _BroadcastSafeCtrl<T> implements SafeCtrl<T> {
   _InitCallback _initializer;
 
   _BroadcastSafeCtrl() {
-    _stream = new StreamController<T>.broadcast(onListen: () {
+    _stream = StreamController<T>.broadcast(onListen: () {
       _listeners++;
 
       if (!_initialized && _initializer != null) {
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 8ae812b8..bda41d9e 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -1,6 +1,6 @@
 import 'package:angel_container/angel_container.dart';
 
-final RegExp straySlashes = new RegExp(r'(^/+)|(/+$)');
+final RegExp straySlashes = RegExp(r'(^/+)|(/+$)');
 
 T matchingAnnotation<T>(List<ReflectedInstance> metadata) {
   for (ReflectedInstance metaDatum in metadata) {
diff --git a/performance/hello/main.dart b/performance/hello/main.dart
index 12d3d81a..52358e9a 100644
--- a/performance/hello/main.dart
+++ b/performance/hello/main.dart
@@ -5,8 +5,8 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 
 main() async {
-  var app = new Angel();
-  var http = new AngelHttp.custom(app, startShared, useZone: false);
+  var app = Angel();
+  var http = AngelHttp.custom(app, startShared, useZone: false);
 
   app.get('/', (req, res) => res.write('Hello, world!'));
   app.optimizeForProduction(force: true);
diff --git a/test/accepts_test.dart b/test/accepts_test.dart
index 72cd4aae..6e670e4c 100644
--- a/test/accepts_test.dart
+++ b/test/accepts_test.dart
@@ -59,10 +59,10 @@ main() {
 Future<RequestContext> acceptContentTypes(
     [Iterable<String> contentTypes = const []]) {
   var headerString = contentTypes.isEmpty ? null : contentTypes.join(',');
-  var rq = new MockHttpRequest('GET', ENDPOINT);
+  var rq = MockHttpRequest('GET', ENDPOINT);
   rq.headers.set('accept', headerString);
   rq.close();
-  var app = new Angel(reflector: MirrorsReflector());
-  var http = new AngelHttp(app);
+  var app = Angel(reflector: MirrorsReflector());
+  var http = AngelHttp(app);
   return http.createRequestContext(rq, rq.response);
 }
diff --git a/test/anonymous_service_test.dart b/test/anonymous_service_test.dart
index 8aa8321b..41456a15 100644
--- a/test/anonymous_service_test.dart
+++ b/test/anonymous_service_test.dart
@@ -3,7 +3,7 @@ import 'package:test/test.dart';
 
 main() {
   test('custom methods', () async {
-    var svc = new AnonymousService<String, String>(
+    var svc = AnonymousService<String, String>(
         index: ([p]) async => ['index'],
         read: (id, [p]) async => 'read',
         create: (data, [p]) async => 'create',
@@ -20,21 +20,21 @@ main() {
 
   test('defaults to throwing', () async {
     try {
-      var svc = new AnonymousService();
+      var svc = AnonymousService();
       await svc.read(1);
       throw 'Should have thrown 405!';
     } on AngelHttpException {
       // print('Ok!');
     }
     try {
-      var svc = new AnonymousService();
+      var svc = AnonymousService();
       await svc.modify(2, null);
       throw 'Should have thrown 405!';
     } on AngelHttpException {
       // print('Ok!');
     }
     try {
-      var svc = new AnonymousService();
+      var svc = AnonymousService();
       await svc.update(3, null);
       throw 'Should have thrown 405!';
     } on AngelHttpException {
diff --git a/test/common.dart b/test/common.dart
index 0e028dcb..0227f8a1 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -32,12 +32,12 @@ incrementTodoTimes(e) {
   IncrementService.TIMES++;
 }
 
-@Hooks(before: const [incrementTodoTimes])
+@Hooks(before: [incrementTodoTimes])
 class IncrementService extends Service {
   static int TIMES = 0;
 
   @override
-  @Hooks(after: const [incrementTodoTimes])
+  @Hooks(after: [incrementTodoTimes])
   index([params]) async => [];
 }
 
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 2a470a29..8701bfc6 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -13,7 +13,7 @@ import 'common.dart';
 
 @Expose("/todos", middleware: [foo])
 class TodoController extends Controller {
-  List<Todo> todos = [new Todo(text: "Hello", over: "world")];
+  List<Todo> todos = [Todo(text: "Hello", over: "world")];
 
   @Expose("/:id", middleware: [bar])
   Future<Todo> fetchTodo(
@@ -34,7 +34,7 @@ class NoExposeController extends Controller {}
 
 @Expose('/named', as: 'foo')
 class NamedController extends Controller {
-  @Expose('/optional/:arg?', allowNull: const ['arg'])
+  @Expose('/optional/:arg?', allowNull: ['arg'])
   optional() => 2;
 }
 
@@ -52,11 +52,11 @@ main() {
   Angel app;
   TodoController ctrl;
   HttpServer server;
-  http.Client client = new http.Client();
+  http.Client client = http.Client();
   String url;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector());
+    app = Angel(reflector: MirrorsReflector());
     app.get(
         "/redirect",
         (req, res) async =>
@@ -64,7 +64,7 @@ main() {
 
     // Register as a singleton, just for the purpose of this test
     if (!app.container.has<TodoController>())
-      app.container.registerSingleton(ctrl = new TodoController());
+      app.container.registerSingleton(ctrl = TodoController());
 
     // Using mountController<T>();
     await app.mountController<TodoController>();
@@ -72,7 +72,7 @@ main() {
     print(app.controllers);
     app.dumpTree();
 
-    server = await new AngelHttp(app).startServer();
+    server = await AngelHttp(app).startServer();
     url = 'http://${server.address.address}:${server.port}';
   });
 
@@ -88,8 +88,8 @@ main() {
 
   test('require expose', () async {
     try {
-      var app = new Angel(reflector: MirrorsReflector());
-      await app.configure(new NoExposeController().configureServer);
+      var app = Angel(reflector: MirrorsReflector());
+      await app.configure(NoExposeController().configureServer);
       throw 'Should require @Expose';
     } on Exception {
       // :)
@@ -97,26 +97,26 @@ main() {
   });
 
   test('create dynamic handler', () async {
-    var app = new Angel(reflector: MirrorsReflector());
+    var app = Angel(reflector: MirrorsReflector());
     app.get(
         '/foo',
         ioc(({String bar}) {
           return 2;
         }, optional: ['bar']));
-    var rq = new MockHttpRequest('GET', new Uri(path: 'foo'));
-    await new AngelHttp(app).handleRequest(rq);
+    var rq = MockHttpRequest('GET', Uri(path: 'foo'));
+    await AngelHttp(app).handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
     expect(json.decode(body), 2);
   });
 
   test('optional name', () async {
-    var app = new Angel(reflector: MirrorsReflector());
-    await app.configure(new NamedController().configureServer);
+    var app = Angel(reflector: MirrorsReflector());
+    await app.configure(NamedController().configureServer);
     expect(app.controllers['foo'], const IsInstanceOf<NamedController>());
   });
 
   test("middleware", () async {
-    var rgx = new RegExp("^Hello, world!");
+    var rgx = RegExp("^Hello, world!");
     var response = await client.get("$url/todos/0");
     print('Response: ${response.body}');
 
diff --git a/test/detach_test.dart b/test/detach_test.dart
index 481557fa..fcd4af84 100644
--- a/test/detach_test.dart
+++ b/test/detach_test.dart
@@ -8,8 +8,8 @@ void main() {
   AngelHttp http;
 
   setUp(() async {
-    var app = new Angel();
-    http = new AngelHttp(app);
+    var app = Angel();
+    http = AngelHttp(app);
 
     app.get('/detach', (req, res) async {
       if (res is HttpResponseContext) {
@@ -17,7 +17,7 @@ void main() {
         io..write('Hey!');
         await io.close();
       } else {
-        throw new StateError('This endpoint only supports HTTP/1.1.');
+        throw StateError('This endpoint only supports HTTP/1.1.');
       }
     });
   });
@@ -25,7 +25,7 @@ void main() {
   tearDown(() => http.close());
 
   test('detach response', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/detach'));
+    var rq = MockHttpRequest('GET', Uri.parse('/detach'));
     await rq.close();
     var rs = rq.response;
     await http.handleRequest(rq);
diff --git a/test/di_test.dart b/test/di_test.dart
index c46315b7..8b23eb43 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -21,11 +21,11 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector());
-    client = new http.Client();
+    app = Angel(reflector: MirrorsReflector());
+    client = http.Client();
 
     // Inject some todos
-    app.container.registerSingleton(new Todo(text: TEXT, over: OVER));
+    app.container.registerSingleton(Todo(text: TEXT, over: OVER));
     app.container.registerFactory<Future<Foo>>((container) async {
       var req = container.make<RequestContext>();
       var text = await req.body.transform(utf8.decoder).join();
@@ -38,10 +38,10 @@ main() {
         ioc(({Errand singleton, Todo foo, RequestContext req}) =>
             singleton.text));
     app.post('/async', ioc((Foo foo) => {'baz': foo.bar}));
-    await app.configure(new SingletonController().configureServer);
-    await app.configure(new ErrandController().configureServer);
+    await app.configure(SingletonController().configureServer);
+    await app.configure(ErrandController().configureServer);
 
-    server = await new AngelHttp(app).startServer();
+    server = await AngelHttp(app).startServer();
     url = "http://${server.address.host}:${server.port}";
   });
 
@@ -54,18 +54,18 @@ main() {
   });
 
   test('runContained with custom container', () async {
-    var app = new Angel();
-    var c = new Container(const MirrorsReflector());
-    c.registerSingleton(new Todo(text: 'Hey!'));
+    var app = Angel();
+    var c = Container(const MirrorsReflector());
+    c.registerSingleton(Todo(text: 'Hey!'));
 
     app.get('/', (req, res) async {
       return app.runContained((Todo t) => t.text, req, res, c);
     });
 
-    var rq = new MockHttpRequest('GET', new Uri(path: '/'));
+    var rq = MockHttpRequest('GET', Uri(path: '/'));
     await rq.close();
     var rs = rq.response;
-    await new AngelHttp(app).handleRequest(rq);
+    await AngelHttp(app).handleRequest(rq);
     var text = await rs.transform(utf8.decoder).join();
     expect(text, json.encode('Hey!'));
   });
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 07aea608..1b41b9c3 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -11,7 +11,7 @@ import 'package:test/test.dart';
 
 Future<List<int>> getBody(MockHttpResponse rs) async {
   var list = await rs.toList();
-  var bb = new BytesBuilder();
+  var bb = BytesBuilder();
   list.forEach(bb.add);
   return bb.takeBytes();
 }
@@ -20,7 +20,7 @@ main() {
   Angel app;
 
   setUp(() {
-    app = new Angel(reflector: MirrorsReflector());
+    app = Angel(reflector: MirrorsReflector());
     app.encoders.addAll(
       {
         'deflate': zlib.encoder,
@@ -47,11 +47,11 @@ void encodingTests(Angel getApp()) {
 
     setUp(() {
       app = getApp();
-      http = new AngelHttp(app);
+      http = AngelHttp(app);
     });
 
     test('sends plaintext if no accept-encoding', () async {
-      var rq = new MockHttpRequest('GET', Uri.parse('/hello'));
+      var rq = MockHttpRequest('GET', Uri.parse('/hello'));
       await rq.close();
       var rs = rq.response;
       await http.handleRequest(rq);
@@ -61,7 +61,7 @@ void encodingTests(Angel getApp()) {
     });
 
     test('encodes if wildcard', () async {
-      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+      var rq = MockHttpRequest('GET', Uri.parse('/hello'))
         ..headers.set('accept-encoding', '*');
       await rq.close();
       var rs = rq.response;
@@ -74,7 +74,7 @@ void encodingTests(Angel getApp()) {
     });
 
     test('encodes if wildcard + multiple', () async {
-      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+      var rq = MockHttpRequest('GET', Uri.parse('/hello'))
         ..headers.set('accept-encoding', ['foo', 'bar', '*']);
       await rq.close();
       var rs = rq.response;
@@ -86,7 +86,7 @@ void encodingTests(Angel getApp()) {
     });
 
     test('encodes if explicit', () async {
-      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+      var rq = MockHttpRequest('GET', Uri.parse('/hello'))
         ..headers.set('accept-encoding', 'gzip');
       await rq.close();
       var rs = rq.response;
@@ -98,7 +98,7 @@ void encodingTests(Angel getApp()) {
     });
 
     test('only uses one encoder', () async {
-      var rq = new MockHttpRequest('GET', Uri.parse('/hello'))
+      var rq = MockHttpRequest('GET', Uri.parse('/hello'))
         ..headers.set('accept-encoding', ['gzip', 'deflate']);
       await rq.close();
       var rs = rq.response;
diff --git a/test/exception_test.dart b/test/exception_test.dart
index 3bd6ec5c..ec08b3ef 100644
--- a/test/exception_test.dart
+++ b/test/exception_test.dart
@@ -5,54 +5,51 @@ import 'package:test/test.dart';
 
 main() {
   test('named constructors', () {
-    expect(new AngelHttpException.badRequest(),
-        isException(400, '400 Bad Request'));
-    expect(new AngelHttpException.notAuthenticated(),
+    expect(
+        AngelHttpException.badRequest(), isException(400, '400 Bad Request'));
+    expect(AngelHttpException.notAuthenticated(),
         isException(401, '401 Not Authenticated'));
-    expect(new AngelHttpException.paymentRequired(),
+    expect(AngelHttpException.paymentRequired(),
         isException(402, '402 Payment Required'));
-    expect(
-        new AngelHttpException.forbidden(), isException(403, '403 Forbidden'));
-    expect(
-        new AngelHttpException.notFound(), isException(404, '404 Not Found'));
-    expect(new AngelHttpException.methodNotAllowed(),
+    expect(AngelHttpException.forbidden(), isException(403, '403 Forbidden'));
+    expect(AngelHttpException.notFound(), isException(404, '404 Not Found'));
+    expect(AngelHttpException.methodNotAllowed(),
         isException(405, '405 Method Not Allowed'));
-    expect(new AngelHttpException.notAcceptable(),
+    expect(AngelHttpException.notAcceptable(),
         isException(406, '406 Not Acceptable'));
-    expect(new AngelHttpException.methodTimeout(),
-        isException(408, '408 Timeout'));
-    expect(new AngelHttpException.conflict(), isException(409, '409 Conflict'));
-    expect(new AngelHttpException.notProcessable(),
+    expect(AngelHttpException.methodTimeout(), isException(408, '408 Timeout'));
+    expect(AngelHttpException.conflict(), isException(409, '409 Conflict'));
+    expect(AngelHttpException.notProcessable(),
         isException(422, '422 Not Processable'));
-    expect(new AngelHttpException.notImplemented(),
+    expect(AngelHttpException.notImplemented(),
         isException(501, '501 Not Implemented'));
-    expect(new AngelHttpException.unavailable(),
-        isException(503, '503 Unavailable'));
+    expect(
+        AngelHttpException.unavailable(), isException(503, '503 Unavailable'));
   });
 
   test('fromMap', () {
-    expect(new AngelHttpException.fromMap({'status_code': -1, 'message': 'ok'}),
+    expect(AngelHttpException.fromMap({'status_code': -1, 'message': 'ok'}),
         isException(-1, 'ok'));
   });
 
   test('toMap = toJson', () {
-    var exc = new AngelHttpException.badRequest();
+    var exc = AngelHttpException.badRequest();
     expect(exc.toMap(), exc.toJson());
     var json_ = json.encode(exc.toJson());
-    var exc2 = new AngelHttpException.fromJson(json_);
+    var exc2 = AngelHttpException.fromJson(json_);
     expect(exc2.toJson(), exc.toJson());
   });
 
   test('toString', () {
     expect(
-        new AngelHttpException(null, statusCode: 420, message: 'Blaze It')
+        AngelHttpException(null, statusCode: 420, message: 'Blaze It')
             .toString(),
         '420: Blaze It');
   });
 }
 
 Matcher isException(int statusCode, String message) =>
-    new _IsException(statusCode, message);
+    _IsException(statusCode, message);
 
 class _IsException extends Matcher {
   final int statusCode;
diff --git a/test/extension_test.dart b/test/extension_test.dart
index 0ef019a7..e061dc4e 100644
--- a/test/extension_test.dart
+++ b/test/extension_test.dart
@@ -25,8 +25,8 @@ main() {
 }
 
 Future<RequestContext> makeRequest(String path) {
-  var rq = new MockHttpRequest('GET', ENDPOINT.replace(path: path))..close();
-  var app = new Angel(reflector: MirrorsReflector());
-  var http = new AngelHttp(app);
+  var rq = MockHttpRequest('GET', ENDPOINT.replace(path: path))..close();
+  var app = Angel(reflector: MirrorsReflector());
+  var http = AngelHttp(app);
   return http.createRequestContext(rq, rq.response);
 }
diff --git a/test/find_one_test.dart b/test/find_one_test.dart
index 530047ff..5a576fd4 100644
--- a/test/find_one_test.dart
+++ b/test/find_one_test.dart
@@ -7,17 +7,17 @@ void main() {
       throwsA(const IsInstanceOf<AngelHttpException>());
 
   test('throw 404 on null', () {
-    var service = new AnonymousService(index: ([p]) => null);
+    var service = AnonymousService(index: ([p]) => null);
     expect(() => service.findOne(), throwsAnAngelHttpException);
   });
 
   test('throw 404 on empty iterable', () {
-    var service = new AnonymousService(index: ([p]) => []);
+    var service = AnonymousService(index: ([p]) => []);
     expect(() => service.findOne(), throwsAnAngelHttpException);
   });
 
   test('return first element of iterable', () async {
-    var service = new AnonymousService(index: ([p]) => [2]);
+    var service = AnonymousService(index: ([p]) => [2]);
     expect(await service.findOne(), 2);
   });
 }
diff --git a/test/general_test.dart b/test/general_test.dart
index 129a3241..e2fd564d 100644
--- a/test/general_test.dart
+++ b/test/general_test.dart
@@ -13,12 +13,12 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector())
+    app = Angel(reflector: MirrorsReflector())
       ..post('/foo', (req, res) => res.serialize({'hello': 'world'}))
-      ..all('*', (req, res) => throw new AngelHttpException.notFound());
-    client = new http.Client();
+      ..all('*', (req, res) => throw AngelHttpException.notFound());
+    client = http.Client();
 
-    server = await new AngelHttp(app).startServer();
+    server = await AngelHttp(app).startServer();
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/hm.dart b/test/hm.dart
index 4231a923..fb10cec0 100644
--- a/test/hm.dart
+++ b/test/hm.dart
@@ -4,7 +4,7 @@ import 'all.dart' as hm;
 
 main() async {
   var zone = Zone.current.fork(
-    specification: new ZoneSpecification(print: (self, parent, zone, line) {
+    specification: ZoneSpecification(print: (self, parent, zone, line) {
       if (line == 'null') {
         parent.print(zone, cyan.wrap(StackTrace.current.toString()));
       }
diff --git a/test/hooked_test.dart b/test/hooked_test.dart
index db162309..38fa4a9e 100644
--- a/test/hooked_test.dart
+++ b/test/hooked_test.dart
@@ -20,10 +20,10 @@ main() {
   HookedService todoService;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector());
-    client = new http.Client();
-    app.use('/todos', new MapService());
-    app.use('/books', new BookService());
+    app = Angel(reflector: MirrorsReflector());
+    client = http.Client();
+    app.use('/todos', MapService());
+    app.use('/books', BookService());
 
     todoService = app.findHookedService<MapService>('todos');
 
@@ -35,7 +35,7 @@ main() {
       throw e.error;
     };
 
-    server = await new AngelHttp(app).startServer();
+    server = await AngelHttp(app).startServer();
     url = "http://${server.address.host}:${server.port}";
   });
 
@@ -106,7 +106,7 @@ main() {
   });
 
   test('metadata', () async {
-    final service = new HookedService(new IncrementService())..addHooks(app);
+    final service = HookedService(IncrementService())..addHooks(app);
     expect(service.inner, isNot(const IsInstanceOf<MapService>()));
     IncrementService.TIMES = 0;
     await service.index();
@@ -131,7 +131,7 @@ main() {
   });
 
   test('contains provider in before and after', () async {
-    var svc = new HookedService(new AnonymousService(index: ([p]) async => []));
+    var svc = HookedService(AnonymousService(index: ([p]) async => []));
 
     ensureProviderIsPresent(HookedServiceEvent e) {
       var type = e.isBefore ? 'before' : 'after';
diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
index dddfa503..701f985c 100644
--- a/test/http2/adapter_test.dart
+++ b/test/http2/adapter_test.dart
@@ -17,18 +17,17 @@ const String jfk =
     'Ask not what your country can do for you, but what you can do for your country.';
 
 Stream<List<int>> jfkStream() {
-  return new Stream.fromIterable([utf8.encode(jfk)]);
+  return Stream.fromIterable([utf8.encode(jfk)]);
 }
 
 void main() {
-  var client = new Http2Client();
+  var client = Http2Client();
   Angel app;
   AngelHttp2 http2;
   Uri serverRoot;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector())
-      ..encoders['gzip'] = gzip.encoder;
+    app = Angel(reflector: MirrorsReflector())..encoders['gzip'] = gzip.encoder;
     hierarchicalLoggingEnabled = true;
     app.logger = Logger.detached('angel.http2')
       ..onRecord.listen((rec) {
@@ -93,12 +92,12 @@ void main() {
       return req.queryParameters;
     });
 
-    var ctx = new SecurityContext()
+    var ctx = SecurityContext()
       ..useCertificateChain('dev.pem')
       ..usePrivateKey('dev.key', password: 'dartdart')
       ..setAlpnProtocols(['h2'], true);
 
-    http2 = new AngelHttp2(app, ctx);
+    http2 = AngelHttp2(app, ctx);
 
     var server = await http2.startServer();
     serverRoot = Uri.parse('https://127.0.0.1:${server.port}');
@@ -181,16 +180,16 @@ void main() {
       supportedProtocols: ['h2'],
     );
 
-    var connection = new ClientTransportConnection.viaSocket(
+    var connection = ClientTransportConnection.viaSocket(
       socket,
-      settings: new ClientSettings(allowServerPushes: true),
+      settings: ClientSettings(allowServerPushes: true),
     );
 
     var headers = <Header>[
-      new Header.ascii(':authority', serverRoot.authority),
-      new Header.ascii(':method', 'GET'),
-      new Header.ascii(':path', serverRoot.replace(path: '/push').path),
-      new Header.ascii(':scheme', serverRoot.scheme),
+      Header.ascii(':authority', serverRoot.authority),
+      Header.ascii(':method', 'GET'),
+      Header.ascii(':path', serverRoot.replace(path: '/push').path),
+      Header.ascii(':scheme', serverRoot.scheme),
     ];
 
     var stream = await connection.makeRequest(headers, endStream: true);
@@ -198,8 +197,7 @@ void main() {
     var bb = await stream.incomingMessages
         .where((s) => s is DataStreamMessage)
         .cast<DataStreamMessage>()
-        .fold<BytesBuilder>(
-            new BytesBuilder(), (out, msg) => out..add(msg.bytes));
+        .fold<BytesBuilder>(BytesBuilder(), (out, msg) => out..add(msg.bytes));
 
     // Check that main body was sent
     expect(utf8.decode(bb.takeBytes()), 'ok');
@@ -231,7 +229,7 @@ void main() {
           .where((s) => s is DataStreamMessage)
           .cast<DataStreamMessage>()
           .fold<BytesBuilder>(
-              new BytesBuilder(), (out, msg) => out..add(msg.bytes));
+              BytesBuilder(), (out, msg) => out..add(msg.bytes));
       return UTF8.decode(bb.takeBytes());
     }
     */
@@ -268,14 +266,14 @@ void main() {
     });
 
     test('multipart body parsed', () async {
-      var rq = new http.MultipartRequest(
-          'POST', serverRoot.replace(path: '/upload'));
+      var rq =
+          http.MultipartRequest('POST', serverRoot.replace(path: '/upload'));
       rq.headers.addAll({'accept': 'application/json'});
 
       rq.fields['foo'] = 'bar';
-      rq.files.add(new http.MultipartFile(
-          'file', new Stream.fromIterable([utf8.encode('hello world')]), 11,
-          contentType: new MediaType('angel', 'framework')));
+      rq.files.add(http.MultipartFile(
+          'file', Stream.fromIterable([utf8.encode('hello world')]), 11,
+          contentType: MediaType('angel', 'framework')));
 
       var response = await client.send(rq);
       var responseBody = await response.stream.transform(utf8.decoder).join();
diff --git a/test/http2/http2_client.dart b/test/http2/http2_client.dart
index 5bf3d320..2bd767a1 100644
--- a/test/http2/http2_client.dart
+++ b/test/http2/http2_client.dart
@@ -17,29 +17,29 @@ class Http2Client extends BaseClient {
       supportedProtocols: ['h2'],
     );
 
-    var connection = new ClientTransportConnection.viaSocket(socket);
+    var connection = ClientTransportConnection.viaSocket(socket);
 
     var headers = <Header>[
-      new Header.ascii(':authority', request.url.authority),
-      new Header.ascii(':method', request.method),
-      new Header.ascii(
+      Header.ascii(':authority', request.url.authority),
+      Header.ascii(':method', request.method),
+      Header.ascii(
           ':path',
           request.url.path +
               (request.url.hasQuery ? ('?' + request.url.query) : '')),
-      new Header.ascii(':scheme', request.url.scheme),
+      Header.ascii(':scheme', request.url.scheme),
     ];
 
     var bb = await request
         .finalize()
-        .fold<BytesBuilder>(new BytesBuilder(), (out, list) => out..add(list));
+        .fold<BytesBuilder>(BytesBuilder(), (out, list) => out..add(list));
     var body = bb.takeBytes();
 
     if (body.isNotEmpty) {
-      headers.add(new Header.ascii('content-length', body.length.toString()));
+      headers.add(Header.ascii('content-length', body.length.toString()));
     }
 
     request.headers.forEach((k, v) {
-      headers.add(new Header.ascii(k, v));
+      headers.add(Header.ascii(k, v));
     });
 
     var stream = await connection.makeRequest(headers, endStream: body.isEmpty);
@@ -56,7 +56,7 @@ class Http2Client extends BaseClient {
   /// Returns `true` if the response stream was closed.
   static Future<bool> readResponse(ClientTransportStream stream,
       Map<String, String> headers, BytesBuilder body) {
-    var c = new Completer<bool>();
+    var c = Completer<bool>();
     var closed = false;
 
     stream.incomingMessages.listen(
@@ -86,10 +86,10 @@ class Http2Client extends BaseClient {
   Future<StreamedResponse> send(BaseRequest request) async {
     var stream = await convertRequestToStream(request);
     var headers = <String, String>{};
-    var body = new BytesBuilder();
+    var body = BytesBuilder();
     var closed = await readResponse(stream, headers, body);
-    return new StreamedResponse(
-      new Stream.fromIterable([body.takeBytes()]),
+    return StreamedResponse(
+      Stream.fromIterable([body.takeBytes()]),
       int.parse(headers[':status']),
       headers: headers,
       isRedirect: headers.containsKey('location'),
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 2c12c9e4..86ea7fa6 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -27,8 +27,8 @@ parameterMetaTests() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(reflector: MirrorsReflector());
-    http = new AngelHttp(app);
+    app = Angel(reflector: MirrorsReflector());
+    http = AngelHttp(app);
 
     app.get('/cookie', ioc((@CookieValue('token') String jwt) {
       return jwt;
@@ -58,7 +58,7 @@ parameterMetaTests() {
       return 'DEFAULT $mode';
     }));
 
-    /*app.logger = new Logger('parameter_meta_test')
+    /*app.logger = Logger('parameter_meta_test')
       ..onRecord.listen((rec) {
         print(rec);
         if (rec.error != null) print(rec.error);
@@ -69,7 +69,7 @@ parameterMetaTests() {
 
   test('injects header or throws', () async {
     // Invalid request
-    var rq = new MockHttpRequest('GET', Uri.parse('/header'));
+    var rq = MockHttpRequest('GET', Uri.parse('/header'));
     unawaited(rq.close());
     var rs = rq.response;
     unawaited(http.handleRequest(rq));
@@ -78,7 +78,7 @@ parameterMetaTests() {
     expect(rs.statusCode, 400);
 
     // Valid request
-    rq = new MockHttpRequest('GET', Uri.parse('/header'))
+    rq = MockHttpRequest('GET', Uri.parse('/header'))
       ..headers.add('x-foo', 'bar');
     unawaited(rq.close());
     rs = rq.response;
@@ -92,7 +92,7 @@ parameterMetaTests() {
 
   test('injects session or throws', () async {
     // Invalid request
-    var rq = new MockHttpRequest('GET', Uri.parse('/session'));
+    var rq = MockHttpRequest('GET', Uri.parse('/session'));
     unawaited(rq.close());
     var rs = rq.response;
     unawaited(http
@@ -103,7 +103,7 @@ parameterMetaTests() {
     await printResponse(rs);
     expect(rs.statusCode, 500);
 
-    rq = new MockHttpRequest('GET', Uri.parse('/session'));
+    rq = MockHttpRequest('GET', Uri.parse('/session'));
     rq.session['foo'] = 'bar';
     unawaited(rq.close());
     rs = rq.response;
@@ -118,7 +118,7 @@ parameterMetaTests() {
   // they will all function the same way.
 
   test('pattern matching', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/match?mode=pos'));
+    var rq = MockHttpRequest('GET', Uri.parse('/match?mode=pos'));
     unawaited(rq.close());
     var rs = rq.response;
     unawaited(http.handleRequest(rq));
@@ -127,7 +127,7 @@ parameterMetaTests() {
     expect(rs.statusCode, 200);
     expect(body, json.encode('YES pos'));
 
-    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=neg'));
+    rq = MockHttpRequest('GET', Uri.parse('/match?mode=neg'));
     unawaited(rq.close());
     rs = rq.response;
     unawaited(http.handleRequest(rq));
@@ -137,7 +137,7 @@ parameterMetaTests() {
     expect(body, json.encode('NO neg'));
 
     // Fallback
-    rq = new MockHttpRequest('GET', Uri.parse('/match?mode=ambi'));
+    rq = MockHttpRequest('GET', Uri.parse('/match?mode=ambi'));
     unawaited(rq.close());
     rs = rq.response;
     unawaited(http.handleRequest(rq));
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 736ee372..85eef412 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -9,16 +9,16 @@ import 'package:test/test.dart';
 
 main() {
   test('preinjects functions', () async {
-    var app = new Angel(reflector: MirrorsReflector())
+    var app = Angel(reflector: MirrorsReflector())
       ..configuration['foo'] = 'bar'
       ..get('/foo', ioc(echoAppFoo));
     app.optimizeForProduction(force: true);
     print(app.preContained);
     expect(app.preContained.keys, contains(echoAppFoo));
 
-    var rq = new MockHttpRequest('GET', new Uri(path: '/foo'));
+    var rq = MockHttpRequest('GET', Uri(path: '/foo'));
     unawaited(rq.close());
-    await new AngelHttp(app).handleRequest(rq);
+    await AngelHttp(app).handleRequest(rq);
     var rs = rq.response;
     var body = await rs.transform(utf8.decoder).join();
     expect(body, json.encode('bar'));
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 904f88f6..4a50beca 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -13,9 +13,9 @@ main() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(reflector: MirrorsReflector())
+    app = Angel(reflector: MirrorsReflector())
       ..configuration['global'] = 305; // Pitbull!
-    http = new AngelHttp(app);
+    http = AngelHttp(app);
 
     app.get('/string/:string', ioc((String string) => string));
 
@@ -39,7 +39,7 @@ main() {
   tearDown(() => app.close());
 
   test('String type annotation', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/string/hello'));
+    var rq = MockHttpRequest('GET', Uri.parse('/string/hello'));
     unawaited(rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
@@ -47,7 +47,7 @@ main() {
   });
 
   test('Primitive after parsed param injection', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/num/parsed/24'));
+    var rq = MockHttpRequest('GET', Uri.parse('/num/parsed/24'));
     unawaited(rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
@@ -55,7 +55,7 @@ main() {
   });
 
   test('globally-injected primitive', () async {
-    var rq = new MockHttpRequest('GET', Uri.parse('/num/global'));
+    var rq = MockHttpRequest('GET', Uri.parse('/num/global'));
     unawaited(rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
@@ -64,12 +64,12 @@ main() {
 
   test('unparsed primitive throws error', () async {
     try {
-      var rq = new MockHttpRequest('GET', Uri.parse('/num/unparsed/32'));
+      var rq = MockHttpRequest('GET', Uri.parse('/num/unparsed/32'));
       unawaited(rq.close());
       var req = await http.createRequestContext(rq, rq.response);
       var res = await http.createResponseContext(rq, rq.response, req);
       await app.runContained((num unparsed) => unparsed, req, res);
-      throw new StateError(
+      throw StateError(
           'ArgumentError should be thrown if a parameter cannot be resolved.');
     } on ArgumentError {
       // Success
diff --git a/test/repeat_request_test.dart b/test/repeat_request_test.dart
index 42af1ade..5a60f80e 100644
--- a/test/repeat_request_test.dart
+++ b/test/repeat_request_test.dart
@@ -9,14 +9,14 @@ import 'package:test/test.dart';
 
 main() {
   MockHttpRequest mk(int id) {
-    return new MockHttpRequest('GET', Uri.parse('/test/$id'))..close();
+    return MockHttpRequest('GET', Uri.parse('/test/$id'))..close();
   }
 
   test('can request the same url twice', () async {
-    var app = new Angel(reflector: MirrorsReflector())
+    var app = Angel(reflector: MirrorsReflector())
       ..get('/test/:id', ioc((id) => 'Hello $id'));
     var rq1 = mk(1), rq2 = mk(2), rq3 = mk(1);
-    await Future.wait([rq1, rq2, rq3].map(new AngelHttp(app).handleRequest));
+    await Future.wait([rq1, rq2, rq3].map(AngelHttp(app).handleRequest));
     var body1 = await rq1.response.transform(utf8.decoder).join(),
         body2 = await rq2.response.transform(utf8.decoder).join(),
         body3 = await rq3.response.transform(utf8.decoder).join();
diff --git a/test/routing_test.dart b/test/routing_test.dart
index fb4c0a38..3dfc3776 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -42,12 +42,12 @@ main() {
   http.Client client;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector());
-    nested = new Angel(reflector: MirrorsReflector());
-    todos = new Angel(reflector: MirrorsReflector());
+    app = Angel(reflector: MirrorsReflector());
+    nested = Angel(reflector: MirrorsReflector());
+    todos = Angel(reflector: MirrorsReflector());
 
     [app, nested, todos].forEach((Angel app) {
-      app.logger = new Logger('routing_test')
+      app.logger = Logger('routing_test')
         ..onRecord.listen((rec) {
           if (rec.error != null) {
             stdout
@@ -95,7 +95,7 @@ main() {
     app.get('/method', (req, res) => 'Only GET');
     app.post('/method', (req, res) => 'Only POST');
 
-    app.use('/query', new QueryService());
+    app.use('/query', QueryService());
 
     RequestHandler write(String message) {
       return (req, res) {
@@ -111,8 +111,8 @@ main() {
 
     //app.dumpTree(header: "DUMPING ROUTES:", showMatchers: true);
 
-    client = new http.Client();
-    var server = await new AngelHttp(app).startServer('127.0.0.1', 0);
+    client = http.Client();
+    var server = await AngelHttp(app).startServer('127.0.0.1', 0);
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index b3d3ccd5..764ad5ff 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -14,15 +14,15 @@ main() {
   String url;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector())
+    app = Angel(reflector: MirrorsReflector())
       ..get('/foo', ioc(() => {'hello': 'world'}))
       ..get('/bar', (req, res) async {
         await res.serialize({'hello': 'world'},
-            contentType: new MediaType('text', 'html'));
+            contentType: MediaType('text', 'html'));
       });
-    client = new http.Client();
+    client = http.Client();
 
-    server = await new AngelHttp(app).startServer();
+    server = await AngelHttp(app).startServer();
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/server_test.dart b/test/server_test.dart
index d00e9ce2..d6acf90d 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -15,9 +15,8 @@ final Uri $foo = Uri.parse('http://localhost:3000/foo');
 /// Additional tests to improve coverage of server.dart
 main() {
   group('scoping', () {
-    var parent = new Angel(reflector: MirrorsReflector())
-      ..configuration['two'] = 2;
-    var child = new Angel(reflector: MirrorsReflector());
+    var parent = Angel(reflector: MirrorsReflector())..configuration['two'] = 2;
+    var child = Angel(reflector: MirrorsReflector());
     parent.mount('/child', child);
 
     test('sets children', () {
@@ -34,20 +33,20 @@ main() {
   });
 
   test('custom server generator', () {
-    var app = new Angel(reflector: MirrorsReflector());
-    var http = new AngelHttp.custom(app, HttpServer.bind);
+    var app = Angel(reflector: MirrorsReflector());
+    var http = AngelHttp.custom(app, HttpServer.bind);
     expect(http.serverGenerator, HttpServer.bind);
   });
 
   test('default error handler', () async {
-    var app = new Angel(reflector: MirrorsReflector());
-    var http = new AngelHttp(app);
-    var rq = new MockHttpRequest('GET', $foo);
+    var app = Angel(reflector: MirrorsReflector());
+    var http = AngelHttp(app);
+    var rq = MockHttpRequest('GET', $foo);
     unawaited(rq.close());
     var rs = rq.response;
     var req = await http.createRequestContext(rq, rs);
     var res = await http.createResponseContext(rq, rs);
-    var e = new AngelHttpException(null,
+    var e = AngelHttpException(null,
         statusCode: 321, message: 'Hello', errors: ['foo', 'bar']);
     await app.errorHandler(e, req, res);
     await http.sendResponse(rq, rs, req, res);
@@ -63,10 +62,10 @@ main() {
   });
 
   test('plug-ins run on startup', () async {
-    var app = new Angel(reflector: MirrorsReflector());
+    var app = Angel(reflector: MirrorsReflector());
     app.startupHooks.add((app) => app.configuration['two'] = 2);
 
-    var http = new AngelHttp(app);
+    var http = AngelHttp(app);
     await http.startServer();
     expect(app.configuration['two'], 2);
     await app.close();
@@ -74,16 +73,16 @@ main() {
   });
 
   test('warning when adding routes to flattened router', () {
-    var app = new Angel(reflector: MirrorsReflector())
+    var app = Angel(reflector: MirrorsReflector())
       ..optimizeForProduction(force: true);
     app.dumpTree();
     app.get('/', (req, res) => 2);
-    app.mount('/foo', new Router()..get('/', (req, res) => 3));
+    app.mount('/foo', Router()..get('/', (req, res) => 3));
   });
 
   test('services close on close call', () async {
-    var app = new Angel(reflector: MirrorsReflector());
-    var svc = new CustomCloseService();
+    var app = Angel(reflector: MirrorsReflector());
+    var svc = CustomCloseService();
     expect(svc.value, 2);
     app.use('/', svc);
     await app.close();
@@ -91,11 +90,10 @@ main() {
   });
 
   test('global injection added to injection map', () async {
-    var app = new Angel(reflector: MirrorsReflector())
-      ..configuration['a'] = 'b';
-    var http = new AngelHttp(app);
+    var app = Angel(reflector: MirrorsReflector())..configuration['a'] = 'b';
+    var http = AngelHttp(app);
     app.get('/', ioc((String a) => a));
-    var rq = new MockHttpRequest('GET', Uri.parse('/'));
+    var rq = MockHttpRequest('GET', Uri.parse('/'));
     unawaited(rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
@@ -103,10 +101,10 @@ main() {
   });
 
   test('global injected serializer', () async {
-    var app = new Angel(reflector: MirrorsReflector())..serializer = (_) => 'x';
-    var http = new AngelHttp(app);
+    var app = Angel(reflector: MirrorsReflector())..serializer = (_) => 'x';
+    var http = AngelHttp(app);
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
-    var rq = new MockHttpRequest('GET', $foo);
+    var rq = MockHttpRequest('GET', $foo);
     unawaited(rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
@@ -114,15 +112,15 @@ main() {
   });
 
   group('handler results', () {
-    var app = new Angel(reflector: MirrorsReflector());
-    var http = new AngelHttp(app);
+    var app = Angel(reflector: MirrorsReflector());
+    var http = AngelHttp(app);
     app.responseFinalizers
-        .add((req, res) => throw new AngelHttpException.forbidden());
+        .add((req, res) => throw AngelHttpException.forbidden());
     RequestContext req;
     ResponseContext res;
 
     setUp(() async {
-      var rq = new MockHttpRequest('GET', $foo);
+      var rq = MockHttpRequest('GET', $foo);
       unawaited(rq.close());
       req = await http.createRequestContext(rq, rq.response);
       res = await http.createResponseContext(rq, rq.response);
@@ -138,14 +136,14 @@ main() {
       });
 
       test('return future', () async {
-        var handler = new Future.value(2);
+        var handler = Future.value(2);
         expect(await app.getHandlerResult(handler, req, res), 2);
       });
     });
 
     group('executeHandler', () {
       test('return Stream', () async {
-        var handler = (req, res) => new Stream.fromIterable([2, 3]);
+        var handler = (req, res) => Stream.fromIterable([2, 3]);
         expect(await app.executeHandler(handler, req, res), isFalse);
       });
 
@@ -161,10 +159,10 @@ main() {
     AngelHttp http;
 
     setUp(() async {
-      app = new Angel(reflector: MirrorsReflector());
-      app.get('/wtf', (req, res) => throw new AngelHttpException.forbidden());
-      app.get('/wtf2', (req, res) => throw new AngelHttpException.forbidden());
-      http = new AngelHttp(app);
+      app = Angel(reflector: MirrorsReflector());
+      app.get('/wtf', (req, res) => throw AngelHttpException.forbidden());
+      app.get('/wtf2', (req, res) => throw AngelHttpException.forbidden());
+      http = AngelHttp(app);
       await http.startServer('127.0.0.1', 0);
 
       var oldHandler = app.errorHandler;
@@ -178,7 +176,7 @@ main() {
     tearDown(() => app.close());
 
     test('can send json', () async {
-      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
+      var rq = MockHttpRequest('GET', Uri(path: 'wtf'))
         ..headers.set('accept', 'application/json');
       unawaited(rq.close());
       unawaited(http.handleRequest(rq));
@@ -188,7 +186,7 @@ main() {
     });
 
     test('can throw in finalizer', () async {
-      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf'))
+      var rq = MockHttpRequest('GET', Uri(path: 'wtf'))
         ..headers.set('accept', 'application/json');
       unawaited(rq.close());
       unawaited(http.handleRequest(rq));
@@ -198,7 +196,7 @@ main() {
     });
 
     test('can send html', () async {
-      var rq = new MockHttpRequest('GET', new Uri(path: 'wtf2'));
+      var rq = MockHttpRequest('GET', Uri(path: 'wtf2'));
       rq.headers.set('accept', 'text/html');
       unawaited(rq.close());
       unawaited(http.handleRequest(rq));
diff --git a/test/service_map_test.dart b/test/service_map_test.dart
index 0694f128..99346829 100644
--- a/test/service_map_test.dart
+++ b/test/service_map_test.dart
@@ -6,18 +6,18 @@ void main() {
   Service<String, Todo> mapped;
 
   setUp(() {
-    inner = new MapService();
+    inner = MapService();
     mapped = inner.map<Todo>(Todo.fromMap, Todo.toMap);
   });
 
   test('create', () async {
     var result = await mapped.create(
-      new Todo(text: 'hello', complete: false),
+      Todo(text: 'hello', complete: false),
     );
     print(result);
     expect(
       result,
-      new Todo(text: 'hello', complete: false),
+      Todo(text: 'hello', complete: false),
     );
   });
 
@@ -26,7 +26,7 @@ void main() {
     String id;
 
     setUp(() async {
-      result = await mapped.create(new Todo(text: 'hello', complete: false));
+      result = await mapped.create(Todo(text: 'hello', complete: false));
       id = result.id;
     });
 
@@ -35,12 +35,12 @@ void main() {
     });
 
     test('modify', () async {
-      var newTodo = new Todo(text: 'yes', complete: true);
+      var newTodo = Todo(text: 'yes', complete: true);
       expect(await mapped.update(id, newTodo), newTodo);
     });
 
     test('update', () async {
-      var newTodo = new Todo(id: 'hmmm', text: 'yes', complete: true);
+      var newTodo = Todo(id: 'hmmm', text: 'yes', complete: true);
       expect(await mapped.update(id, newTodo), newTodo);
     });
 
@@ -61,7 +61,7 @@ class Todo {
   Todo({this.id, this.text, this.complete});
 
   static Todo fromMap(Map<String, dynamic> json) {
-    return new Todo(
+    return Todo(
         id: json['id'] as String,
         text: json['text'] as String,
         complete: json['complete'] as bool);
diff --git a/test/services_test.dart b/test/services_test.dart
index 52232a84..e814a176 100644
--- a/test/services_test.dart
+++ b/test/services_test.dart
@@ -22,15 +22,15 @@ main() {
   http.Client client;
 
   setUp(() async {
-    app = new Angel(reflector: MirrorsReflector())
-      ..use('/todos', service = new MapService())
+    app = Angel(reflector: MirrorsReflector())
+      ..use('/todos', service = MapService())
       ..errorHandler = (e, req, res) {
         if (e.error != null) print('Whoops: ${e.error}');
-        if (e.stackTrace != null) print(new Chain.forTrace(e.stackTrace).terse);
+        if (e.stackTrace != null) print(Chain.forTrace(e.stackTrace).terse);
       };
 
-    var server = await new AngelHttp(app).startServer();
-    client = new http.Client();
+    var server = await AngelHttp(app).startServer();
+    client = http.Client();
     url = "http://${server.address.host}:${server.port}";
   });
 
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 6661b8f9..233a5226 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -18,10 +18,10 @@ main() {
   AngelHttp http;
 
   setUp(() {
-    app = new Angel(reflector: MirrorsReflector());
-    http = new AngelHttp(app, useZone: true);
+    app = Angel(reflector: MirrorsReflector());
+    http = AngelHttp(app, useZone: true);
 
-    app.logger = new Logger('streaming_test')
+    app.logger = Logger('streaming_test')
       ..onRecord.listen((rec) {
         print(rec);
         if (rec.stackTrace != null) print(rec.stackTrace);
@@ -35,31 +35,30 @@ main() {
     );
 
     app.get('/hello', (req, res) {
-      return new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+      return Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
     });
 
     app.get('/write', (req, res) async {
       await res.addStream(
-          new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
+          Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
       res.write('bye');
       await res.close();
     });
 
     app.get('/multiple', (req, res) async {
       await res.addStream(
-          new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
-      await res
-          .addStream(new Stream<List<int>>.fromIterable(['bye'.codeUnits]));
+          Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits]));
+      await res.addStream(Stream<List<int>>.fromIterable(['bye'.codeUnits]));
       await res.close();
     });
 
     app.get('/overwrite', (req, res) async {
       res.statusCode = 32;
-      await new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+      await Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res);
 
-      var f = new Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
+      var f = Stream<List<int>>.fromIterable(['Hello, world!'.codeUnits])
           .pipe(res)
           .then((_) => false)
           .catchError((_) => true);
@@ -67,7 +66,7 @@ main() {
       expect(f, completion(true));
     });
 
-    app.get('/error', (req, res) => res.addError(new StateError('wtf')));
+    app.get('/error', (req, res) => res.addError(StateError('wtf')));
 
     app.errorHandler = (e, req, res) async {
       stderr..writeln(e.error)..writeln(e.stackTrace);
@@ -77,7 +76,7 @@ main() {
   tearDown(() => http.close());
 
   _expectHelloBye(String path) async {
-    var rq = new MockHttpRequest('GET', Uri.parse(path));
+    var rq = MockHttpRequest('GET', Uri.parse(path));
     unawaited(rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
@@ -90,7 +89,7 @@ main() {
 
   test('cannot write after close', () async {
     try {
-      var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'));
+      var rq = MockHttpRequest('GET', Uri.parse('/overwrite'));
       unawaited(rq.close());
       await http.handleRequest(rq);
       var body = await rq.response.transform(utf8.decoder).join();
@@ -104,7 +103,7 @@ main() {
 
   test('res => addError', () async {
     try {
-      var rq = new MockHttpRequest('GET', Uri.parse('/error'));
+      var rq = MockHttpRequest('GET', Uri.parse('/error'));
       unawaited(rq.close());
       await http.handleRequest(rq);
       var body = await rq.response.transform(utf8.decoder).join();
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
index 177fb63f..1df69acf 100644
--- a/test/view_generator_test.dart
+++ b/test/view_generator_test.dart
@@ -3,7 +3,7 @@ import 'package:test/test.dart';
 
 main() {
   test('default view generator', () async {
-    var app = new Angel();
+    var app = Angel();
     var view = await app.viewGenerator('foo', {'bar': 'baz'});
     expect(view, contains('No view engine'));
   });

From 99c5933af34a90adb35d97b0115d1710663c6a95 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 2 May 2019 18:56:43 -0400
Subject: [PATCH 376/414] Tests done

---
 test/404_hole_test.dart     |  2 ++
 test/all.dart               |  4 +++-
 test/req_shutdown_test.dart | 47 +++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 test/req_shutdown_test.dart

diff --git a/test/404_hole_test.dart b/test/404_hole_test.dart
index c0b04a59..eaaf9702 100644
--- a/test/404_hole_test.dart
+++ b/test/404_hole_test.dart
@@ -74,5 +74,7 @@ Future<void> hello(RequestContext req, ResponseContext res) {
 
 /// 404
 void throw404(RequestContext req, ResponseContext res) {
+  Zone.current
+      .handleUncaughtError('This 404 should not occur.', StackTrace.current);
   throw AngelHttpException.notFound();
 }
diff --git a/test/all.dart b/test/all.dart
index 54196b46..e2a94623 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -19,6 +19,7 @@ import 'parse_id_test.dart' as parse_id;
 import 'precontained_test.dart' as precontained;
 import 'primitives_test.dart' as primitives;
 import 'repeat_request_test.dart' as repeat_request;
+import 'req_shutdown_test.dart' as req_shutdown;
 import 'routing_test.dart' as routing;
 import 'serialize_test.dart' as serialize;
 import 'server_test.dart' as server;
@@ -49,7 +50,8 @@ main() {
   group('parse_id', parse_id.main);
   group('precontained', precontained.main);
   group('primitives', primitives.main);
-  group('repeat request', repeat_request.main);
+  group('repeat_request', repeat_request.main);
+  group('req_shutdown', req_shutdown.main);
   group('routing', routing.main);
   group('serialize', serialize.main);
   group('server', server.main);
diff --git a/test/req_shutdown_test.dart b/test/req_shutdown_test.dart
new file mode 100644
index 00000000..dc158300
--- /dev/null
+++ b/test/req_shutdown_test.dart
@@ -0,0 +1,47 @@
+import 'dart:async';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:charcode/ascii.dart';
+import 'package:http/io_client.dart' as http;
+import 'package:logging/logging.dart';
+import 'package:test/test.dart';
+import 'pretty_log.dart';
+
+void main() {
+  http.IOClient client;
+  AngelHttp driver;
+  Logger logger;
+  StringBuffer buf;
+
+  setUp(() async {
+    buf = StringBuffer();
+    client = http.IOClient();
+    hierarchicalLoggingEnabled = true;
+
+    logger = Logger.detached('req_shutdown')
+      ..level = Level.ALL
+      ..onRecord.listen(prettyLog);
+
+    var app = Angel(logger: logger);
+
+    app.fallback((req, res) {
+      req.shutdownHooks.add(() => buf.write('Hello, '));
+      req.shutdownHooks.add(() => buf.write('world!'));
+    });
+
+    driver = AngelHttp(app);
+    await driver.startServer();
+  });
+
+  tearDown(() {
+    logger.clearListeners();
+    client.close();
+    scheduleMicrotask(driver.close);
+  });
+
+  test('does not continue processing after streaming', () async {
+    await client.get(driver.uri);
+    await Future.delayed(Duration(milliseconds: 100));
+    expect(buf.toString(), 'Hello, world!');
+  });
+}

From f29050f7dfed9551fa24ce13621de48c011a66e5 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 2 May 2019 18:57:51 -0400
Subject: [PATCH 377/414] Bump to 2.0.1

---
 pubspec.yaml                | 2 +-
 test/req_shutdown_test.dart | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 76da324c..43c533f2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.0
+version: 2.0.1
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/req_shutdown_test.dart b/test/req_shutdown_test.dart
index dc158300..01b1e551 100644
--- a/test/req_shutdown_test.dart
+++ b/test/req_shutdown_test.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
-import 'package:charcode/ascii.dart';
 import 'package:http/io_client.dart' as http;
 import 'package:logging/logging.dart';
 import 'package:test/test.dart';

From 49942cc8411cb0b6ed95503a92a2c875c41dfbfd Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 30 May 2019 23:49:00 -0400
Subject: [PATCH 378/414] curly braces in control flow

---
 analysis_options.yaml                     |  1 +
 lib/src/core/controller.dart              |  4 +--
 lib/src/core/driver.dart                  | 12 +++++---
 lib/src/core/hooked_service.dart          | 16 ++++++----
 lib/src/core/injection.dart               |  9 ++++--
 lib/src/core/map_service.dart             | 29 +++++++++++-------
 lib/src/core/metadata.dart                | 24 ++++++++++-----
 lib/src/core/request_context.dart         |  8 +++--
 lib/src/core/response_context.dart        | 37 ++++++++++++++---------
 lib/src/core/routable.dart                |  4 +--
 lib/src/core/server.dart                  |  3 +-
 lib/src/core/service.dart                 |  7 +++--
 lib/src/http/http_request_context.dart    |  3 +-
 lib/src/http/http_response_context.dart   |  6 ++--
 lib/src/http2/http2_response_context.dart |  3 +-
 lib/src/safe_stream_controller.dart       |  8 ++---
 test/common.dart                          |  2 +-
 test/controller_test.dart                 |  3 +-
 test/streaming_test.dart                  |  3 +-
 19 files changed, 113 insertions(+), 69 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index fa8474b6..d1a52392 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -5,5 +5,6 @@ analyzer:
 linter:
   rules:
     - avoid_slow_async_io
+    - curly_braces_in_flow_control_structures
     - unnecessary_const
     - unnecessary_new
\ No newline at end of file
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 738ec014..558dbe13 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -105,8 +105,8 @@ class Controller {
 
         var injection = preInject(reflectedMethod, app.container.reflector);
 
-        if (exposeDecl?.allowNull?.isNotEmpty == true)
-          injection.optional?.addAll(exposeDecl.allowNull);
+        if (exposeDecl?.allowNull?.isNotEmpty == true) {
+          injection.optional?.addAll(exposeDecl.allowNull);}
 
         routeMappings[name] = routable.addRoute(exposeDecl.method,
             exposeDecl.path, handleContained(reflectedMethod, injection),
diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index c78faa33..cf87f5e2 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -149,9 +149,10 @@ abstract class Driver<
           }
 
           return f.catchError((e, StackTrace st) {
-            if (e is FormatException)
+            if (e is FormatException) {
               throw AngelHttpException.badRequest(message: e.message)
                 ..stackTrace = st;
+            }
             throw AngelHttpException(e,
                 stackTrace: st,
                 statusCode: 500,
@@ -172,10 +173,11 @@ abstract class Driver<
         } else {
           var zoneSpec = ZoneSpecification(
             print: (self, parent, zone, line) {
-              if (app.logger != null)
+              if (app.logger != null) {
                 app.logger.info(line);
-              else
+              } else {
                 parent.print(zone, line);
+              }
             },
             handleUncaughtError: (self, parent, zone, error, stackTrace) {
               var trace = Trace.from(stackTrace ?? StackTrace.current).terse;
@@ -259,9 +261,9 @@ abstract class Driver<
 
     Future handleError;
 
-    if (!res.isOpen)
+    if (!res.isOpen) {
       handleError = Future.value();
-    else {
+    } else {
       res.statusCode = e.statusCode;
       handleError =
           Future.sync(() => app.errorHandler(e, req, res)).then((result) {
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 8e9e60d2..00216f49 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -63,13 +63,14 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
   }
 
   Map<String, dynamic> _stripReq(Map<String, dynamic> params) {
-    if (params == null)
+    if (params == null) {
       return params;
-    else
+    } else {
       return params.keys
           .where((key) => key != '__requestctx' && key != '__responsectx')
           .fold<Map<String, dynamic>>(
               {}, (map, key) => map..[key] = params[key]);
+    }
   }
 
   /// Closes any open [StreamController]s on this instance. **Internal use only**.
@@ -109,8 +110,9 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
       final listeners = <HookedServiceEventListener<Id, Data, T>>[]
         ..addAll(isAfter == true ? after : before);
 
-      if (hooks != null)
+      if (hooks != null) {
         listeners.addAll(isAfter == true ? hooks.after : hooks.before);
+      }
 
       listeners.forEach(dispatcher.listen);
     }
@@ -469,8 +471,9 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
       HookedServiceEvent<Id, Data, T> event,
       [HookedServiceEventListener<Id, Data, T> callback]) {
     Future f;
-    if (callback != null && event?._canceled != true)
+    if (callback != null && event?._canceled != true) {
       f = Future.sync(() => callback(event));
+    }
     f ??= Future.value();
     return f.then((_) => dispatcher._emit(event));
   }
@@ -533,7 +536,7 @@ class HookedServiceEvent<Id, Data, T extends Service<Id, Data>> {
   T service;
 
   HookedServiceEvent(this._isAfter, this._request, this._response, this.service,
-      String this._eventName,
+      this._eventName,
       {Id id, this.data, Map<String, dynamic> params, this.result}) {
     _id = id;
     _params = params ?? {};
@@ -557,8 +560,9 @@ class HookedServiceEventDispatcher<Id, Data, T extends Service<Id, Data>> {
   /// Fires an event, and returns it once it is either canceled, or all listeners have run.
   Future<HookedServiceEvent<Id, Data, T>> _emit(
       HookedServiceEvent<Id, Data, T> event) {
-    if (event?._canceled == true || event == null || listeners.isEmpty)
+    if (event?._canceled == true || event == null || listeners.isEmpty) {
       return Future.value(event);
+    }
 
     var f = Future<HookedServiceEvent<Id, Data, T>>.value(event);
 
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 078320eb..3c2a300c 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -39,8 +39,9 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     if (value == null && param.required != false) throw param.error;
     return value;
   } else if (requirement is String) {
-    if (req.container.hasNamed(requirement))
+    if (req.container.hasNamed(requirement)) {
       return req.container.findByName(requirement);
+    }
     if (req.params.containsKey(requirement)) {
       return req.params[requirement];
     } else if ((propFromApp = req.app.findProperty(requirement)) != null)
@@ -62,14 +63,16 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
         _primitiveTypes.contains(type)) {
       return await resolveInjection(
           key, injection, req, res, throwOnUnresolved, container);
-    } else
+    } else {
       return await resolveInjection(
           type, injection, req, res, throwOnUnresolved, container);
+    }
   } else if (requirement is Type && requirement != dynamic) {
     try {
       var futureType = container.reflector.reflectFutureOf(requirement);
-      if (container.has(futureType.reflectedType))
+      if (container.has(futureType.reflectedType)) {
         return await container.make(futureType.reflectedType);
+      }
     } on UnsupportedError {
       // Ignore.
     }
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index 29e443dd..e628a4a6 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -39,18 +39,19 @@ class MapService extends Service<String, Map<String, dynamic>> {
     return (Map<String, dynamic> item) {
       if (item['id'] == null)
         return false;
-      else if (autoIdAndDateFields != false)
+      else if (autoIdAndDateFields != false) {
         return item['id'] == id?.toString();
-      else
+      } else {
         return item['id'] == id;
+      }
     };
   }
 
   @override
   Future<List<Map<String, dynamic>>> index([Map<String, dynamic> params]) {
-    if (allowQuery == false || params == null || params['query'] is! Map)
+    if (allowQuery == false || params == null || params['query'] is! Map) {
       return Future.value(items);
-    else {
+    } else {
       var query = params['query'] as Map;
 
       return Future.value(items.where((item) {
@@ -75,10 +76,11 @@ class MapService extends Service<String, Map<String, dynamic>> {
   @override
   Future<Map<String, dynamic>> create(Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
-    if (data is! Map)
+    if (data is! Map) {
       throw AngelHttpException.badRequest(
           message:
               'MapService does not support `create` with ${data.runtimeType}.');
+    }
     var now = DateTime.now().toIso8601String();
     var result = Map<String, dynamic>.from(data);
 
@@ -95,10 +97,11 @@ class MapService extends Service<String, Map<String, dynamic>> {
   @override
   Future<Map<String, dynamic>> modify(String id, Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
-    if (data is! Map)
+    if (data is! Map) {
       throw AngelHttpException.badRequest(
           message:
               'MapService does not support `modify` with ${data.runtimeType}.');
+    }
     if (!items.any(_matchesId(id))) return create(data, params);
 
     return read(id).then((item) {
@@ -106,10 +109,11 @@ class MapService extends Service<String, Map<String, dynamic>> {
       if (idx < 0) return create(data, params);
       var result = Map<String, dynamic>.from(item)..addAll(data);
 
-      if (autoIdAndDateFields == true)
+      if (autoIdAndDateFields == true) {
         result
           ..[autoSnakeCaseNames == false ? 'updatedAt' : 'updated_at'] =
               DateTime.now().toIso8601String();
+      }
       return Future.value(items[idx] = result);
     });
   }
@@ -117,16 +121,18 @@ class MapService extends Service<String, Map<String, dynamic>> {
   @override
   Future<Map<String, dynamic>> update(String id, Map<String, dynamic> data,
       [Map<String, dynamic> params]) {
-    if (data is! Map)
+    if (data is! Map) {
       throw AngelHttpException.badRequest(
           message:
               'MapService does not support `update` with ${data.runtimeType}.');
+    }
     if (!items.any(_matchesId(id))) return create(data, params);
 
     return read(id).then((old) {
-      if (!items.remove(old))
+      if (!items.remove(old)) {
         throw AngelHttpException.notFound(
             message: 'No record found for ID $id');
+      }
 
       var result = Map<String, dynamic>.from(data);
       if (autoIdAndDateFields == true) {
@@ -158,11 +164,12 @@ class MapService extends Service<String, Map<String, dynamic>> {
     }
 
     return read(id, params).then((result) {
-      if (items.remove(result))
+      if (items.remove(result)) {
         return result;
-      else
+      } else {
         throw AngelHttpException.notFound(
             message: 'No record found for ID $id');
+      }
     });
   }
 }
diff --git a/lib/src/core/metadata.dart b/lib/src/core/metadata.dart
index 03c497a4..877073ff 100644
--- a/lib/src/core/metadata.dart
+++ b/lib/src/core/metadata.dart
@@ -70,30 +70,38 @@ class Parameter {
 
   /// Returns an error that can be thrown when the parameter is not present.
   get error {
-    if (cookie?.isNotEmpty == true)
+    if (cookie?.isNotEmpty == true) {
       return AngelHttpException.badRequest(
           message: 'Missing required cookie "$cookie".');
-    if (header?.isNotEmpty == true)
+    }
+    if (header?.isNotEmpty == true) {
       return AngelHttpException.badRequest(
           message: 'Missing required header "$header".');
-    if (query?.isNotEmpty == true)
+    }
+    if (query?.isNotEmpty == true) {
       return AngelHttpException.badRequest(
           message: 'Missing required query parameter "$query".');
-    if (session?.isNotEmpty == true)
+    }
+    if (session?.isNotEmpty == true) {
       return StateError('Session does not contain required key "$session".');
+    }
   }
 
   /// Obtains a value for this parameter from a [RequestContext].
   getValue(RequestContext req) {
-    if (cookie?.isNotEmpty == true)
+    if (cookie?.isNotEmpty == true) {
       return req.cookies.firstWhere((c) => c.name == cookie)?.value ??
           defaultValue;
-    if (header?.isNotEmpty == true)
+    }
+    if (header?.isNotEmpty == true) {
       return req.headers.value(header) ?? defaultValue;
-    if (session?.isNotEmpty == true)
+    }
+    if (session?.isNotEmpty == true) {
       return req.session[session] ?? defaultValue;
-    if (query?.isNotEmpty == true)
+    }
+    if (query?.isNotEmpty == true) {
       return req.uri.queryParameters[query] ?? defaultValue;
+    }
     return defaultValue;
   }
 }
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 381964e2..f50f6e29 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -202,18 +202,20 @@ abstract class RequestContext<RawRequest> {
         : contentType?.toString();
 
     // Change to assert
-    if (contentTypeString == null)
+    if (contentTypeString == null) {
       throw ArgumentError(
           'RequestContext.accepts expects the `contentType` parameter to NOT be null.');
+    }
 
     _acceptHeaderCache ??= headers.value('accept');
 
     if (_acceptHeaderCache == null)
       return false;
-    else if (strict != true && _acceptHeaderCache.contains('*/*'))
+    else if (strict != true && _acceptHeaderCache.contains('*/*')) {
       return true;
-    else
+    } else {
       return _acceptHeaderCache.contains(contentTypeString);
+    }
   }
 
   /// Returns as `true` if the client's `Accept` header indicates that it will accept any response content type.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 35d8b537..9f9ee1e1 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -76,10 +76,11 @@ abstract class ResponseContext<RawResponse>
   int get statusCode => _statusCode;
 
   set statusCode(int value) {
-    if (!isOpen)
+    if (!isOpen) {
       throw closed();
-    else
+    } else {
       _statusCode = value ?? 200;
+    }
   }
 
   /// Returns `true` if the response is still available for processing by Angel.
@@ -114,10 +115,11 @@ abstract class ResponseContext<RawResponse>
   ///
   /// If [value] is `null`, then the header will be removed.
   set contentLength(int value) {
-    if (value == null)
+    if (value == null) {
       headers.remove('content-length');
-    else
+    } else {
       headers['content-length'] = value.toString();
+    }
   }
 
   /// Gets or sets the content type to send back to a client.
@@ -262,21 +264,24 @@ abstract class ResponseContext<RawResponse>
     // UserController@show
     List<String> split = action.split("@");
 
-    if (split.length < 2)
+    if (split.length < 2) {
       throw Exception(
           "Controller redirects must take the form of 'Controller@action'. You gave: $action");
+    }
 
     Controller controller =
         app.controllers[split[0].replaceAll(_straySlashes, '')];
 
-    if (controller == null)
+    if (controller == null) {
       throw Exception("Could not find a controller named '${split[0]}'");
+    }
 
     Route matched = controller.routeMappings[split[1]];
 
-    if (matched == null)
+    if (matched == null) {
       throw Exception(
           "Controller '${split[0]}' does not contain any action named '${split[1]}'");
+    }
 
     final head = controller
         .findExpose(app.container.reflector)
@@ -314,8 +319,9 @@ abstract class ResponseContext<RawResponse>
         ? MediaType('application', 'octet-stream')
         : MediaType.parse(mimeType);
 
-    if (correspondingRequest.method != 'HEAD')
+    if (correspondingRequest.method != 'HEAD') {
       return file.openRead().pipe(this);
+    }
   }
 
   /// Configure the response to write to an intermediate response buffer, rather than to the stream directly.
@@ -352,10 +358,11 @@ abstract class ResponseContext<RawResponse>
   void writeCharCode(int charCode) {
     if (!isOpen && isBuffered)
       throw closed();
-    else if (!isBuffered)
+    else if (!isBuffered) {
       add([charCode]);
-    else
+    } else {
       buffer.addByte(charCode);
+    }
   }
 
   @override
@@ -392,18 +399,20 @@ class _LockableBytesBuilderImpl implements LockableBytesBuilder {
 
   @override
   void add(List<int> bytes) {
-    if (_closed)
+    if (_closed) {
       throw _deny();
-    else
+    } else {
       _buf.add(bytes);
+    }
   }
 
   @override
   void addByte(int byte) {
-    if (_closed)
+    if (_closed) {
       throw _deny();
-    else
+    } else {
       _buf.addByte(byte);
+    }
   }
 
   @override
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index 1253e8a8..e98ac39a 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -26,9 +26,9 @@ RequestHandler chain(Iterable<RequestHandler> handlers) {
     for (var handler in handlers) {
       if (handler == null) break;
 
-      if (runPipeline == null)
+      if (runPipeline == null) {
         runPipeline = () => Future.sync(() => handler(req, res));
-      else {
+      } else {
         var current = runPipeline;
         runPipeline = () => current().then((result) => !res.isOpen
             ? Future.value(result)
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index b6a62b7e..a072c1c1 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -275,8 +275,9 @@ class Angel extends Routable {
         return result;
       } else if (result != null) {
         return res.serialize(result);
-      } else
+      } else {
         return res.isOpen;
+      }
     });
   }
 
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index 25e70816..bbe147be 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -21,7 +21,7 @@ class Providers {
   /// The transport through which the client is accessing this service.
   final String via;
 
-  const Providers(String this.via);
+  const Providers(this.via);
 
   static const String viaRest = "rest";
   static const String viaWebsocket = "websocket";
@@ -206,10 +206,11 @@ class Service<Id, Data> extends Routable {
       return (id == true || id?.toString() == 'true') as T;
     else if (T == double)
       return double.parse(id.toString()) as T;
-    else if (T == num)
+    else if (T == num) {
       return num.parse(id.toString()) as T;
-    else
+    } else {
       return id as T;
+    }
   }
 
   /// Generates RESTful routes pointing to this class's methods.
diff --git a/lib/src/http/http_request_context.dart b/lib/src/http/http_request_context.dart
index 264a9474..42538ce1 100644
--- a/lib/src/http/http_request_context.dart
+++ b/lib/src/http/http_request_context.dart
@@ -80,10 +80,11 @@ class HttpRequestContext extends RequestContext<HttpRequest> {
 
     String override = request.method;
 
-    if (app.allowMethodOverrides == true)
+    if (app.allowMethodOverrides == true) {
       override =
           request.headers.value('x-http-method-override')?.toUpperCase() ??
               request.method;
+    }
 
     ctx.app = app;
     ctx._contentType = request.headers.contentType == null
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index eb4b49e9..3ec53236 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -73,9 +73,10 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
   @override
   set contentType(MediaType value) {
     super.contentType = value;
-    if (!_streamInitialized)
+    if (!_streamInitialized) {
       rawResponse.headers.contentType =
           ContentType(value.type, value.subtype, parameters: value.parameters);
+    }
   }
 
   bool _openStream() {
@@ -184,8 +185,9 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
         rawResponse.add(data);
       }
-    } else
+    } else {
       buffer.add(data);
+    }
   }
 
   @override
diff --git a/lib/src/http2/http2_response_context.dart b/lib/src/http2/http2_response_context.dart
index 594ca7ec..7e033fbc 100644
--- a/lib/src/http2/http2_response_context.dart
+++ b/lib/src/http2/http2_response_context.dart
@@ -189,8 +189,9 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
 
         stream.sendData(data);
       }
-    } else
+    } else {
       buffer.add(data);
+    }
   }
 
   @override
diff --git a/lib/src/safe_stream_controller.dart b/lib/src/safe_stream_controller.dart
index 836df164..bd2de680 100644
--- a/lib/src/safe_stream_controller.dart
+++ b/lib/src/safe_stream_controller.dart
@@ -62,9 +62,9 @@ class _SingleSafeCtrl<T> implements SafeCtrl<T> {
   @override
   void whenInitialized(void callback()) {
     if (!_initialized) {
-      if (!_hasListener)
+      if (!_hasListener) {
         _initializer = callback;
-      else {
+      } else {
         _initializer();
         _initialized = true;
       }
@@ -112,9 +112,9 @@ class _BroadcastSafeCtrl<T> implements SafeCtrl<T> {
   @override
   void whenInitialized(void callback()) {
     if (!_initialized) {
-      if (_listeners <= 0)
+      if (_listeners <= 0) {
         _initializer = callback;
-      else {
+      } else {
         _initializer();
         _initialized = true;
       }
diff --git a/test/common.dart b/test/common.dart
index 0227f8a1..84b98550 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -7,7 +7,7 @@ class Todo extends Model {
   String text;
   String over;
 
-  Todo({String this.text, String this.over});
+  Todo({this.text, this.over});
 
   Map<String, dynamic> toJson() {
     return {
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 8701bfc6..3ca9ecac 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -63,8 +63,9 @@ main() {
             res.redirectToAction("TodoController@foo", {"foo": "world"}));
 
     // Register as a singleton, just for the purpose of this test
-    if (!app.container.has<TodoController>())
+    if (!app.container.has<TodoController>()) {
       app.container.registerSingleton(ctrl = TodoController());
+    }
 
     // Using mountController<T>();
     await app.mountController<TodoController>();
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 233a5226..6b9d12e3 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -94,8 +94,9 @@ main() {
       await http.handleRequest(rq);
       var body = await rq.response.transform(utf8.decoder).join();
 
-      if (rq.response.statusCode != 32)
+      if (rq.response.statusCode != 32) {
         throw 'overwrite should throw error; response: $body';
+      }
     } on StateError {
       // Success
     }

From 07d1ce094458fc51b609fad43eaac53bc14c3657 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 30 May 2019 23:52:07 -0400
Subject: [PATCH 379/414] Make `ResponseContext` *explicitly* implement
 `StreamConsumer`

---
 CHANGELOG.md                       | 3 +++
 lib/src/core/response_context.dart | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b35bedc..f571ea5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.2
+* Make `ResponseContext` *explicitly* implement `StreamConsumer` (though technically it already did???)
+
 # 2.0.1
 * Tracked down a bug in `Driver.runPipeline` that allowed fallback
 handlers to run, even after the response was closed.
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 9f9ee1e1..839df5b1 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -18,7 +18,7 @@ final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)');
 
 /// A convenience wrapper around an outgoing HTTP request.
 abstract class ResponseContext<RawResponse>
-    implements StreamSink<List<int>>, StringSink {
+    implements StreamConsumer<List<int>>, StreamSink<List<int>>, StringSink {
   final Map properties = {};
   final CaseInsensitiveMap<String> _headers = CaseInsensitiveMap<String>.from({
     'content-type': 'text/plain',

From 97d52a6984185eef65b6326381749bd22eeb1f62 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 30 May 2019 23:57:09 -0400
Subject: [PATCH 380/414] Split Controller.configureServer

---
 CHANGELOG.md                 |  1 +
 lib/src/core/controller.dart | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f571ea5b..b14d582f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 2.0.2
 * Make `ResponseContext` *explicitly* implement `StreamConsumer` (though technically it already did???)
+* Split `Controller.configureServer` to create `Controller.applyRoutes`.
 
 # 2.0.1
 * Tracked down a bug in `Driver.runPipeline` that allowed fallback
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 558dbe13..6910646d 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -35,31 +35,37 @@ class Controller {
       }
     }
 
+    return applyRoutes(app, app.container.reflector).then((name) {
+      app.controllers[name] = this;
+    });
+  }
+
+  /// Applies the routes from this [Controller] to some [router].
+  Future<String> applyRoutes(Router router, Reflector reflector) {
     // Load global expose decl
-    var classMirror = app.container.reflector.reflectClass(this.runtimeType);
-    Expose exposeDecl = findExpose(app.container.reflector);
+    var classMirror = reflector.reflectClass(this.runtimeType);
+    Expose exposeDecl = findExpose(reflector);
 
     if (exposeDecl == null) {
       throw Exception("All controllers must carry an @Expose() declaration.");
     }
 
     var routable = Routable();
-    app.mount(exposeDecl.path, routable);
-    var typeMirror = app.container.reflector.reflectType(this.runtimeType);
-    String name =
-        exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name;
-
-    app.controllers[name] = this;
+    router.mount(exposeDecl.path, routable);
+    var typeMirror = reflector.reflectType(this.runtimeType);
 
     // Pre-reflect methods
-    var instanceMirror = app.container.reflector.reflectInstance(this);
+    var instanceMirror = reflector.reflectInstance(this);
     final handlers = <RequestHandler>[]
       ..addAll(exposeDecl.middleware)
       ..addAll(middleware);
     final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
     classMirror.declarations.forEach(routeBuilder);
     configureRoutes(routable);
-    return Future.value();
+
+    // Return the name.
+    return Future.value(
+        exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name);
   }
 
   void Function(ReflectedDeclaration) _routeBuilder(
@@ -106,7 +112,8 @@ class Controller {
         var injection = preInject(reflectedMethod, app.container.reflector);
 
         if (exposeDecl?.allowNull?.isNotEmpty == true) {
-          injection.optional?.addAll(exposeDecl.allowNull);}
+          injection.optional?.addAll(exposeDecl.allowNull);
+        }
 
         routeMappings[name] = routable.addRoute(exposeDecl.method,
             exposeDecl.path, handleContained(reflectedMethod, injection),

From 9df72be4061e16e4245be13ccbeb36bbb0aacd39 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 31 May 2019 00:20:20 -0400
Subject: [PATCH 381/414] Bump to 2.0.2

---
 pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 43c533f2..0288ed23 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.1
+version: 2.0.2
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From d0e765dcd491597569514be3759ef3f677f48fad Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 31 May 2019 16:24:13 -0400
Subject: [PATCH 382/414] +1

---
 CHANGELOG.md                 |  3 +++
 lib/src/core/controller.dart | 20 +++++++++++---------
 pubspec.yaml                 |  2 +-
 test/controller_test.dart    | 20 ++++++++++++++++++++
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b14d582f..a99ee583 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.2+1
+* Fix a bug in the implementation of `Controller.applyRoutes`.
+
 # 2.0.2
 * Make `ResponseContext` *explicitly* implement `StreamConsumer` (though technically it already did???)
 * Split `Controller.configureServer` to create `Controller.applyRoutes`.
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 6910646d..6befde29 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -25,8 +25,9 @@ class Controller {
 
   Controller({this.injectSingleton = true});
 
+  /// Applies routes, DI, and other configuration to an [app].
   @mustCallSuper
-  Future configureServer(Angel app) {
+  FutureOr<void> configureServer(Angel app) {
     _app = app;
 
     if (injectSingleton != false) {
@@ -35,13 +36,13 @@ class Controller {
       }
     }
 
-    return applyRoutes(app, app.container.reflector).then((name) {
-      app.controllers[name] = this;
-    });
+    var name = applyRoutes(app, app.container.reflector);
+    app.controllers[name] = this;
+    return null;
   }
 
   /// Applies the routes from this [Controller] to some [router].
-  Future<String> applyRoutes(Router router, Reflector reflector) {
+  String applyRoutes(Router router, Reflector reflector) {
     // Load global expose decl
     var classMirror = reflector.reflectClass(this.runtimeType);
     Expose exposeDecl = findExpose(reflector);
@@ -59,16 +60,17 @@ class Controller {
     final handlers = <RequestHandler>[]
       ..addAll(exposeDecl.middleware)
       ..addAll(middleware);
-    final routeBuilder = _routeBuilder(instanceMirror, routable, handlers);
+    final routeBuilder =
+        _routeBuilder(reflector, instanceMirror, routable, handlers);
     classMirror.declarations.forEach(routeBuilder);
     configureRoutes(routable);
 
     // Return the name.
-    return Future.value(
-        exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name);
+    return exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name;
   }
 
   void Function(ReflectedDeclaration) _routeBuilder(
+      Reflector reflector,
       ReflectedInstance instanceMirror,
       Routable routable,
       Iterable<RequestHandler> handlers) {
@@ -109,7 +111,7 @@ class Controller {
           return;
         }
 
-        var injection = preInject(reflectedMethod, app.container.reflector);
+        var injection = preInject(reflectedMethod, reflector);
 
         if (exposeDecl?.allowNull?.isNotEmpty == true) {
           injection.optional?.addAll(exposeDecl.allowNull);
diff --git a/pubspec.yaml b/pubspec.yaml
index 0288ed23..d9ce087a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.2
+version: 2.0.2+1
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
diff --git a/test/controller_test.dart b/test/controller_test.dart
index 3ca9ecac..d4b7938a 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -70,6 +70,13 @@ main() {
     // Using mountController<T>();
     await app.mountController<TodoController>();
 
+    // Place controller in group...
+    app.group('/ctrl_group', (router) {
+      app.container
+          .make<TodoController>()
+          .applyRoutes(router, app.container.reflector);
+    });
+
     print(app.controllers);
     app.dumpTree();
 
@@ -129,6 +136,19 @@ main() {
     expect(todo['over'], equals("world"));
   });
 
+  test("controller in group", () async {
+    var rgx = RegExp("^Hello, world!");
+    var response = await client.get("$url/ctrl_group/todos/0");
+    print('Response: ${response.body}');
+
+    expect(rgx.firstMatch(response.body)?.start, equals(0));
+
+    var todo = json.decode(response.body.replaceAll(rgx, "")) as Map;
+    print("Todo: $todo");
+    expect(todo['text'], equals("Hello"));
+    expect(todo['over'], equals("world"));
+  });
+
   test("named actions", () async {
     var response = await client.get("$url/redirect");
     print('Response: ${response.body}');

From 5eef432e2ad9c0512d3ca602ca25d369bd19f1a9 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 6 Jun 2019 10:37:27 -0400
Subject: [PATCH 383/414] Curly brace fixes...

---
 lib/src/core/driver.dart                  |  4 ++--
 lib/src/core/injection.dart               |  6 +++---
 lib/src/core/map_service.dart             |  8 ++++----
 lib/src/core/request_context.dart         |  4 ++--
 lib/src/core/response_context.dart        | 14 ++++++++------
 lib/src/core/server.dart                  |  4 ++--
 lib/src/core/service.dart                 | 12 ++++++------
 lib/src/http/http_response_context.dart   | 16 ++++++++--------
 lib/src/http2/http2_response_context.dart | 16 ++++++++--------
 test/pretty_log.dart                      | 10 +++++-----
 10 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/lib/src/core/driver.dart b/lib/src/core/driver.dart
index cf87f5e2..b15df8e5 100644
--- a/lib/src/core/driver.dart
+++ b/lib/src/core/driver.dart
@@ -326,9 +326,9 @@ abstract class Driver<
             Converter<List<int>, List<int>> encoder;
             String key = encodingName;
 
-            if (res.encoders.containsKey(encodingName))
+            if (res.encoders.containsKey(encodingName)) {
               encoder = res.encoders[encodingName];
-            else if (encodingName == '*') {
+            } else if (encodingName == '*') {
               encoder = res.encoders[key = res.encoders.keys.first];
             }
 
diff --git a/lib/src/core/injection.dart b/lib/src/core/injection.dart
index 3c2a300c..1f08de21 100644
--- a/lib/src/core/injection.dart
+++ b/lib/src/core/injection.dart
@@ -44,11 +44,11 @@ resolveInjection(requirement, InjectionRequest injection, RequestContext req,
     }
     if (req.params.containsKey(requirement)) {
       return req.params[requirement];
-    } else if ((propFromApp = req.app.findProperty(requirement)) != null)
+    } else if ((propFromApp = req.app.findProperty(requirement)) != null) {
       return propFromApp;
-    else if (injection.optional.contains(requirement))
+    } else if (injection.optional.contains(requirement)) {
       return null;
-    else if (throwOnUnresolved) {
+    } else if (throwOnUnresolved) {
       throw ArgumentError(
           "Cannot resolve parameter '$requirement' within handler.");
     }
diff --git a/lib/src/core/map_service.dart b/lib/src/core/map_service.dart
index e628a4a6..a7b50915 100644
--- a/lib/src/core/map_service.dart
+++ b/lib/src/core/map_service.dart
@@ -37,9 +37,9 @@ class MapService extends Service<String, Map<String, dynamic>> {
 
   bool Function(Map<String, dynamic>) _matchesId(id) {
     return (Map<String, dynamic> item) {
-      if (item['id'] == null)
+      if (item['id'] == null) {
         return false;
-      else if (autoIdAndDateFields != false) {
+      } else if (autoIdAndDateFields != false) {
         return item['id'] == id?.toString();
       } else {
         return item['id'] == id;
@@ -56,9 +56,9 @@ class MapService extends Service<String, Map<String, dynamic>> {
 
       return Future.value(items.where((item) {
         for (var key in query.keys) {
-          if (!item.containsKey(key))
+          if (!item.containsKey(key)) {
             return false;
-          else if (item[key] != query[key]) return false;
+          } else if (item[key] != query[key]) return false;
         }
 
         return true;
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index f50f6e29..d25a5804 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -209,9 +209,9 @@ abstract class RequestContext<RawRequest> {
 
     _acceptHeaderCache ??= headers.value('accept');
 
-    if (_acceptHeaderCache == null)
+    if (_acceptHeaderCache == null) {
       return false;
-    else if (strict != true && _acceptHeaderCache.contains('*/*')) {
+    } else if (strict != true && _acceptHeaderCache.contains('*/*')) {
       return true;
     } else {
       return _acceptHeaderCache.contains(contentTypeString);
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 839df5b1..f0428055 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -336,18 +336,20 @@ abstract class ResponseContext<RawResponse>
 
   @override
   void addError(Object error, [StackTrace stackTrace]) {
-    if (_done?.isCompleted == false)
+    if (_done?.isCompleted == false) {
       _done.completeError(error, stackTrace);
-    else if (_done == null) Zone.current.handleUncaughtError(error, stackTrace);
+    } else if (_done == null) {
+      Zone.current.handleUncaughtError(error, stackTrace);
+    }
   }
 
   /// Writes data to the response.
   void write(value, {Encoding encoding}) {
     encoding ??= utf8;
 
-    if (!isOpen && isBuffered)
+    if (!isOpen && isBuffered) {
       throw closed();
-    else if (!isBuffered) {
+    } else if (!isBuffered) {
       add(encoding.encode(value.toString()));
     } else {
       buffer.add(encoding.encode(value.toString()));
@@ -356,9 +358,9 @@ abstract class ResponseContext<RawResponse>
 
   @override
   void writeCharCode(int charCode) {
-    if (!isOpen && isBuffered)
+    if (!isOpen && isBuffered) {
       throw closed();
-    else if (!isBuffered) {
+    } else if (!isBuffered) {
       add([charCode]);
     } else {
       buffer.addByte(charCode);
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index a072c1c1..5ed7147d 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -269,9 +269,9 @@ class Angel extends Routable {
   Future<bool> executeHandler(
       handler, RequestContext req, ResponseContext res) {
     return getHandlerResult(handler, req, res).then((result) {
-      if (result == null)
+      if (result == null) {
         return false;
-      else if (result is bool) {
+      } else if (result is bool) {
         return result;
       } else if (result != null) {
         return res.serialize(result);
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index bbe147be..7592c48d 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -196,17 +196,17 @@ class Service<Id, Data> extends Routable {
   ///
   /// For example, `parseId<bool>` attempts to parse the value as a [bool].
   static T parseId<T>(id) {
-    if (id == 'null' || id == null)
+    if (id == 'null' || id == null) {
       return null;
-    else if (T == String)
+    } else if (T == String) {
       return id.toString() as T;
-    else if (T == int)
+    } else if (T == int) {
       return int.parse(id.toString()) as T;
-    else if (T == bool)
+    } else if (T == bool) {
       return (id == true || id?.toString() == 'true') as T;
-    else if (T == double)
+    } else if (T == double) {
       return double.parse(id.toString()) as T;
-    else if (T == num) {
+    } else if (T == num) {
       return num.parse(id.toString()) as T;
     } else {
       return id as T;
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index 3ec53236..8903d245 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -104,9 +104,9 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
             Converter<List<int>, List<int>> encoder;
             String key = encodingName;
 
-            if (encoders.containsKey(encodingName))
+            if (encoders.containsKey(encodingName)) {
               encoder = encoders[encodingName];
-            else if (encodingName == '*') {
+            } else if (encodingName == '*') {
               encoder = encoders[key = encoders.keys.first];
             }
 
@@ -138,9 +138,9 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
           Converter<List<int>, List<int>> encoder;
           String key = encodingName;
 
-          if (encoders.containsKey(encodingName))
+          if (encoders.containsKey(encodingName)) {
             encoder = encoders[encodingName];
-          else if (encodingName == '*') {
+          } else if (encodingName == '*') {
             encoder = encoders[key = encoders.keys.first];
           }
 
@@ -157,9 +157,9 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
 
   @override
   void add(List<int> data) {
-    if (_isClosed && isBuffered)
+    if (_isClosed && isBuffered) {
       throw ResponseContext.closed();
-    else if (!isBuffered) {
+    } else if (!isBuffered) {
       if (!_isClosed) {
         _openStream();
 
@@ -169,9 +169,9 @@ class HttpResponseContext extends ResponseContext<HttpResponse> {
               Converter<List<int>, List<int>> encoder;
               String key = encodingName;
 
-              if (encoders.containsKey(encodingName))
+              if (encoders.containsKey(encodingName)) {
                 encoder = encoders[encodingName];
-              else if (encodingName == '*') {
+              } else if (encodingName == '*') {
                 encoder = encoders[key = encoders.keys.first];
               }
 
diff --git a/lib/src/http2/http2_response_context.dart b/lib/src/http2/http2_response_context.dart
index 7e033fbc..55fb6d45 100644
--- a/lib/src/http2/http2_response_context.dart
+++ b/lib/src/http2/http2_response_context.dart
@@ -82,9 +82,9 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
           Converter<List<int>, List<int>> encoder;
           String key = encodingName;
 
-          if (encoders.containsKey(encodingName))
+          if (encoders.containsKey(encodingName)) {
             encoder = encoders[encodingName];
-          else if (encodingName == '*') {
+          } else if (encodingName == '*') {
             encoder = encoders[key = encoders.keys.first];
           }
 
@@ -142,9 +142,9 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
           Converter<List<int>, List<int>> encoder;
           String key = encodingName;
 
-          if (encoders.containsKey(encodingName))
+          if (encoders.containsKey(encodingName)) {
             encoder = encoders[encodingName];
-          else if (encodingName == '*') {
+          } else if (encodingName == '*') {
             encoder = encoders[key = encoders.keys.first];
           }
 
@@ -161,9 +161,9 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
 
   @override
   void add(List<int> data) {
-    if (!isOpen && isBuffered)
+    if (!isOpen && isBuffered) {
       throw ResponseContext.closed();
-    else if (!isBuffered) {
+    } else if (!isBuffered) {
       _openStream();
 
       if (!_isClosed) {
@@ -173,9 +173,9 @@ class Http2ResponseContext extends ResponseContext<ServerTransportStream> {
               Converter<List<int>, List<int>> encoder;
               String key = encodingName;
 
-              if (encoders.containsKey(encodingName))
+              if (encoders.containsKey(encodingName)) {
                 encoder = encoders[encodingName];
-              else if (encodingName == '*') {
+              } else if (encodingName == '*') {
                 encoder = encoders[key = encoders.keys.first];
               }
 
diff --git a/test/pretty_log.dart b/test/pretty_log.dart
index 9c03c110..83427f07 100644
--- a/test/pretty_log.dart
+++ b/test/pretty_log.dart
@@ -20,15 +20,15 @@ void prettyLog(LogRecord record) {
 
 /// Chooses a color based on the logger [level].
 AnsiCode chooseLogColor(Level level) {
-  if (level == Level.SHOUT)
+  if (level == Level.SHOUT) {
     return backgroundRed;
-  else if (level == Level.SEVERE)
+  } else if (level == Level.SEVERE) {
     return red;
-  else if (level == Level.WARNING)
+  } else if (level == Level.WARNING) {
     return yellow;
-  else if (level == Level.INFO)
+  } else if (level == Level.INFO) {
     return cyan;
-  else if (level == Level.CONFIG ||
+  } else if (level == Level.CONFIG ||
       level == Level.FINE ||
       level == Level.FINER ||
       level == Level.FINEST) return lightGray;

From f2b6ab69e203e9fbcf8d18716cf391ce06a7f47d Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 6 Jun 2019 12:17:32 -0400
Subject: [PATCH 384/414] bump to 2.0.3

---
 CHANGELOG.md                       | 4 ++++
 lib/src/core/response_context.dart | 2 +-
 pubspec.yaml                       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a99ee583..786fc868 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.3
+* Patch up a bug caused by an upstream change to Dart's stream semantics.
+See more: https://github.com/angel-dart/angel/issues/106#issuecomment-499564485
+
 # 2.0.2+1
 * Fix a bug in the implementation of `Controller.applyRoutes`.
 
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index f0428055..acdc18c0 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -320,7 +320,7 @@ abstract class ResponseContext<RawResponse>
         : MediaType.parse(mimeType);
 
     if (correspondingRequest.method != 'HEAD') {
-      return file.openRead().pipe(this);
+      return this.addStream(file.openRead()).then((_) => this.close());
     }
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index d9ce087a..368462c9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.2+1
+version: 2.0.3
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 25c6ded16f85b55101d5d0b3d3dee9edd9457746 Mon Sep 17 00:00:00 2001
From: David Osborn <davidcosborn@gmail.com>
Date: Sun, 30 Jun 2019 23:15:20 -0300
Subject: [PATCH 385/414] Accept any content type if accept header is missing.

---
 lib/src/core/request_context.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index d25a5804..3a630edc 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -210,7 +210,7 @@ abstract class RequestContext<RawRequest> {
     _acceptHeaderCache ??= headers.value('accept');
 
     if (_acceptHeaderCache == null) {
-      return false;
+      return true;
     } else if (strict != true && _acceptHeaderCache.contains('*/*')) {
       return true;
     } else {

From f83a874944b0c0475f88cd085889c359f69aa2bc Mon Sep 17 00:00:00 2001
From: Todd Volkert <tvolkert@google.com>
Date: Tue, 25 Jun 2019 13:23:31 -0700
Subject: [PATCH 386/414] Prepare for upcoming Dart SDK breaking change

The SDK recently updated `BytesBuilder.takeBytes()` and
`BytesBuilder.toBytes()` to return `Uint8List` rather than
`List<int>`.

A similar change has updated `File.openRead()` to return
`Stream<Uint8List>` and `HttpClientResponse` to implement
`Stream<Uint8List>`.

This change makes the corresponding update in the angel framework.

https://github.com/dart-lang/sdk/issues/36900
---
 CHANGELOG.md                       |  4 ++++
 lib/src/core/request_context.dart  | 10 +++++-----
 lib/src/core/response_context.dart | 11 +++++++----
 pubspec.yaml                       |  2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 786fc868..5d08ceea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.4
+* Prepare for Dart SDK change to `Stream<List<int>>` that are now
+  `Stream<Uint8List>`.
+
 # 2.0.3
 * Patch up a bug caused by an upstream change to Dart's stream semantics.
 See more: https://github.com/angel-dart/angel/issues/106#issuecomment-499564485
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index d25a5804..b6b145ec 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -234,7 +234,7 @@ abstract class RequestContext<RawRequest> {
         _uploadedFiles = [];
 
         var parsed = _bodyObject =
-            await body.transform(encoding.decoder).join().then(json.decode);
+            await encoding.decoder.bind(body).join().then(json.decode);
 
         if (parsed is Map) {
           _bodyFields = Map<String, dynamic>.from(parsed);
@@ -244,8 +244,8 @@ abstract class RequestContext<RawRequest> {
       } else if (contentType.type == 'application' &&
           contentType.subtype == 'x-www-form-urlencoded') {
         _uploadedFiles = [];
-        var parsed = await body
-            .transform(encoding.decoder)
+        var parsed = await encoding.decoder
+            .bind(body)
             .join()
             .then((s) => Uri.splitQueryString(s, encoding: encoding));
         _bodyFields = Map<String, dynamic>.from(parsed);
@@ -254,7 +254,7 @@ abstract class RequestContext<RawRequest> {
           contentType.parameters.containsKey('boundary')) {
         var boundary = contentType.parameters['boundary'];
         var transformer = MimeMultipartTransformer(boundary);
-        var parts = body.transform(transformer).map((part) =>
+        var parts = transformer.bind(body).map((part) =>
             HttpMultipartFormData.parse(part, defaultEncoding: encoding));
         _bodyFields = {};
         _uploadedFiles = [];
@@ -334,6 +334,6 @@ class UploadedFile {
 
   /// Reads the contents of the file as [String], using the given [encoding].
   Future<String> readAsString({Encoding encoding = utf8}) {
-    return data.transform(encoding.decoder).join();
+    return encoding.decoder.bind(data).join();
   }
 }
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index acdc18c0..e7478ba8 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -4,6 +4,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:convert' as c show json;
 import 'dart:io' show BytesBuilder, Cookie;
+import 'dart:typed_data';
 
 import 'package:angel_route/angel_route.dart';
 import 'package:file/file.dart';
@@ -148,7 +149,7 @@ abstract class ResponseContext<RawResponse>
     headers['content-length'] = file.lengthSync().toString();
 
     if (!isBuffered) {
-      await file.openRead().pipe(this);
+      await file.openRead().cast<List<int>>().pipe(this);
     } else {
       buffer.add(file.readAsBytesSync());
       await close();
@@ -320,7 +321,9 @@ abstract class ResponseContext<RawResponse>
         : MediaType.parse(mimeType);
 
     if (correspondingRequest.method != 'HEAD') {
-      return this.addStream(file.openRead()).then((_) => this.close());
+      return this
+          .addStream(file.openRead().cast<List<int>>())
+          .then((_) => this.close());
     }
   }
 
@@ -432,12 +435,12 @@ class _LockableBytesBuilderImpl implements LockableBytesBuilder {
   int get length => _buf.length;
 
   @override
-  List<int> takeBytes() {
+  Uint8List takeBytes() {
     return _buf.takeBytes();
   }
 
   @override
-  List<int> toBytes() {
+  Uint8List toBytes() {
     return _buf.toBytes();
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index 368462c9..6d36a858 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.3
+version: 2.0.4
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 2f2295ed5a1c5018816455055c8d97e18cdd53e0 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Mon, 8 Jul 2019 20:22:09 -0400
Subject: [PATCH 387/414] full changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d08ceea..4fa9ef82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # 2.0.4
 * Prepare for Dart SDK change to `Stream<List<int>>` that are now
   `Stream<Uint8List>`.
+* Accept any content type if accept header is missing. See
+[this PR](https://github.com/angel-dart/framework/pull/239).
 
 # 2.0.3
 * Patch up a bug caused by an upstream change to Dart's stream semantics.

From 5ba849d9b113b040967453df11fba532b4578a01 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 17 Jul 2019 13:20:20 -0400
Subject: [PATCH 388/414] Add allowHttp1

---
 CHANGELOG.md                   |  3 +++
 lib/src/http2/angel_http2.dart | 18 ++++++++++++++----
 pubspec.yaml                   |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fa9ef82..20544adf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.0.5
+* Add `allowHttp1` to `AngelHttp2` constructors.
+
 # 2.0.4
 * Prepare for Dart SDK change to `Stream<List<int>>` that are now
   `Stream<Uint8List>`.
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index 00b96a19..166cf99d 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:angel_framework/angel_framework.dart' hide Header;
+import 'package:angel_framework/http.dart';
 import 'package:http2/transport.dart';
 import 'package:mock_request/mock_request.dart';
 import 'package:pedantic/pedantic.dart';
@@ -19,6 +20,7 @@ Future<SecureServerSocket> startSharedHttp2(
 class AngelHttp2 extends Driver<Socket, ServerTransportStream,
     SecureServerSocket, Http2RequestContext, Http2ResponseContext> {
   final ServerSettings settings;
+  AngelHttp _http;
   final StreamController<HttpRequest> _onHttp1 = StreamController();
   final Map<String, MockHttpSession> _sessions = {};
   final Uuid _uuid = Uuid();
@@ -30,17 +32,23 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
       Angel app,
       Future<SecureServerSocket> Function(dynamic, int) serverGenerator,
       bool useZone,
+      bool allowHttp1,
       this.settings)
       : super(
           app,
           serverGenerator,
           useZone: useZone,
-        );
+        ) {
+    if (allowHttp1) {
+      _http = AngelHttp(app, useZone: useZone);
+      onHttp1.listen(_http.handleRequest);
+    }
+  }
 
   factory AngelHttp2(Angel app, SecurityContext securityContext,
-      {bool useZone = true, ServerSettings settings}) {
+      {bool useZone = true, bool allowHttp1 = false, ServerSettings settings}) {
     return AngelHttp2.custom(app, securityContext, SecureServerSocket.bind,
-        settings: settings);
+        allowHttp1: allowHttp1, settings: settings);
   }
 
   factory AngelHttp2.custom(
@@ -49,13 +57,14 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
       Future<SecureServerSocket> serverGenerator(
           address, int port, SecurityContext ctx),
       {bool useZone = true,
+      bool allowHttp1 = false,
       ServerSettings settings}) {
     return AngelHttp2._(app, (address, port) {
       var addr = address is InternetAddress
           ? address
           : InternetAddress(address.toString());
       return Future.sync(() => serverGenerator(addr, port, ctx));
-    }, useZone, settings);
+    }, useZone, allowHttp1, settings);
   }
 
   /// Fires when an HTTP/1.x request is received.
@@ -70,6 +79,7 @@ class AngelHttp2 extends Driver<Socket, ServerTransportStream,
   @override
   Future<SecureServerSocket> close() async {
     await _artificial.close();
+    await _http?.close();
     return await super.close();
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 6d36a858..e4207fad 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.4
+version: 2.0.5
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 6a34a5462a36d74fb68f223b76692503c164d057 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 17 Jul 2019 13:21:43 -0400
Subject: [PATCH 389/414] allowHttp1 test

---
 test/http2/adapter_test.dart | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
index 701f985c..5d287a32 100644
--- a/test/http2/adapter_test.dart
+++ b/test/http2/adapter_test.dart
@@ -22,6 +22,7 @@ Stream<List<int>> jfkStream() {
 
 void main() {
   var client = Http2Client();
+  var h1c = http.Client();
   Angel app;
   AngelHttp2 http2;
   Uri serverRoot;
@@ -97,7 +98,7 @@ void main() {
       ..usePrivateKey('dev.key', password: 'dartdart')
       ..setAlpnProtocols(['h2'], true);
 
-    http2 = AngelHttp2(app, ctx);
+    http2 = AngelHttp2(app, ctx, allowHttp1: true);
 
     var server = await http2.startServer();
     serverRoot = Uri.parse('https://127.0.0.1:${server.port}');
@@ -105,6 +106,7 @@ void main() {
 
   tearDown(() async {
     await http2.close();
+    await h1c.close();
   });
 
   test('buffered response', () async {
@@ -112,6 +114,11 @@ void main() {
     expect(response.body, 'Hello world');
   });
 
+  test('allowHttp1', () async {
+    var response = await h1c.get(serverRoot);
+    expect(response.body, 'Hello world');
+  });
+
   test('streamed response', () async {
     var response = await client.get(serverRoot.replace(path: '/stream'));
     expect(response.body, jfk);

From ac71ffad0fd006111bf90357ce30d9ed8535edb2 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 17 Jul 2019 13:47:30 -0400
Subject: [PATCH 390/414] Hostname syntax parser

---
 CHANGELOG.md                      |  3 +-
 lib/src/core/hostname_parser.dart | 64 +++++++++++++++++++++++++++++++
 lib/src/core/hostname_router.dart |  5 +++
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/core/hostname_parser.dart
 create mode 100644 lib/src/core/hostname_router.dart

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20544adf..2c1bff73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 2.0.5
-* Add `allowHttp1` to `AngelHttp2` constructors.
+* Add `allowHttp1` to `AngelHttp2` constructors. https://github.com/angel-dart/angel/issues/108
+* 
 
 # 2.0.4
 * Prepare for Dart SDK change to `Stream<List<int>>` that are now
diff --git a/lib/src/core/hostname_parser.dart b/lib/src/core/hostname_parser.dart
new file mode 100644
index 00000000..7f44112c
--- /dev/null
+++ b/lib/src/core/hostname_parser.dart
@@ -0,0 +1,64 @@
+import 'dart:collection';
+import 'package:string_scanner/string_scanner.dart';
+
+/// Parses a string into a [RegExp] that is matched against hostnames.
+class HostnameSyntaxParser {
+  final SpanScanner _scanner;
+  var _safe = RegExp(r"[0-9a-zA-Z-_]+");
+
+  HostnameSyntaxParser(String hostname) : _scanner = SpanScanner(hostname);
+
+  RegExp parse() {
+    var b = StringBuffer();
+    var parts = Queue<String>();
+
+    while (!_scanner.isDone) {
+      if (_scanner.scan('|')) {
+        if (parts.isEmpty) {
+          throw FormatException(
+              '${_scanner.emptySpan.end.toolString}: No hostname parts found before "|".');
+        } else {
+          var next = _parseHostnamePart();
+          if (next == null) {
+            throw FormatException(
+                '${_scanner.emptySpan.end.toolString}: No hostname parts found after "|".');
+          } else {
+            var prev = parts.removeLast();
+            parts.addLast('(($prev)|($next))');
+          }
+        }
+      } else {
+        var part = _parseHostnamePart();
+        if (part != null) {
+          parts.add(part);
+        }
+      }
+    }
+
+    while (parts.isNotEmpty) {
+      b.write(parts.removeFirst());
+    }
+
+    if (b.isEmpty) {
+      throw FormatException('Invalid or empty hostname.');
+    } else {
+      return RegExp(b.toString(), caseSensitive: false);
+    }
+  }
+
+  String _parseHostnamePart() {
+    if (_scanner.scan('*.')) {
+      return r'([^$]+\.)?';
+    } else if (_scanner.scan('*')) {
+      return r'[^$]*';
+    } else if (_scanner.scan(_safe)) {
+      return _scanner.lastMatch[0];
+    } else if (!_scanner.isDone) {
+      var s = String.fromCharCode(_scanner.peekChar());
+      throw FormatException(
+          '${_scanner.emptySpan.end.toolString}: Unexpected character "$s".');
+    } else {
+      return null;
+    }
+  }
+}
diff --git a/lib/src/core/hostname_router.dart b/lib/src/core/hostname_router.dart
new file mode 100644
index 00000000..3e7951ed
--- /dev/null
+++ b/lib/src/core/hostname_router.dart
@@ -0,0 +1,5 @@
+import 'dart:async';
+import 'package:string_scanner/string_scanner.dart';
+import 'request_context.dart';
+import 'response_context.dart';
+import 'server.dart';

From 2fdfb848f06a6abbda934e3c7d609c2f3bb7d6b9 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 17 Jul 2019 14:57:51 -0400
Subject: [PATCH 391/414] Hostnamerouter done

---
 example/hostname.dart             |  43 +++++++++++
 lib/src/core/core.dart            |   2 +
 lib/src/core/hostname_parser.dart |  44 +++++++----
 lib/src/core/hostname_router.dart | 119 +++++++++++++++++++++++++++++-
 4 files changed, 194 insertions(+), 14 deletions(-)
 create mode 100644 example/hostname.dart

diff --git a/example/hostname.dart b/example/hostname.dart
new file mode 100644
index 00000000..bd6bcad8
--- /dev/null
+++ b/example/hostname.dart
@@ -0,0 +1,43 @@
+import 'dart:async';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:logging/logging.dart';
+
+Future<void> apiConfigurer(Angel app) async {
+  app.get('/', (req, res) => 'Hello, API!');
+  app.fallback((req, res) {
+    return 'fallback on ${req.uri} (within the API)';
+  });
+}
+
+Future<void> frontendConfigurer(Angel app) async {
+  app.fallback((req, res) => '(usually an index page would be shown here.)');
+}
+
+main() async {
+  // Logging set up/boilerplate
+  Logger.root.onRecord.listen(print);
+
+  var app = Angel(logger: Logger('angel'));
+  var http = AngelHttp(app);
+  var multiHost = HostnameRouter.configure({
+    'api.localhost:3000': apiConfigurer,
+    'localhost:3000': frontendConfigurer,
+  });
+
+  app
+    ..fallback(multiHost.handleRequest)
+    ..fallback((req, res) {
+      res.write('Uncaught hostname: ${req.hostname}');
+    });
+
+  app.errorHandler = (e, req, res) {
+    print(e.message ?? e.error ?? e);
+    print(e.stackTrace);
+    return e.toJson();
+  };
+
+  await http.startServer('127.0.0.1', 3000);
+  print('Listening at ${http.uri}');
+  print('(See what happens when you visit http://localhost:3000 instead)');
+}
diff --git a/lib/src/core/core.dart b/lib/src/core/core.dart
index 755ae9ae..a7a0da4f 100644
--- a/lib/src/core/core.dart
+++ b/lib/src/core/core.dart
@@ -3,6 +3,8 @@ export 'controller.dart';
 export 'driver.dart';
 export 'env.dart';
 export 'hooked_service.dart';
+export 'hostname_parser.dart';
+export 'hostname_router.dart';
 export 'map_service.dart';
 export 'metadata.dart';
 export 'request_context.dart';
diff --git a/lib/src/core/hostname_parser.dart b/lib/src/core/hostname_parser.dart
index 7f44112c..5b3540fb 100644
--- a/lib/src/core/hostname_parser.dart
+++ b/lib/src/core/hostname_parser.dart
@@ -4,9 +4,16 @@ import 'package:string_scanner/string_scanner.dart';
 /// Parses a string into a [RegExp] that is matched against hostnames.
 class HostnameSyntaxParser {
   final SpanScanner _scanner;
-  var _safe = RegExp(r"[0-9a-zA-Z-_]+");
+  var _safe = RegExp(r"[0-9a-zA-Z-_:]+");
 
-  HostnameSyntaxParser(String hostname) : _scanner = SpanScanner(hostname);
+  HostnameSyntaxParser(String hostname)
+      : _scanner = SpanScanner(hostname, sourceUrl: hostname);
+
+  FormatException _formatExc(String message) {
+    var span = _scanner.lastSpan ?? _scanner.emptySpan;
+    return FormatException(
+        '${span.start.toolString}: $message\n' + span.highlight(color: true));
+  }
 
   RegExp parse() {
     var b = StringBuffer();
@@ -15,13 +22,11 @@ class HostnameSyntaxParser {
     while (!_scanner.isDone) {
       if (_scanner.scan('|')) {
         if (parts.isEmpty) {
-          throw FormatException(
-              '${_scanner.emptySpan.end.toolString}: No hostname parts found before "|".');
+          throw _formatExc('No hostname parts found before "|".');
         } else {
           var next = _parseHostnamePart();
           if (next == null) {
-            throw FormatException(
-                '${_scanner.emptySpan.end.toolString}: No hostname parts found after "|".');
+            throw _formatExc('No hostname parts found after "|".');
           } else {
             var prev = parts.removeLast();
             parts.addLast('(($prev)|($next))');
@@ -30,6 +35,18 @@ class HostnameSyntaxParser {
       } else {
         var part = _parseHostnamePart();
         if (part != null) {
+          if (_scanner.scan('.')) {
+            var subPart = _parseHostnamePart(shouldThrow: false);
+            while (subPart != null) {
+              part += '\\.' + subPart;
+              if (_scanner.scan('.')) {
+                subPart = _parseHostnamePart(shouldThrow: false);
+              } else {
+                break;
+              }
+            }
+          }
+
           parts.add(part);
         }
       }
@@ -40,23 +57,24 @@ class HostnameSyntaxParser {
     }
 
     if (b.isEmpty) {
-      throw FormatException('Invalid or empty hostname.');
+      throw _formatExc('Invalid or empty hostname.');
     } else {
-      return RegExp(b.toString(), caseSensitive: false);
+      return RegExp('^$b\$', caseSensitive: false);
     }
   }
 
-  String _parseHostnamePart() {
+  String _parseHostnamePart({bool shouldThrow = true}) {
     if (_scanner.scan('*.')) {
-      return r'([^$]+\.)?';
+      return r'([^$.]+\.)?';
     } else if (_scanner.scan('*')) {
       return r'[^$]*';
+    } else if (_scanner.scan('+')) {
+      return r'[^$]+';
     } else if (_scanner.scan(_safe)) {
       return _scanner.lastMatch[0];
-    } else if (!_scanner.isDone) {
+    } else if (!_scanner.isDone && shouldThrow) {
       var s = String.fromCharCode(_scanner.peekChar());
-      throw FormatException(
-          '${_scanner.emptySpan.end.toolString}: Unexpected character "$s".');
+      throw _formatExc('Unexpected character "$s".');
     } else {
       return null;
     }
diff --git a/lib/src/core/hostname_router.dart b/lib/src/core/hostname_router.dart
index 3e7951ed..c6e98f70 100644
--- a/lib/src/core/hostname_router.dart
+++ b/lib/src/core/hostname_router.dart
@@ -1,5 +1,122 @@
 import 'dart:async';
-import 'package:string_scanner/string_scanner.dart';
+import 'package:angel_container/angel_container.dart';
+import 'package:angel_route/angel_route.dart';
+import 'package:logging/logging.dart';
+import 'env.dart';
+import 'hostname_parser.dart';
 import 'request_context.dart';
 import 'response_context.dart';
+import 'routable.dart';
 import 'server.dart';
+
+/// A utility that allows requests to be handled based on their
+/// origin's hostname.
+///
+/// For example, an application could handle example.com and api.example.com
+/// separately.
+///
+/// The provided patterns can be any `Pattern`. If a `String` is provided, a simple
+/// grammar (see [HostnameSyntaxParser]) is used to create [RegExp].
+///
+/// For example:
+/// * `example.com` -> `/example\.com/`
+/// * `*.example.com` -> `/([^$.]\.)?example\.com/`
+/// * `example.*` -> `/example\./[^$]*`
+/// * `example.+` -> `/example\./[^$]+`
+class HostnameRouter {
+  final Map<Pattern, Angel> _apps = {};
+  final Map<Pattern, FutureOr<Angel> Function()> _creators = {};
+  final List<Pattern> _patterns = [];
+
+  HostnameRouter(
+      {Map<Pattern, Angel> apps = const {},
+      Map<Pattern, FutureOr<Angel> Function()> creators = const {}}) {
+    Map<Pattern, V> _parseMap<V>(Map<Pattern, V> map) {
+      return map.map((p, c) {
+        Pattern pp;
+
+        if (p is String) {
+          pp = HostnameSyntaxParser(p).parse();
+        } else {
+          pp = p;
+        }
+
+        return MapEntry(pp, c);
+      });
+    }
+
+    apps ??= {};
+    creators ??= {};
+    apps = _parseMap(apps);
+    creators = _parseMap(creators);
+    var patterns = apps.keys.followedBy(creators.keys).toSet().toList();
+    _apps.addAll(apps);
+    _creators.addAll(creators);
+    _patterns.addAll(patterns);
+    // print(_creators);
+  }
+
+  factory HostnameRouter.configure(
+      Map<Pattern, FutureOr<void> Function(Angel)> configurers,
+      {Reflector reflector = const EmptyReflector(),
+      AngelEnvironment environment = angelEnv,
+      Logger logger,
+      bool allowMethodOverrides = true,
+      FutureOr<String> Function(dynamic) serializer,
+      ViewGenerator viewGenerator}) {
+    var creators = configurers.map((p, c) {
+      return MapEntry(p, () async {
+        var app = Angel(
+            reflector: reflector,
+            environment: environment,
+            logger: logger,
+            allowMethodOverrides: allowMethodOverrides,
+            serializer: serializer,
+            viewGenerator: viewGenerator);
+        await app.configure(c);
+        return app;
+      });
+    });
+    return HostnameRouter(creators: creators);
+  }
+
+  /// Attempts to handle a request, according to its hostname.
+  ///
+  /// If none is matched, then `true` is returned.
+  /// Also returns `true` if all of the sub-app's handlers returned
+  /// `true`.
+  Future<bool> handleRequest(RequestContext req, ResponseContext res) async {
+    if (req.hostname != null) {
+      for (var pattern in _patterns) {
+        // print('${req.hostname} vs $_creators');
+        if (pattern.allMatches(req.hostname).isNotEmpty) {
+          // Resolve the entire pipeline within the context of the selected app.
+          var app = _apps[pattern] ??= (await _creators[pattern]());
+          // print('App for ${req.hostname} = $app from $pattern');
+          // app.dumpTree();
+
+          var r = app.optimizedRouter;
+          var resolved =
+              r.resolveAbsolute(req.path, method: req.method);
+          var pipeline = MiddlewarePipeline<RequestHandler>(resolved);
+          // print('Pipeline: $pipeline');
+          for (var handler in pipeline.handlers) {
+            // print(handler);
+            // Avoid stack overflow.
+            if (handler == handleRequest) {
+              continue;
+            } else if (!await app.executeHandler(handler, req, res)) {
+              // print('$handler TERMINATED');
+              return false;
+            } else {
+              // print('$handler CONTINUED');
+            }
+          }
+        }
+      }
+    }
+
+    // Otherwise, return true.
+    return true;
+  }
+}

From 91bc517b1f56f81d043b788de5edbe59c6e5e2c3 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 17 Jul 2019 15:05:51 -0400
Subject: [PATCH 392/414] decode+deserialize body

---
 CHANGELOG.md                      |  3 ++-
 lib/src/core/request_context.dart | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c1bff73..56f23074 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 2.0.5
 * Add `allowHttp1` to `AngelHttp2` constructors. https://github.com/angel-dart/angel/issues/108
-* 
+* Add `deserializeBody` and `decodeBody` to `RequestContext`. https://github.com/angel-dart/angel/issues/109
+* Add `HostnameRouter`, which allows for routing based on hostname. https://github.com/angel-dart/angel/issues/110
 
 # 2.0.4
 * Prepare for Dart SDK change to `Stream<List<int>>` that are now
diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 487c16fd..1afe206b 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -221,6 +221,17 @@ abstract class RequestContext<RawRequest> {
   /// Returns as `true` if the client's `Accept` header indicates that it will accept any response content type.
   bool get acceptsAll => _acceptsAllCache ??= accepts('*/*');
 
+  /// Shorthand for deserializing a body.
+  Future<T> deserializeBody<T>(FutureOr<T> Function(Map) f,
+      {Encoding encoding = utf8}) async {
+    await parseBody(encoding: encoding);
+    return await f(bodyAsMap);
+  }
+
+  /// Shorthand for decoding a body.
+  Future<T> decodeBody<T>(Codec<T, Map> codec, {Encoding encoding = utf8}) =>
+      deserializeBody(codec.decode, encoding: encoding);
+
   /// Manually parses the request body, if it has not already been parsed.
   Future<void> parseBody({Encoding encoding = utf8}) async {
     if (contentType == null) {

From 0a9b5c118ff91ab0070193636189aa72b89f1db2 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 17 Jul 2019 15:26:34 -0400
Subject: [PATCH 393/414] optional expose

---
 CHANGELOG.md                 |  1 +
 lib/src/core/controller.dart | 58 +++++++++++++++++++++++++++++++-----
 lib/src/core/metadata.dart   | 20 ++++++++++++-
 pubspec.yaml                 |  1 +
 4 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56f23074..9d596d13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # 2.0.5
+* Make `@Expose()` in `Controller` optional. https://github.com/angel-dart/angel/issues/107
 * Add `allowHttp1` to `AngelHttp2` constructors. https://github.com/angel-dart/angel/issues/108
 * Add `deserializeBody` and `decodeBody` to `RequestContext`. https://github.com/angel-dart/angel/issues/109
 * Add `HostnameRouter`, which allows for routing based on hostname. https://github.com/angel-dart/angel/issues/110
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 6befde29..9dd11cd5 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -4,7 +4,7 @@ import 'dart:async';
 import 'package:angel_container/angel_container.dart';
 import 'package:angel_route/angel_route.dart';
 import 'package:meta/meta.dart';
-
+import 'package:recase/recase.dart';
 import '../core/core.dart';
 
 /// Supports grouping routes with shared functionality.
@@ -86,7 +86,15 @@ class Controller {
             .map((m) => m.reflectee)
             .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
 
-        if (exposeDecl == null) return;
+        if (exposeDecl == null) {
+          // If this has a @noExpose, return null.
+          if (decl.function.annotations.any((m) => m.reflectee is NoExpose)) {
+            return;
+          } else {
+            // Otherwise, create an @Expose.
+            exposeDecl = Expose(null);
+          }
+        }
 
         var reflectedMethod =
             instanceMirror.getField(methodName).reflectee as Function;
@@ -117,6 +125,30 @@ class Controller {
           injection.optional?.addAll(exposeDecl.allowNull);
         }
 
+        // If there is no path, reverse-engineer one.
+        var path = exposeDecl.path;
+        if (path == null) {
+          var parts = <String>[];
+          parts.add(ReCase(method.name).snakeCase.replaceAll(_multiScore, '_'));
+
+          // Try to infer String, int, or double.
+          for (var p in injection.required) {
+            if (p is List && p.length == 2 && p[0] is String && p[1] is Type) {
+              var name = p[0] as String;
+              var type = p[1] as Type;
+              if (type == String) {
+                parts.add(':$name');
+              } else if (type == int) {
+                parts.add('int:$name');
+              } else if (type == double) {
+                parts.add('double:$name');
+              }
+            }
+          }
+
+          path = parts.join('/');
+        }
+
         routeMappings[name] = routable.addRoute(exposeDecl.method,
             exposeDecl.path, handleContained(reflectedMethod, injection),
             middleware: middleware);
@@ -127,10 +159,22 @@ class Controller {
   /// Used to add additional routes to the router from within a [Controller].
   void configureRoutes(Routable routable) {}
 
+  static final RegExp _multiScore = RegExp(r'__+');
+
   /// Finds the [Expose] declaration for this class.
-  Expose findExpose(Reflector reflector) => reflector
-      .reflectClass(runtimeType)
-      .annotations
-      .map((m) => m.reflectee)
-      .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
+  Expose findExpose(Reflector reflector, {bool concreteOnly = false}) {
+    var existing = reflector
+        .reflectClass(runtimeType)
+        .annotations
+        .map((m) => m.reflectee)
+        .firstWhere((r) => r is Expose, orElse: () => null) as Expose;
+    return existing ??
+        (concreteOnly
+            ? null
+            : Expose(ReCase(runtimeType.toString())
+                .snakeCase
+                .replaceAll('_controller', '')
+                .replaceAll('_ctrl', '')
+                .replaceAll(_multiScore, '_')));
+  }
 }
diff --git a/lib/src/core/metadata.dart b/lib/src/core/metadata.dart
index 877073ff..91e419b2 100644
--- a/lib/src/core/metadata.dart
+++ b/lib/src/core/metadata.dart
@@ -21,7 +21,14 @@ class Hooks {
   const Hooks({this.before = const [], this.after = const []});
 }
 
-/// Exposes a [Controller] to the Internet.
+/// Specifies to NOT expose a method to the Internet.
+class NoExpose {
+  const NoExpose();
+}
+
+const NoExpose noExpose = NoExpose();
+
+/// Exposes a [Controller] or method to the Internet.
 class Expose {
   final String method;
   final String path;
@@ -29,11 +36,22 @@ class Expose {
   final String as;
   final List<String> allowNull;
 
+  static const Expose get = Expose(null, method: 'GET'),
+      post = Expose(null, method: 'POST'),
+      patch = Expose(null, method: 'PATCH'),
+      put = Expose(null, method: 'PUT'),
+      delete = Expose(null, method: 'DELETE'),
+      head = Expose(null, method: 'HEAD');
+
   const Expose(this.path,
       {this.method = "GET",
       this.middleware = const [],
       this.as,
       this.allowNull = const []});
+
+  const Expose.method(this.method,
+      {this.middleware, this.as, this.allowNull = const []})
+      : path = null;
 }
 
 /// Used to apply special dependency injections or functionality to a function parameter.
diff --git a/pubspec.yaml b/pubspec.yaml
index e4207fad..152229ab 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -25,6 +25,7 @@ dependencies:
   path: ^1.0.0
   pedantic: ^1.0.0
   quiver_hashcode: ^2.0.0
+  recase: ^2.0.0
   stack_trace: ^1.0.0
   tuple: ^1.0.0
   uuid: ^2.0.0-rc.1

From 650cf208fcdb36803c01c62274dd6e9d5f98d767 Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 17 Jul 2019 15:48:02 -0400
Subject: [PATCH 394/414] Expose-less ctrl done

---
 example/controller.dart      | 59 ++++++++++++++++++++++++++++++++++++
 lib/src/core/controller.dart | 29 ++++++++++++++++--
 2 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 example/controller.dart

diff --git a/example/controller.dart b/example/controller.dart
new file mode 100644
index 00000000..1e0da928
--- /dev/null
+++ b/example/controller.dart
@@ -0,0 +1,59 @@
+import 'package:angel_container/mirrors.dart';
+import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/http.dart';
+import 'package:logging/logging.dart';
+
+main() async {
+  // Logging set up/boilerplate
+  Logger.root.onRecord.listen(print);
+
+  // Create our server.
+  var app = Angel(logger: Logger('angel'), reflector: MirrorsReflector());
+  var http = AngelHttp(app);
+
+  await app.mountController<ArtistsController>();
+
+  // Simple fallback to throw a 404 on unknown paths.
+  app.fallback((req, res) {
+    throw AngelHttpException.notFound(
+      message: 'Unknown path: "${req.uri.path}"',
+    );
+  });
+
+  app.errorHandler = (e, req, res) => e.toJson();
+
+  await http.startServer('127.0.0.1', 3000);
+  print('Listening at ${http.uri}');
+  app.dumpTree();
+}
+
+class ArtistsController extends Controller {
+  List index() {
+    return ['Elvis', 'Stevie', 'Van Gogh'];
+  }
+
+  String getById(int id, RequestContext req) {
+    return 'You fetched ID: $id from IP: ${req.ip}';
+  }
+
+  @Expose.post
+  form(RequestContext req) async {
+    // Deserialize the body into an artist.
+    var artist = await req.deserializeBody((m) {
+      return Artist(name: m['name'] as String ?? '(unknown name)');
+    });
+
+    // Return it (it will be serialized to JSON).
+    return artist;
+  }
+}
+
+class Artist {
+  final String name;
+
+  Artist({this.name});
+
+  Map<String, dynamic> toJson() {
+    return {'name': name};
+  }
+}
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 9dd11cd5..4f3d4a5f 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -127,9 +127,31 @@ class Controller {
 
         // If there is no path, reverse-engineer one.
         var path = exposeDecl.path;
+        var httpMethod = exposeDecl.method ?? 'GET';
         if (path == null) {
           var parts = <String>[];
-          parts.add(ReCase(method.name).snakeCase.replaceAll(_multiScore, '_'));
+          var methodMatch = _methods.firstMatch(method.name);
+
+          if (methodMatch != null) {
+            var rest = method.name.replaceAll(_methods, '');
+            var restPath = ReCase(rest.isEmpty ? 'index' : rest)
+                .snakeCase
+                .replaceAll(_multiScore, '_');
+            httpMethod = methodMatch[1].toUpperCase();
+
+            if (['index', 'by_id'].contains(restPath)) {
+              parts.add('/');
+            } else {
+              parts.add(restPath);
+            }
+          } else {
+            if (method.name == 'index') {
+              parts.add('/');
+            } else {
+              parts.add(
+                  ReCase(method.name).snakeCase.replaceAll(_multiScore, '_'));
+            }
+          }
 
           // Try to infer String, int, or double.
           for (var p in injection.required) {
@@ -149,8 +171,8 @@ class Controller {
           path = parts.join('/');
         }
 
-        routeMappings[name] = routable.addRoute(exposeDecl.method,
-            exposeDecl.path, handleContained(reflectedMethod, injection),
+        routeMappings[name] = routable.addRoute(
+            httpMethod, path, handleContained(reflectedMethod, injection),
             middleware: middleware);
       }
     };
@@ -159,6 +181,7 @@ class Controller {
   /// Used to add additional routes to the router from within a [Controller].
   void configureRoutes(Routable routable) {}
 
+  static final RegExp _methods = RegExp(r'^(get|post|patch|delete)');
   static final RegExp _multiScore = RegExp(r'__+');
 
   /// Finds the [Expose] declaration for this class.

From e23fd2369f8dedd6bce74ee43a59cb87be87ce02 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 25 Jul 2019 22:45:47 -0400
Subject: [PATCH 395/414] 2.0.4+1 (configureRoutes)

---
 .CHANGELOG.md.swp            | Bin 0 -> 24576 bytes
 .pubspec.yaml.swp            | Bin 0 -> 12288 bytes
 CHANGELOG.md                 |   4 ++++
 lib/src/core/controller.dart |  10 +++++-----
 pubspec.yaml                 |   2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 .CHANGELOG.md.swp
 create mode 100644 .pubspec.yaml.swp

diff --git a/.CHANGELOG.md.swp b/.CHANGELOG.md.swp
new file mode 100644
index 0000000000000000000000000000000000000000..f26c773c3a2fee123520e2799fb7fa19c4a0abd9
GIT binary patch
literal 24576
zcmeI4eXL|>UB{<Tp_LXIs9=oNr_{19-I=?4cemX)w!QntUfkPV_5}&G-g9QoGk4DJ
znK{#Q&fI&aiG4xaN)w3^c?thikv~wQSVWCr3`wg}iX=e6R4^Ek*2JoWv=yp?pWp9!
z&b;2OK-9!!Hu>h>J9EzS@_T!JZ_n1ZzjblR?5XXj@b9WhW#?u4ZvWI(*S{p&eMzNg
zrFnQ^&B|9V_U~+3w|R9bY#d6{3)O`<t0ie8Or~DBs~m9dOxnvDc5b1wVw1UM7PjqL
znq8PXe0<^7Hyu53@=djNH1+oEgBb;86!?KD&?}nNJy%wC&hOYRV_f(8Yt3t3eeMSy
zZua7g0y7HCC@`bIi~=(X%qTFUz>ESj3jF`0K+(OlayQF<iC_Aq{^unVKg-XX7kTc7
z{O4`|b7kWFm-@do&%p0bOnmSEoc)+lU`Bx%1!feOQD8=a83kq(m{DLxff)s66qr$9
zMuGnY3WOBekG-l=$$-@V%Q*je{(czb{=3`wX~5TBS*iRz_#5ym;1+N**bSb)vQl{t
z{4=-@902>lPVkK@DwR)w_ki2MYrz*@QK|e6_-*h(a6h;YtbrQ18oUO)3_S9~mCA2|
z4}$lA8mIyTzIl12@+t6s@ILS$I0H_Dqu>hg`O7Mm&w)q5onSxM2ddz?mscv!f~Ubp
z!NcG~;2?M-*bct?vP$Kv;FF*Wt^v=G^mqu|3YNeD@MGZbAmUfSXTdLl2f!-09(;yG
z$m8JS;6ZQ-Yyq3W>%dbaV!jTZ0Pg^|fy=>V;NM8fJPH2PCug>rbKR9JjI0TIy*LU?
zWV^N#*-oQhtBicvDvIv>__x=Y`P%l{_G*}PTVZX-o{Byng#}~fMP|eHu{g1TDN>W$
z!ZgxOVLOFMY-gotZ8KpfGGUUZ^1XC!n6zVp<3|^c1SYe0^lV<_vVw&uGQnw^chgR8
z56c+qMa_?OLWc_Ev7j4fxjmFd{lGL@ws9dh%``KeUXl!EF8W>T<}F%Tx|W;J1iQ9x
z4@}%NowQ@kT9})ac-3}lm5I&mmCY@7&f7*|iWVDOilZp8Yhh+j#a)}k9X1+w*vfG2
z<3r3-GKZe07pswNq|mz?7A=<6W@C^g=WTQR?AcTEgH1!hXdyq;FKiwtwF39anIelj
zD@xbkTsKK!UZj+E3{wWk-h)tDW0teDSJ+#2!m3@6hWWxGuE$ASz~G4`l2|kR+iK3X
zVyKfOLL_}Z7cO1sq-$oaWiu;_6*6QtPm^8|!@6#kHf+vwE!#JCJ<bbAU6`!bDdM&r
zSz6cA%e0UH2)AO|w!!al-geB19hqUyG?5nzn}tQ1!Sji=&kK2{1SJz$&H@p@+yqR6
zkQ9z|G&AfGp7F7h%(IBc^td}^+#|M|*@jBC_8ZmW{8W}ky@qT(*e0Vi!&PXWHcg;U
z9PO;CT&nmEJ~53X6dI*6X|};^yJWW0wwr_vYmmkxVG)`}m=`j|8Jn%f4O@%CtT1aa
z;uAtU8lobo4y^}LjZlj=*(^&lq5QFUok#1v70<n(97&aCF**>Xy?SB~1}I`LK`o2I
zwz~|NBBf9a=`#V+tvf;&(`40}4josK$zfn(3zSnysRFTTou&wFRGLMQgaw6gTS!z#
zPZ#o&b<rot=l@;`yZj-N>%KpM5CvxIR=XZHilon$8g}c}nwQZ5Pp}VRw>!>~agNB>
zwzC>%X{U{@jXzqBH{{glv(rp0M?sl{nX<tX=?e747<6QVXh;WpVo=v+!UmC6gF2xg
zt1+rNl-#UQQ==g4Nz#?L;W*})soDpDOS1_t>R6~OhBqi5HdRfmObF4{I-;^o^aI&S
z(j0pv=1hMbpA#)tk+8Wr)vLqXFzMgPYv>|MvN^Yyw@K4+W3XkQa4g#?8~iE-shvh~
z6VoeGcGAMYupT?;8~25*GDfDLR;jj(qN?SMDw?Y{-&=TZ@Q}4pyFX=Ox0*A(ZZ}08
zRPdZ7Lcqej-)UguJ84hkQp5~lR1p<=W@(bx403S<1##Md$s@~B9b5`8K!%C=Yq`zh
zFp2MkxS1__8ESE?$4`5po~Fq`6&CmA;7OS8pE;QwaHjj9Io9jwiZ(kH*fPF=-NGO@
zOlG4P%Yz!|TBCHWBL+Y4de0U{b~?6;8)cB-INg*sD!C-*hgg(A&PK#Fa;7Nmbg+>k
z$OFUBMipV?nn_o&B8V;4bMUr4xxk6pZ$n={IO>3vC?6ktdW5z&dD+9Z4}^!+Bw=~5
zG?G|P!-g87%(fX(P9o@y#f<W8#&SN(i5;khoYp56k_6e4gDGg@Q;Zr`<P6V54lB;V
zZVw4p17x89T$I6_pCL+^r)?`{QUyhi`7!z-e(i2z#e{H%Vqn$k<`?2_*G8ifq~3zs
zlf1xIpW)cC(Q);lgm!9<y?J(HaJtAsP<MBF=(Dv(FE7$I<jK;ux=5l%n31l{l99uk
z9ZEkQu9BShX8u~UPt|vy*~giD!4~_<waG({V5SGp<-88Fz6m;Z%?lXXfz6dgo)fcg
z0@241?<T9Y!W{WcyK7<5XmM1im!(GkNQTdpp&Xs4R2UsX*TVqKcm);7#0ZK=4b@>a
zjiZBleC7qBDV#aao`+B9Fo%Wx6ZWCzO`IIx7oFaDj-zI!mbZF^D3S0rXLR*J#1vpq
zaaFu@IWy`V95p~=wiN#;3n6S|WGH{Kj;w@%hEAc%h>9xDBb-T{S3N`25})bfi#b9&
zyCmMNBblg{crPrjf%b`GE&TA0ajGT#)8gI9PD+bWazGx$Rp$J(>&(!IIYGA$1sGM=
z^Ml9oURx&Fj3d!oX_*3VtP|6FjrC?>VIq3pH&GnjeDlraDWC_y(5+zeLahn)5JkJ_
zdYw_2zX2MY;lyd9j{A&68Tr1sxfPt7UL8WT=Twxd;_|p(=i)pkIGEe9{l@F`R~{0L
ztnS*oclV9EcJ0{>DNc!unqJrQrV;jXs9*16Mfud7oCvUtEyO*-=$mqXqT;BuL!8#e
z;IQJHx~&k8_|)m!H^2B2hkfW>B9FQGoqM+kYZe*}i$4{1`or@aZ&S=z=)P(}WTzr+
zc7>wXaQ7^(j_1>XbDYk5#3PbZX29(c@-`-=CQR1CKK{EqsL*A1RH>|-?x8pvz3k-)
zUqcKeY!Uw*vlHBMbiJ!yg^LHuvt}0zl=xrb&&!ETCH{w{`tRMu`b*$a@GP<Y!{E0-
z0BYc`iRnKAI^ZhsQR4Yq!5;7e@%p3SJa{E|h8X>i!CS#4;1S~Sd%z9guZX|@1VrF4
z_;K*J#M{3I?gs(58vG^k_WQvB@NHu3-vtkVMetMLo2>uC;5>K(ko{Z+X8&dsm{H(+
zpn$>HXvibZ5eHK>ZB{uKs`YfeR;ha5rZy55MYb9C5_~d@u!P~9{YMEr`=`suY4aA`
zgDB3!x?~Du3|u7_GC2RVz)!~u7XM%nY!QRRjG5yxN{%U8;eaFR<89~sNVrV=nyyvT
zI<c&kb9Lg_WRZytCE=818iPbk??V&}==U=cUeVYaQ&X`$wXEOYuxoLW9F{n5vB+)G
z)G3xUk9Pv64|-Y693AS#iDp2$MEG$-*)X}+K_uzox6Gv<^t_x}Y@8qJHJf<avMEFO
zAs!&-B?lYi62gm{H|kwV;F4=5NxdaUPMk}Z7J{P_%W-^F$5{s-tWIJ{+;dzJCpG((
zjf3&(x-OYL?H1Lzvuz-8;!W4^0Nzff&5b@LcV)y-oywDp#8xge*98U6X)L9|=S(E(
zB|yj3SZS%O;s4`vi0?{xLr8&$i`Y2_Uovq>dqxH+&G0(cYo&JBaK&b)d@?gu*KR0n
z?&X?azU=3)_=TDen|jK*jPlU2G%Hu@1OVL>2@#_BFt3BR=UfrhrZT9Tlu2fm(A5Ny
zB~A)_G*a}-v|xb~g<!e_pyWD6Ry7{s*IXb|Ol@)EF_P1D6>j8Y%#|lI6}HKY`ltdE
zKuGB$Y-~oK{8ZeK=z@eHIZKF-^QYm3dsO9DQo_|dY~tyJ5(O)H9N~_*5spiiQv72{
zZIDjXte2Q8$s72DrHgCS$K)H_f3uh#u7;8wc3Dn|Fwm1wMAAD_we}!`JZi}T&2Yk-
z1Ae=H{td$<O_1r5%Rwcn?1o!z6G<(LNV45CE@iw;b2E+xXl#I+Ouk5xbh55twsmwt
zlKLyx6lm-`zOVo{*%&dyWv18%1Ne_^ecrj9Co|LTOWtGiI3Kr}3H^u2xg<oyGI%-l
zbQWDArcm47t84bnk`R!Xl1K+T>)x>02DB3^Bx2y)+7xk@35aEFCP5kO6|vQf$50i-
zHmS^&LLghU>y4zB6Y-)ka9aaWS+h&Q$+~@rt=jGf7^SVq9D20h#r1AV(w@{Gaw0I&
zuL#nVRU{`F1%t7%D<g#(t(<fTD={7Wx+J2Y*IFwk0@C_Q+Y-*OLQ*N}$!l1yHc=AB
zML~^bxau+kQFB?dK^|^Q_561ieM@p}FZQN>?~ji)3*AwzfElv>*h++eV<z~HUc4Go
zKXOSN`8upie#j-k$z5vVnB50WDo?o=n;^~Nm6$B2JGp`_+u-8hkkdT+NcD)9HRnBA
zSs9F^-<%HDJXigIm>AeEIYto*p~_j7RxT<?!aMs~m||%8U1~Lh5#@uE<Lgs)PAG-X
zZXu~6w#va8$)U_nzFR#w_VwgiB~xHr?ZA&RJa5WPk;?VQ&IuM*l|75xWKI<fxp}@X
z&8{%PA4mJknPpF>MoutqI<=?~F?}Gy=Vy}`RMQli-*jJ$=X`~p8@#bdD$dK;25-4<
zH6u8**-X8Hn(2V!)7Rp3Ag^PyyDu=~qNe2CI3*B2jE6|jD9??rgc#9oQ~I2yn-aDQ
z_5A7IlX6tjAED=5X*%>xby~*Pw(-LF)URsAa&E;9cND1|4q2V6%S^0>MMQYJS(}8O
zX|W?dP?5%*pjbUyGe0Y3P7_8^EE&#i*i6n>Uu2RK&{-7qGjY+#k|0nL|DTZXfcmn;
z|4kn%e2cjMkHAA90-L}az%}3r;{RU+zX1ARAJ_|afXB!M+ym|gYhV}nE;)fG!Eb=K
zgV%w7B`@$V;3@EF@EG_6$iUmc&ww|BmxHIt89W7^1R1ykMBqkn1^5bigfD~70;&JM
z7rYak0<Q%>0xko8MsDG5a2L1(>;-$k4d8il4AKYikKi5PUQmF;;5u+A_!zl|I@k`r
zM$X~g;8(#t;OBtkA+7_j2A?7K@HqH5h{09hRp2`>Wu4&HKpQ0BHn0^)9_B~EU%-op
zz!EqC_Jf}QgG(BoNB<K)M%n~sJp`g8vmOF7>meAn#>~%p2&9-qATjG9ph8D$$gGE8
z)<ZDsAs_;o^$^T@2xdJ5vmOFk6Mfon)<f`r)I&g*1W7Q-B9N)o76^0Z$WM=SMU<Tf
zl4U-C=XQ{$AJ@&|G7r9qWtYbP*AqxSCq3oF|7{;s{sD3R`@nm_ec&c=1$YH`fjIy3
z;B(-U-~-?+xEg$ncz+3;0Mh&aZDRdzfv3S!;6d<CunyM1X)q6-CeD{!z!$+2;19vQ
zpbn0LE5Q}u---8M03QJlg6-fxiS7RbJOlm-d<lFJ{5g0O+zWmZTmxPSt^|(|^FILY
z2dkh5c7l2EdT=fH3Nine!Q<f5;KQH`7Qu0_2iycCH}D~H0?S}C_&V|bKY%B|7r?{d
z_rb3Nxi9eZAOuzL4RQis0`CI94DJSZfwzH8;1cjSIe`xV3+BLg$OSwG-UaI5jX?PK
ztiKoV-{u8K%9U+}MY>2w;$(fK{8kf8Jh0z&6VdQ5xioUz<PeLT<X%~nmGpja3-=FP
zt2IOB{dPS~C@@sbVH($^QcKcZGuf2ZB=zW$n1?7m4%%_6W{I3Id2H$DE?Xac=P0RN
zmnGM(qGip*FXyhUT2s&d)g-RZwWLK%d#yKqS-&62S6?h4FRe@S%UbRu5C1*9a6V5v
z%PT4SAJ#gR1Qf7V*w|`pDR^{9X>0S6Rtq*PeaTA;brP#o<F(m`)TIzb_A}D2zC@2{
zsGs}H=y(QH+WOo@jsf2WWRx_!?#N#vf$AlN^(#p*2D{~!$Ov_P{a<<n<m>VU#}eq|
z`VB`2#i*I=qP<MTl+@|?HI%Zs(cMEqBM>O5(rr{i(XzPKiQOH5i7dO+Lw!!)S0^ZE
zM=6pj)!mL2p-YuWE(1@YId0PpOnr6aIsgyT&JC+Fs=-M@X=B*4Ao*P{W4s~#;8|Xy
z#My1#K{i{+G4b(RPADN<F?r<6B7HMrGEOA7C|8_0+L22pndJM&2_*kZD`KI=>0omI
zWQW5>Yx*79{dfoc^tv)AZfL%F<HD;Jbx?jS(jq!4jXJH*SYrbySm~z6+HB>#k(@T=
z8(a8}g{gwI+7Gb+<zPCKB)7>?>nuV{Z-bOf<Gs+X#Mz_~T<*B!y;!cRNR80<laTk$
zA~P6t+f*iBo2E;84EGisSd6ymwGBBfr4}$4!*#g~mo&i_l0?P`m9db6%4e+^ccL-s
zc$T|5^zgaTh$%VCx~aZBoUqgk^l7B<DRiP0G8SQ)SQ4G^nEBC8?XsvPreN4tib;0O
z@E0*d6T{NquF@nW6>d;SF@#Gl+U)G?lr|hYb-?CPewQkde27gHCN)sPi7{z+Hv_4p
zL@Vu<;@6OJitPHJAnF#XEe`6|NH@GRRMPvA^1lhQjv`)>ZUM1FH2D@%jPtb3Yf{(i
z>+vPU^}()POFa)td2V7|G`t(LK*Kusytt+yEwTRBP2+}d==HUvT}4ifP5XUWnj-$N
zTN~TmPMO{H+jzygbzpMficBO|$*NMIiksXk(F<qVMjkjbJDANKa8u-@WnPWMK!s{;
zZUjs{Mx(odD3pk(V#%!_p{(39Vv!Suo%&K7QEpdaL&vge=(vQE<n}FE0ap61VG?tr
zCE-y8l3_QJv6}2nNA`xTm&F05LE0NsBh)lXozOjmC3B{E#7NY14dTg&Pb>l+Hk<J}
zHeXA`>TRIhsC8N0n<9s_;iF_26(NAIU~XRfcp=7x71x!&JRtp?FnYdZfG4-J;iC0k
zZ%?|`F7{QHSG6ZsG{W_Pmpfv?Q}%p#eT0p=+Mo%}K^t$d+%=6Q+P9px4Q<7Q81K+i
zW7zQRZUK_g?RDf<V8<*iE**9DPMi(bv*o-7ccpC5g}i(F_QB+Cvu*ANiu=J~BqAg?
zQA($9dPf6qWSaPTNU=mX7LMJg5~<msM$DGw)*Oekzk4ACP3{YcvT%D;E?v~E7$@eW
zqid2Pn$&lV<{OP(TjridhsGQ3!76cO<!V+Kt?DkpmQB=yJG2;F!@u&D#(?D)tnE&h
z^3@i?JI*SpFw16I+@gTh5m##EexU1#lW)hX_u}2iG+tZWbvqPGS|>*C-VOd5+|(26
z8}vplozmwaIy6zTF2_HNMU>emzIUo7JrVSGihlcGpd=3-zux5>Z8~uWwpcfL*!46)
z+5^MrRP<fC6Od)6`7(;{#Tnje*6s><YFX!<zDc@6uV0;$9-PubC%tyvX6K0=^yZWZ
z7vA^E6#F=YkRh74q;5{H(IyOmHehj@AlSK9)afE<Vcgu}_|#n}ZpV0m?otutoSaas
zywv5z2sQP>nRNKbJt(=iAa^GwrBg3jsnHlZl-%HH9Y(lOFn0k^6h*A{gdPZWlq<qI
V)dMs{jzkT?<U`jqqxOrz{tKByrm6q{

literal 0
HcmV?d00001

diff --git a/.pubspec.yaml.swp b/.pubspec.yaml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..48abd8ec94dba75368f8b8d7df1708ebce330860
GIT binary patch
literal 12288
zcmeI2v2N5r5Qg_sQ4k10qFydg!TEf-L<B2D91T!JL?Y0jVC}6p_Hy>FvtH*&LrNsx
zfP!~G;sJPr6m+ymP#{WZsF?NH;lfEMEodzL^3Cqd?98{7bu;uI-`}KbUXQ@DKuG^g
zuyeF<b<V7|h)s0CMq}Z&{`PF^p(r|=jNj3E)EP+QrJA#JCgeqvu=`M#hKue%#UkzQ
z8kUK%HluD{4vSoH?|@~q(KG3A0SO?1(-J7{Zf9+t^p|_S3t4JkrWY3<oi-Z%kN^@u
z0!RP}AOR$R1dsp{_zwu!yhRS7kGZ;+cKvSs@vcpLAps<S1dsp{Kmter2_OL^fCP{L
z5<mj~AORK;GB``fXOR2<zxn?EdY+JvphM6T&=Tkp=;t{?zJWe~-htkLUV<zr1Z{x=
z&=t@k=*K)EpFl^T_n^0+*PvIRF=z*L7jy%(1iAoffxg!@eQ|Z+g9MNO5<mh-00|%g
zB!C2v01`MY0ZOeXY(Ss(Jm2#PrBZ|8d;Q8ttj#O4w+wb9_QOczLPbJxDT)Bx%Th+*
z0o$J6F&u`aA!C`RVk%`}86Sn#Fh0GySIT{1!h{tG*OA+)l0bYeBBre5Qz>$0lPNRP
zkkE*|@?`Cq%v>JdyXo~IPbMsz4iY97Va8lXO}81dJQ1b}s(Pd})p0CU9MJa0E#K?)
zygps8+}n`S0a=EvNrGl2EQEnx>Z2V+=NIP8zy_=W%nIkOthlV!CfC_eDrU9wX)59g
zGc}K9iMd(u(CE^-?wVwi)eO+3Q{j`<>Ui;-i`+`BX12LjmPu9B<_=kbt37$GMKr1a
zOzssfo~~Etwuw;t(rA?lWdoAvOyn$vvfPP9(Cx<3CgsqB*1A<GoroDb`57KhvlCXr
zygPL5#^dP&y53B`-;OgTQy0AfB^BJrx`6>rWSn$zJr+hp^xpRN7M(z+V>po>*MC5z
tdM3DQ`#N>V;3_Fo5zR`T&`cZQ5xA<N!s5DHxz-~JrtAaoa+rS?`3nXtEW-c*

literal 0
HcmV?d00001

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fa9ef82..7d885486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.4+1
+* Run `Controller.configureRoutes` before mounting `@Expose` routes.
+* Make `Controller.configureServer` always return a `Future`.
+
 # 2.0.4
 * Prepare for Dart SDK change to `Stream<List<int>>` that are now
   `Stream<Uint8List>`.
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 6befde29..b9dd28dc 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -27,7 +27,7 @@ class Controller {
 
   /// Applies routes, DI, and other configuration to an [app].
   @mustCallSuper
-  FutureOr<void> configureServer(Angel app) {
+  Future<void> configureServer(Angel app) async {
     _app = app;
 
     if (injectSingleton != false) {
@@ -36,13 +36,13 @@ class Controller {
       }
     }
 
-    var name = applyRoutes(app, app.container.reflector);
+    var name = await applyRoutes(app, app.container.reflector);
     app.controllers[name] = this;
     return null;
   }
 
   /// Applies the routes from this [Controller] to some [router].
-  String applyRoutes(Router router, Reflector reflector) {
+  Future<String> applyRoutes(Router router, Reflector reflector) async {
     // Load global expose decl
     var classMirror = reflector.reflectClass(this.runtimeType);
     Expose exposeDecl = findExpose(reflector);
@@ -62,8 +62,8 @@ class Controller {
       ..addAll(middleware);
     final routeBuilder =
         _routeBuilder(reflector, instanceMirror, routable, handlers);
+    await configureRoutes(routable);
     classMirror.declarations.forEach(routeBuilder);
-    configureRoutes(routable);
 
     // Return the name.
     return exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name;
@@ -125,7 +125,7 @@ class Controller {
   }
 
   /// Used to add additional routes to the router from within a [Controller].
-  void configureRoutes(Routable routable) {}
+  FutureOr<void> configureRoutes(Routable routable) {}
 
   /// Finds the [Expose] declaration for this class.
   Expose findExpose(Reflector reflector) => reflector
diff --git a/pubspec.yaml b/pubspec.yaml
index 6d36a858..b8a159cc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.4
+version: 2.0.4+1
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 5e9ddf2aadafdd98347c4f378709289a0ecb109f Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Thu, 25 Jul 2019 22:46:04 -0400
Subject: [PATCH 396/414] Rm swp

---
 .CHANGELOG.md.swp | Bin 24576 -> 0 bytes
 .pubspec.yaml.swp | Bin 12288 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .CHANGELOG.md.swp
 delete mode 100644 .pubspec.yaml.swp

diff --git a/.CHANGELOG.md.swp b/.CHANGELOG.md.swp
deleted file mode 100644
index f26c773c3a2fee123520e2799fb7fa19c4a0abd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24576
zcmeI4eXL|>UB{<Tp_LXIs9=oNr_{19-I=?4cemX)w!QntUfkPV_5}&G-g9QoGk4DJ
znK{#Q&fI&aiG4xaN)w3^c?thikv~wQSVWCr3`wg}iX=e6R4^Ek*2JoWv=yp?pWp9!
z&b;2OK-9!!Hu>h>J9EzS@_T!JZ_n1ZzjblR?5XXj@b9WhW#?u4ZvWI(*S{p&eMzNg
zrFnQ^&B|9V_U~+3w|R9bY#d6{3)O`<t0ie8Or~DBs~m9dOxnvDc5b1wVw1UM7PjqL
znq8PXe0<^7Hyu53@=djNH1+oEgBb;86!?KD&?}nNJy%wC&hOYRV_f(8Yt3t3eeMSy
zZua7g0y7HCC@`bIi~=(X%qTFUz>ESj3jF`0K+(OlayQF<iC_Aq{^unVKg-XX7kTc7
z{O4`|b7kWFm-@do&%p0bOnmSEoc)+lU`Bx%1!feOQD8=a83kq(m{DLxff)s66qr$9
zMuGnY3WOBekG-l=$$-@V%Q*je{(czb{=3`wX~5TBS*iRz_#5ym;1+N**bSb)vQl{t
z{4=-@902>lPVkK@DwR)w_ki2MYrz*@QK|e6_-*h(a6h;YtbrQ18oUO)3_S9~mCA2|
z4}$lA8mIyTzIl12@+t6s@ILS$I0H_Dqu>hg`O7Mm&w)q5onSxM2ddz?mscv!f~Ubp
z!NcG~;2?M-*bct?vP$Kv;FF*Wt^v=G^mqu|3YNeD@MGZbAmUfSXTdLl2f!-09(;yG
z$m8JS;6ZQ-Yyq3W>%dbaV!jTZ0Pg^|fy=>V;NM8fJPH2PCug>rbKR9JjI0TIy*LU?
zWV^N#*-oQhtBicvDvIv>__x=Y`P%l{_G*}PTVZX-o{Byng#}~fMP|eHu{g1TDN>W$
z!ZgxOVLOFMY-gotZ8KpfGGUUZ^1XC!n6zVp<3|^c1SYe0^lV<_vVw&uGQnw^chgR8
z56c+qMa_?OLWc_Ev7j4fxjmFd{lGL@ws9dh%``KeUXl!EF8W>T<}F%Tx|W;J1iQ9x
z4@}%NowQ@kT9})ac-3}lm5I&mmCY@7&f7*|iWVDOilZp8Yhh+j#a)}k9X1+w*vfG2
z<3r3-GKZe07pswNq|mz?7A=<6W@C^g=WTQR?AcTEgH1!hXdyq;FKiwtwF39anIelj
zD@xbkTsKK!UZj+E3{wWk-h)tDW0teDSJ+#2!m3@6hWWxGuE$ASz~G4`l2|kR+iK3X
zVyKfOLL_}Z7cO1sq-$oaWiu;_6*6QtPm^8|!@6#kHf+vwE!#JCJ<bbAU6`!bDdM&r
zSz6cA%e0UH2)AO|w!!al-geB19hqUyG?5nzn}tQ1!Sji=&kK2{1SJz$&H@p@+yqR6
zkQ9z|G&AfGp7F7h%(IBc^td}^+#|M|*@jBC_8ZmW{8W}ky@qT(*e0Vi!&PXWHcg;U
z9PO;CT&nmEJ~53X6dI*6X|};^yJWW0wwr_vYmmkxVG)`}m=`j|8Jn%f4O@%CtT1aa
z;uAtU8lobo4y^}LjZlj=*(^&lq5QFUok#1v70<n(97&aCF**>Xy?SB~1}I`LK`o2I
zwz~|NBBf9a=`#V+tvf;&(`40}4josK$zfn(3zSnysRFTTou&wFRGLMQgaw6gTS!z#
zPZ#o&b<rot=l@;`yZj-N>%KpM5CvxIR=XZHilon$8g}c}nwQZ5Pp}VRw>!>~agNB>
zwzC>%X{U{@jXzqBH{{glv(rp0M?sl{nX<tX=?e747<6QVXh;WpVo=v+!UmC6gF2xg
zt1+rNl-#UQQ==g4Nz#?L;W*})soDpDOS1_t>R6~OhBqi5HdRfmObF4{I-;^o^aI&S
z(j0pv=1hMbpA#)tk+8Wr)vLqXFzMgPYv>|MvN^Yyw@K4+W3XkQa4g#?8~iE-shvh~
z6VoeGcGAMYupT?;8~25*GDfDLR;jj(qN?SMDw?Y{-&=TZ@Q}4pyFX=Ox0*A(ZZ}08
zRPdZ7Lcqej-)UguJ84hkQp5~lR1p<=W@(bx403S<1##Md$s@~B9b5`8K!%C=Yq`zh
zFp2MkxS1__8ESE?$4`5po~Fq`6&CmA;7OS8pE;QwaHjj9Io9jwiZ(kH*fPF=-NGO@
zOlG4P%Yz!|TBCHWBL+Y4de0U{b~?6;8)cB-INg*sD!C-*hgg(A&PK#Fa;7Nmbg+>k
z$OFUBMipV?nn_o&B8V;4bMUr4xxk6pZ$n={IO>3vC?6ktdW5z&dD+9Z4}^!+Bw=~5
zG?G|P!-g87%(fX(P9o@y#f<W8#&SN(i5;khoYp56k_6e4gDGg@Q;Zr`<P6V54lB;V
zZVw4p17x89T$I6_pCL+^r)?`{QUyhi`7!z-e(i2z#e{H%Vqn$k<`?2_*G8ifq~3zs
zlf1xIpW)cC(Q);lgm!9<y?J(HaJtAsP<MBF=(Dv(FE7$I<jK;ux=5l%n31l{l99uk
z9ZEkQu9BShX8u~UPt|vy*~giD!4~_<waG({V5SGp<-88Fz6m;Z%?lXXfz6dgo)fcg
z0@241?<T9Y!W{WcyK7<5XmM1im!(GkNQTdpp&Xs4R2UsX*TVqKcm);7#0ZK=4b@>a
zjiZBleC7qBDV#aao`+B9Fo%Wx6ZWCzO`IIx7oFaDj-zI!mbZF^D3S0rXLR*J#1vpq
zaaFu@IWy`V95p~=wiN#;3n6S|WGH{Kj;w@%hEAc%h>9xDBb-T{S3N`25})bfi#b9&
zyCmMNBblg{crPrjf%b`GE&TA0ajGT#)8gI9PD+bWazGx$Rp$J(>&(!IIYGA$1sGM=
z^Ml9oURx&Fj3d!oX_*3VtP|6FjrC?>VIq3pH&GnjeDlraDWC_y(5+zeLahn)5JkJ_
zdYw_2zX2MY;lyd9j{A&68Tr1sxfPt7UL8WT=Twxd;_|p(=i)pkIGEe9{l@F`R~{0L
ztnS*oclV9EcJ0{>DNc!unqJrQrV;jXs9*16Mfud7oCvUtEyO*-=$mqXqT;BuL!8#e
z;IQJHx~&k8_|)m!H^2B2hkfW>B9FQGoqM+kYZe*}i$4{1`or@aZ&S=z=)P(}WTzr+
zc7>wXaQ7^(j_1>XbDYk5#3PbZX29(c@-`-=CQR1CKK{EqsL*A1RH>|-?x8pvz3k-)
zUqcKeY!Uw*vlHBMbiJ!yg^LHuvt}0zl=xrb&&!ETCH{w{`tRMu`b*$a@GP<Y!{E0-
z0BYc`iRnKAI^ZhsQR4Yq!5;7e@%p3SJa{E|h8X>i!CS#4;1S~Sd%z9guZX|@1VrF4
z_;K*J#M{3I?gs(58vG^k_WQvB@NHu3-vtkVMetMLo2>uC;5>K(ko{Z+X8&dsm{H(+
zpn$>HXvibZ5eHK>ZB{uKs`YfeR;ha5rZy55MYb9C5_~d@u!P~9{YMEr`=`suY4aA`
zgDB3!x?~Du3|u7_GC2RVz)!~u7XM%nY!QRRjG5yxN{%U8;eaFR<89~sNVrV=nyyvT
zI<c&kb9Lg_WRZytCE=818iPbk??V&}==U=cUeVYaQ&X`$wXEOYuxoLW9F{n5vB+)G
z)G3xUk9Pv64|-Y693AS#iDp2$MEG$-*)X}+K_uzox6Gv<^t_x}Y@8qJHJf<avMEFO
zAs!&-B?lYi62gm{H|kwV;F4=5NxdaUPMk}Z7J{P_%W-^F$5{s-tWIJ{+;dzJCpG((
zjf3&(x-OYL?H1Lzvuz-8;!W4^0Nzff&5b@LcV)y-oywDp#8xge*98U6X)L9|=S(E(
zB|yj3SZS%O;s4`vi0?{xLr8&$i`Y2_Uovq>dqxH+&G0(cYo&JBaK&b)d@?gu*KR0n
z?&X?azU=3)_=TDen|jK*jPlU2G%Hu@1OVL>2@#_BFt3BR=UfrhrZT9Tlu2fm(A5Ny
zB~A)_G*a}-v|xb~g<!e_pyWD6Ry7{s*IXb|Ol@)EF_P1D6>j8Y%#|lI6}HKY`ltdE
zKuGB$Y-~oK{8ZeK=z@eHIZKF-^QYm3dsO9DQo_|dY~tyJ5(O)H9N~_*5spiiQv72{
zZIDjXte2Q8$s72DrHgCS$K)H_f3uh#u7;8wc3Dn|Fwm1wMAAD_we}!`JZi}T&2Yk-
z1Ae=H{td$<O_1r5%Rwcn?1o!z6G<(LNV45CE@iw;b2E+xXl#I+Ouk5xbh55twsmwt
zlKLyx6lm-`zOVo{*%&dyWv18%1Ne_^ecrj9Co|LTOWtGiI3Kr}3H^u2xg<oyGI%-l
zbQWDArcm47t84bnk`R!Xl1K+T>)x>02DB3^Bx2y)+7xk@35aEFCP5kO6|vQf$50i-
zHmS^&LLghU>y4zB6Y-)ka9aaWS+h&Q$+~@rt=jGf7^SVq9D20h#r1AV(w@{Gaw0I&
zuL#nVRU{`F1%t7%D<g#(t(<fTD={7Wx+J2Y*IFwk0@C_Q+Y-*OLQ*N}$!l1yHc=AB
zML~^bxau+kQFB?dK^|^Q_561ieM@p}FZQN>?~ji)3*AwzfElv>*h++eV<z~HUc4Go
zKXOSN`8upie#j-k$z5vVnB50WDo?o=n;^~Nm6$B2JGp`_+u-8hkkdT+NcD)9HRnBA
zSs9F^-<%HDJXigIm>AeEIYto*p~_j7RxT<?!aMs~m||%8U1~Lh5#@uE<Lgs)PAG-X
zZXu~6w#va8$)U_nzFR#w_VwgiB~xHr?ZA&RJa5WPk;?VQ&IuM*l|75xWKI<fxp}@X
z&8{%PA4mJknPpF>MoutqI<=?~F?}Gy=Vy}`RMQli-*jJ$=X`~p8@#bdD$dK;25-4<
zH6u8**-X8Hn(2V!)7Rp3Ag^PyyDu=~qNe2CI3*B2jE6|jD9??rgc#9oQ~I2yn-aDQ
z_5A7IlX6tjAED=5X*%>xby~*Pw(-LF)URsAa&E;9cND1|4q2V6%S^0>MMQYJS(}8O
zX|W?dP?5%*pjbUyGe0Y3P7_8^EE&#i*i6n>Uu2RK&{-7qGjY+#k|0nL|DTZXfcmn;
z|4kn%e2cjMkHAA90-L}az%}3r;{RU+zX1ARAJ_|afXB!M+ym|gYhV}nE;)fG!Eb=K
zgV%w7B`@$V;3@EF@EG_6$iUmc&ww|BmxHIt89W7^1R1ykMBqkn1^5bigfD~70;&JM
z7rYak0<Q%>0xko8MsDG5a2L1(>;-$k4d8il4AKYikKi5PUQmF;;5u+A_!zl|I@k`r
zM$X~g;8(#t;OBtkA+7_j2A?7K@HqH5h{09hRp2`>Wu4&HKpQ0BHn0^)9_B~EU%-op
zz!EqC_Jf}QgG(BoNB<K)M%n~sJp`g8vmOF7>meAn#>~%p2&9-qATjG9ph8D$$gGE8
z)<ZDsAs_;o^$^T@2xdJ5vmOFk6Mfon)<f`r)I&g*1W7Q-B9N)o76^0Z$WM=SMU<Tf
zl4U-C=XQ{$AJ@&|G7r9qWtYbP*AqxSCq3oF|7{;s{sD3R`@nm_ec&c=1$YH`fjIy3
z;B(-U-~-?+xEg$ncz+3;0Mh&aZDRdzfv3S!;6d<CunyM1X)q6-CeD{!z!$+2;19vQ
zpbn0LE5Q}u---8M03QJlg6-fxiS7RbJOlm-d<lFJ{5g0O+zWmZTmxPSt^|(|^FILY
z2dkh5c7l2EdT=fH3Nine!Q<f5;KQH`7Qu0_2iycCH}D~H0?S}C_&V|bKY%B|7r?{d
z_rb3Nxi9eZAOuzL4RQis0`CI94DJSZfwzH8;1cjSIe`xV3+BLg$OSwG-UaI5jX?PK
ztiKoV-{u8K%9U+}MY>2w;$(fK{8kf8Jh0z&6VdQ5xioUz<PeLT<X%~nmGpja3-=FP
zt2IOB{dPS~C@@sbVH($^QcKcZGuf2ZB=zW$n1?7m4%%_6W{I3Id2H$DE?Xac=P0RN
zmnGM(qGip*FXyhUT2s&d)g-RZwWLK%d#yKqS-&62S6?h4FRe@S%UbRu5C1*9a6V5v
z%PT4SAJ#gR1Qf7V*w|`pDR^{9X>0S6Rtq*PeaTA;brP#o<F(m`)TIzb_A}D2zC@2{
zsGs}H=y(QH+WOo@jsf2WWRx_!?#N#vf$AlN^(#p*2D{~!$Ov_P{a<<n<m>VU#}eq|
z`VB`2#i*I=qP<MTl+@|?HI%Zs(cMEqBM>O5(rr{i(XzPKiQOH5i7dO+Lw!!)S0^ZE
zM=6pj)!mL2p-YuWE(1@YId0PpOnr6aIsgyT&JC+Fs=-M@X=B*4Ao*P{W4s~#;8|Xy
z#My1#K{i{+G4b(RPADN<F?r<6B7HMrGEOA7C|8_0+L22pndJM&2_*kZD`KI=>0omI
zWQW5>Yx*79{dfoc^tv)AZfL%F<HD;Jbx?jS(jq!4jXJH*SYrbySm~z6+HB>#k(@T=
z8(a8}g{gwI+7Gb+<zPCKB)7>?>nuV{Z-bOf<Gs+X#Mz_~T<*B!y;!cRNR80<laTk$
zA~P6t+f*iBo2E;84EGisSd6ymwGBBfr4}$4!*#g~mo&i_l0?P`m9db6%4e+^ccL-s
zc$T|5^zgaTh$%VCx~aZBoUqgk^l7B<DRiP0G8SQ)SQ4G^nEBC8?XsvPreN4tib;0O
z@E0*d6T{NquF@nW6>d;SF@#Gl+U)G?lr|hYb-?CPewQkde27gHCN)sPi7{z+Hv_4p
zL@Vu<;@6OJitPHJAnF#XEe`6|NH@GRRMPvA^1lhQjv`)>ZUM1FH2D@%jPtb3Yf{(i
z>+vPU^}()POFa)td2V7|G`t(LK*Kusytt+yEwTRBP2+}d==HUvT}4ifP5XUWnj-$N
zTN~TmPMO{H+jzygbzpMficBO|$*NMIiksXk(F<qVMjkjbJDANKa8u-@WnPWMK!s{;
zZUjs{Mx(odD3pk(V#%!_p{(39Vv!Suo%&K7QEpdaL&vge=(vQE<n}FE0ap61VG?tr
zCE-y8l3_QJv6}2nNA`xTm&F05LE0NsBh)lXozOjmC3B{E#7NY14dTg&Pb>l+Hk<J}
zHeXA`>TRIhsC8N0n<9s_;iF_26(NAIU~XRfcp=7x71x!&JRtp?FnYdZfG4-J;iC0k
zZ%?|`F7{QHSG6ZsG{W_Pmpfv?Q}%p#eT0p=+Mo%}K^t$d+%=6Q+P9px4Q<7Q81K+i
zW7zQRZUK_g?RDf<V8<*iE**9DPMi(bv*o-7ccpC5g}i(F_QB+Cvu*ANiu=J~BqAg?
zQA($9dPf6qWSaPTNU=mX7LMJg5~<msM$DGw)*Oekzk4ACP3{YcvT%D;E?v~E7$@eW
zqid2Pn$&lV<{OP(TjridhsGQ3!76cO<!V+Kt?DkpmQB=yJG2;F!@u&D#(?D)tnE&h
z^3@i?JI*SpFw16I+@gTh5m##EexU1#lW)hX_u}2iG+tZWbvqPGS|>*C-VOd5+|(26
z8}vplozmwaIy6zTF2_HNMU>emzIUo7JrVSGihlcGpd=3-zux5>Z8~uWwpcfL*!46)
z+5^MrRP<fC6Od)6`7(;{#Tnje*6s><YFX!<zDc@6uV0;$9-PubC%tyvX6K0=^yZWZ
z7vA^E6#F=YkRh74q;5{H(IyOmHehj@AlSK9)afE<Vcgu}_|#n}ZpV0m?otutoSaas
zywv5z2sQP>nRNKbJt(=iAa^GwrBg3jsnHlZl-%HH9Y(lOFn0k^6h*A{gdPZWlq<qI
V)dMs{jzkT?<U`jqqxOrz{tKByrm6q{

diff --git a/.pubspec.yaml.swp b/.pubspec.yaml.swp
deleted file mode 100644
index 48abd8ec94dba75368f8b8d7df1708ebce330860..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2v2N5r5Qg_sQ4k10qFydg!TEf-L<B2D91T!JL?Y0jVC}6p_Hy>FvtH*&LrNsx
zfP!~G;sJPr6m+ymP#{WZsF?NH;lfEMEodzL^3Cqd?98{7bu;uI-`}KbUXQ@DKuG^g
zuyeF<b<V7|h)s0CMq}Z&{`PF^p(r|=jNj3E)EP+QrJA#JCgeqvu=`M#hKue%#UkzQ
z8kUK%HluD{4vSoH?|@~q(KG3A0SO?1(-J7{Zf9+t^p|_S3t4JkrWY3<oi-Z%kN^@u
z0!RP}AOR$R1dsp{_zwu!yhRS7kGZ;+cKvSs@vcpLAps<S1dsp{Kmter2_OL^fCP{L
z5<mj~AORK;GB``fXOR2<zxn?EdY+JvphM6T&=Tkp=;t{?zJWe~-htkLUV<zr1Z{x=
z&=t@k=*K)EpFl^T_n^0+*PvIRF=z*L7jy%(1iAoffxg!@eQ|Z+g9MNO5<mh-00|%g
zB!C2v01`MY0ZOeXY(Ss(Jm2#PrBZ|8d;Q8ttj#O4w+wb9_QOczLPbJxDT)Bx%Th+*
z0o$J6F&u`aA!C`RVk%`}86Sn#Fh0GySIT{1!h{tG*OA+)l0bYeBBre5Qz>$0lPNRP
zkkE*|@?`Cq%v>JdyXo~IPbMsz4iY97Va8lXO}81dJQ1b}s(Pd})p0CU9MJa0E#K?)
zygps8+}n`S0a=EvNrGl2EQEnx>Z2V+=NIP8zy_=W%nIkOthlV!CfC_eDrU9wX)59g
zGc}K9iMd(u(CE^-?wVwi)eO+3Q{j`<>Ui;-i`+`BX12LjmPu9B<_=kbt37$GMKr1a
zOzssfo~~Etwuw;t(rA?lWdoAvOyn$vvfPP9(Cx<3CgsqB*1A<GoroDb`57KhvlCXr
zygPL5#^dP&y53B`-;OgTQy0AfB^BJrx`6>rWSn$zJr+hp^xpRN7M(z+V>po>*MC5z
tdM3DQ`#N>V;3_Fo5zR`T&`cZQ5xA<N!s5DHxz-~JrtAaoa+rS?`3nXtEW-c*


From e2b5d4f135b3277739d35f298f88026524316178 Mon Sep 17 00:00:00 2001
From: Axel LE BOT <axellebot@gmail.com>
Date: Sat, 27 Jul 2019 11:46:03 +0200
Subject: [PATCH 397/414] Edit Controller.configureRoutes doc

---
 lib/src/core/controller.dart | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index b9dd28dc..36573f4c 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -124,7 +124,15 @@ class Controller {
     };
   }
 
-  /// Used to add additional routes to the router from within a [Controller].
+  /// Used to add additional routes or middlewares to the router from within
+  /// a [Controller].
+  ///
+  /// ```dart
+  /// @override
+  /// FutureOr<void> configureRoutes(Routable routable) {
+  ///   routable.all('*', myMiddleware);
+  /// }
+  /// ```
   FutureOr<void> configureRoutes(Routable routable) {}
 
   /// Finds the [Expose] declaration for this class.

From b58172ba60ee8ae26a220cf7c2399c2d2f5eb281 Mon Sep 17 00:00:00 2001
From: Axel LE BOT <axellebot@gmail.com>
Date: Sat, 27 Jul 2019 12:07:57 +0200
Subject: [PATCH 398/414] Edit Expose doc

---
 lib/src/core/metadata.dart | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/src/core/metadata.dart b/lib/src/core/metadata.dart
index 877073ff..b0d245a2 100644
--- a/lib/src/core/metadata.dart
+++ b/lib/src/core/metadata.dart
@@ -21,7 +21,20 @@ class Hooks {
   const Hooks({this.before = const [], this.after = const []});
 }
 
-/// Exposes a [Controller] to the Internet.
+/// Exposes a [Controller] or a [Controller] method to the Internet.
+///
+/// ```dart
+/// @Expose('/elements')
+/// class ElementController extends Controller {
+///
+///   @Expose('')
+///   getList(){}
+///
+///   @Expose('/:elementId')
+///   getElement(int elementId){}
+///
+/// }
+/// ```
 class Expose {
   final String method;
   final String path;

From d88e289807139df1ed3c128e114d81d40db5670f Mon Sep 17 00:00:00 2001
From: Pat O'Connor <patoconnor43@gmail.com>
Date: Sat, 28 Sep 2019 22:38:22 -0700
Subject: [PATCH 399/414] Bind the decoder to req.body

---
 test/controller_test.dart | 2 +-
 test/di_test.dart         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/controller_test.dart b/test/controller_test.dart
index d4b7938a..d8cdb05c 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -113,7 +113,7 @@ main() {
         }, optional: ['bar']));
     var rq = MockHttpRequest('GET', Uri(path: 'foo'));
     await AngelHttp(app).handleRequest(rq);
-    var body = await rq.response.transform(utf8.decoder).join();
+    var body = await utf8.decoder.bind(rq.response).join();
     expect(json.decode(body), 2);
   });
 
diff --git a/test/di_test.dart b/test/di_test.dart
index 8b23eb43..a0df1f36 100644
--- a/test/di_test.dart
+++ b/test/di_test.dart
@@ -28,7 +28,7 @@ main() {
     app.container.registerSingleton(Todo(text: TEXT, over: OVER));
     app.container.registerFactory<Future<Foo>>((container) async {
       var req = container.make<RequestContext>();
-      var text = await req.body.transform(utf8.decoder).join();
+      var text = await utf8.decoder.bind(req.body).join();
       return Foo(text);
     });
 

From 5312741c73a3a96c4062d35e437559f6d70f8dcc Mon Sep 17 00:00:00 2001
From: Neel Kamath <neelkamath@icloud.com>
Date: Sun, 6 Oct 2019 09:06:01 +0530
Subject: [PATCH 400/414] Update `serialize()` docs for Angel v2

---
 lib/src/core/response_context.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index e7478ba8..2110dc0e 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -61,7 +61,7 @@ abstract class ResponseContext<RawResponse>
 
   /// Serializes response data into a String.
   ///
-  /// The default is conversion into JSON via `package:json_god`.
+  /// The default is conversion into JSON via `json.encode`.
   ///
   /// If you are 100% sure that your response handlers will only
   /// be JSON-encodable objects (i.e. primitives, `List`s and `Map`s),

From 6d71707673512b8fe872e63431d73460c484468a Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 09:53:16 -0400
Subject: [PATCH 401/414] Use ThrowingReflector

---
 CHANGELOG.md             |  2 ++
 lib/src/core/server.dart | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d596d13..fda36a4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 * Add `allowHttp1` to `AngelHttp2` constructors. https://github.com/angel-dart/angel/issues/108
 * Add `deserializeBody` and `decodeBody` to `RequestContext`. https://github.com/angel-dart/angel/issues/109
 * Add `HostnameRouter`, which allows for routing based on hostname. https://github.com/angel-dart/angel/issues/110
+* Default to using `ThrowingReflector`, instead of `EmptyReflector`. This will give a more descriptive
+error when trying to use controllers, etc. without reflection enabled.
 
 # 2.0.4
 * Prepare for Dart SDK change to `Stream<List<int>>` that are now
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 5ed7147d..e2f71760 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -355,21 +355,28 @@ class Angel extends Routable {
     return super.use(path, service)..app = this;
   }
 
+  static const String _reflectionErrorMessage =
+      ThrowingReflector.defaultErrorMessage + ' ' + _reflectionInfo;
+
+  static const String _reflectionInfo =
+      'Features like controllers, constructor dependency injection, and `ioc` require reflection, '
+      'and will not work without it.\n\n'
+      'For more, see the documentation:\n'
+      'https://docs.angel-dart.dev/guides/dependency-injection#enabling-dart-mirrors-or-other-reflection';
+
   Angel(
-      {Reflector reflector = const EmptyReflector(),
+      {Reflector reflector =
+          const ThrowingReflector(errorMessage: _reflectionErrorMessage),
       this.environment = angelEnv,
       this.logger,
       this.allowMethodOverrides = true,
       this.serializer,
       this.viewGenerator})
       : super(reflector) {
-    if (reflector == const EmptyReflector()) {
+    if (reflector is EmptyReflector || reflector is ThrowingReflector) {
       var msg =
-          'No `reflector` was passed to the Angel constructor, so reflection will not be available.\n'
-          'Features like controllers, constructor dependency injection, and `ioc` require reflection, '
-          'and will not work without it.\n\n'
-          'For more, see the documentation:\n'
-          'https://docs.angel-dart.dev/guides/dependency-injection#enabling-dart-mirrors-or-other-reflection';
+          'No `reflector` was passed to the Angel constructor, so reflection will not be available.\n' +
+              _reflectionInfo;
       logger?.warning(msg);
     }
 

From 4e792e4c34f9eb00ebcf92bc937fe1ac66fec070 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 09:57:59 -0400
Subject: [PATCH 402/414] Use pretty_logging

---
 example/main.dart          |  3 ++-
 lib/src/core/routable.dart | 11 +++++++----
 pubspec.yaml               |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/example/main.dart b/example/main.dart
index 9d618393..f500270b 100644
--- a/example/main.dart
+++ b/example/main.dart
@@ -2,10 +2,11 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
+import 'package:pretty_logging/pretty_logging.dart';
 
 main() async {
   // Logging set up/boilerplate
-  Logger.root.onRecord.listen(print);
+  Logger.root.onRecord.listen(prettyLog);
 
   // Create our server.
   var app = Angel(
diff --git a/lib/src/core/routable.dart b/lib/src/core/routable.dart
index e98ac39a..a497c4d0 100644
--- a/lib/src/core/routable.dart
+++ b/lib/src/core/routable.dart
@@ -98,10 +98,13 @@ class Routable extends Router<RequestHandler> {
     middleware ??= [];
     final handlers = <RequestHandler>[];
     // Merge @Middleware declaration, if any
-    Middleware middlewareDeclaration =
-        getAnnotation<Middleware>(handler, _container?.reflector);
-    if (middlewareDeclaration != null) {
-      handlers.addAll(middlewareDeclaration.handlers);
+    var reflector = _container?.reflector;
+    if (reflector != null && reflector is! ThrowingReflector) {
+      Middleware middlewareDeclaration =
+          getAnnotation<Middleware>(handler, _container?.reflector);
+      if (middlewareDeclaration != null) {
+        handlers.addAll(middlewareDeclaration.handlers);
+      }
     }
 
     final handlerSequence = <RequestHandler>[];
diff --git a/pubspec.yaml b/pubspec.yaml
index 152229ab..2caf2790 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,4 +32,5 @@ dependencies:
 dev_dependencies:
   http: ^0.12.0
   io: ^0.3.0
+  pretty_logging: ^1.0.0
   test: ^1.0.0

From bcfaf04dda0e997765c4763063fd0064471a0441 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 10:17:46 -0400
Subject: [PATCH 403/414] Fix cert errors on allowHttp1 test

---
 test/http2/adapter_test.dart | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/http2/adapter_test.dart b/test/http2/adapter_test.dart
index 5d287a32..7773dc17 100644
--- a/test/http2/adapter_test.dart
+++ b/test/http2/adapter_test.dart
@@ -6,7 +6,7 @@ import 'package:angel_framework/angel_framework.dart' hide Header;
 import 'package:angel_framework/http2.dart';
 import 'package:http/src/multipart_file.dart' as http;
 import 'package:http/src/multipart_request.dart' as http;
-import 'package:http/http.dart' as http;
+import 'package:http/io_client.dart';
 import 'package:http2/transport.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:logging/logging.dart';
@@ -22,7 +22,7 @@ Stream<List<int>> jfkStream() {
 
 void main() {
   var client = Http2Client();
-  var h1c = http.Client();
+  IOClient h1c;
   Angel app;
   AngelHttp2 http2;
   Uri serverRoot;
@@ -98,6 +98,9 @@ void main() {
       ..usePrivateKey('dev.key', password: 'dartdart')
       ..setAlpnProtocols(['h2'], true);
 
+    // Create an HTTP client that trusts our server.
+    h1c = IOClient(HttpClient()..badCertificateCallback = (_, __, ___) => true);
+
     http2 = AngelHttp2(app, ctx, allowHttp1: true);
 
     var server = await http2.startServer();

From 673754ac84b418a1802811749d6d4388b3a61e84 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 10:22:36 -0400
Subject: [PATCH 404/414] deserializeBody test

---
 lib/src/core/request_context.dart |  4 ++--
 test/body_test.dart               | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/src/core/request_context.dart b/lib/src/core/request_context.dart
index 1afe206b..0d9c072b 100644
--- a/lib/src/core/request_context.dart
+++ b/lib/src/core/request_context.dart
@@ -221,14 +221,14 @@ abstract class RequestContext<RawRequest> {
   /// Returns as `true` if the client's `Accept` header indicates that it will accept any response content type.
   bool get acceptsAll => _acceptsAllCache ??= accepts('*/*');
 
-  /// Shorthand for deserializing a body.
+  /// Shorthand for deserializing [bodyAsMap], using some transformer function [f].
   Future<T> deserializeBody<T>(FutureOr<T> Function(Map) f,
       {Encoding encoding = utf8}) async {
     await parseBody(encoding: encoding);
     return await f(bodyAsMap);
   }
 
-  /// Shorthand for decoding a body.
+  /// Shorthand for decoding [bodyAsMap], using some [codec].
   Future<T> decodeBody<T>(Codec<T, Map> codec, {Encoding encoding = utf8}) =>
       deserializeBody(codec.decode, encoding: encoding);
 
diff --git a/test/body_test.dart b/test/body_test.dart
index 2f69b541..43051770 100644
--- a/test/body_test.dart
+++ b/test/body_test.dart
@@ -61,6 +61,14 @@ void main() {
     expect(req.bodyAsList, ['foo', 'bar']);
   });
 
+  test('deserializeBody', () async {
+    var req = await request(
+        asJson: true, bodyFields: {'text': 'Hey', 'complete': false});
+    var todo = await req.deserializeBody(Todo.fromMap);
+    expect(todo.text, 'Hey');
+    expect(todo.completed, false);
+  });
+
   test('throws when body has not been parsed', () async {
     var req = await request(parse: false);
     expect(() => req.bodyAsObject, throwsStateError);
@@ -97,3 +105,13 @@ void main() {
         throwsStateError);
   });
 }
+
+class Todo {
+  String text;
+  bool completed;
+
+  Todo({this.text, this.completed});
+
+  static Todo fromMap(Map m) =>
+      Todo(text: m['text'] as String, completed: m['complete'] as bool);
+}

From ed8817ff5ec02c91f90ec8bf7fc5c48e4119c795 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 10:24:54 -0400
Subject: [PATCH 405/414] decodeBody test

---
 test/body_test.dart | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/test/body_test.dart b/test/body_test.dart
index 43051770..45a64ba2 100644
--- a/test/body_test.dart
+++ b/test/body_test.dart
@@ -69,6 +69,14 @@ void main() {
     expect(todo.completed, false);
   });
 
+  test('decodeBody', () async {
+    var req = await request(
+        asJson: true, bodyFields: {'text': 'Hey', 'complete': false});
+    var todo = await req.decodeBody(TodoCodec());
+    expect(todo.text, 'Hey');
+    expect(todo.completed, false);
+  });
+
   test('throws when body has not been parsed', () async {
     var req = await request(parse: false);
     expect(() => req.bodyAsObject, throwsStateError);
@@ -115,3 +123,16 @@ class Todo {
   static Todo fromMap(Map m) =>
       Todo(text: m['text'] as String, completed: m['complete'] as bool);
 }
+
+class TodoCodec extends Codec<Todo, Map> {
+  @override
+  Converter<Map, Todo> get decoder => TodoDecoder();
+
+  @override
+  Converter<Todo, Map> get encoder => throw UnsupportedError('no encoder');
+}
+
+class TodoDecoder extends Converter<Map, Todo> {
+  @override
+  Todo convert(Map input) => Todo.fromMap(input);
+}

From 32d0396ebd8a3e66d5a84f73f82264ec819144c6 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 10:30:31 -0400
Subject: [PATCH 406/414] Update hostname example

---
 example/hostname.dart | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/example/hostname.dart b/example/hostname.dart
index bd6bcad8..80628642 100644
--- a/example/hostname.dart
+++ b/example/hostname.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
+import 'package:pretty_logging/pretty_logging.dart';
 
 Future<void> apiConfigurer(Angel app) async {
   app.get('/', (req, res) => 'Hello, API!');
@@ -16,7 +17,8 @@ Future<void> frontendConfigurer(Angel app) async {
 
 main() async {
   // Logging set up/boilerplate
-  Logger.root.onRecord.listen(print);
+  hierarchicalLoggingEnabled = true;
+  Logger.root.onRecord.listen(prettyLog);
 
   var app = Angel(logger: Logger('angel'));
   var http = AngelHttp(app);
@@ -39,5 +41,7 @@ main() async {
 
   await http.startServer('127.0.0.1', 3000);
   print('Listening at ${http.uri}');
-  print('(See what happens when you visit http://localhost:3000 instead)');
+  print('See what happens when you visit http://localhost:3000 instead '
+      'of http://127.0.0.1:3000. Then, try '
+      'http://api.localhost:3000.');
 }

From 94c37e103c47016fa52f6aa644babd111f589263 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 10:56:24 -0400
Subject: [PATCH 407/414] No-expose controller tests

---
 CHANGELOG.md                 |  1 +
 lib/src/core/controller.dart | 41 +++++++++++++++-----
 lib/src/core/server.dart     |  8 ++--
 test/controller_test.dart    | 72 ++++++++++++++++++++++++++++++------
 4 files changed, 98 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ee26d6e..c629a1b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Add `HostnameRouter`, which allows for routing based on hostname. https://github.com/angel-dart/angel/issues/110
 * Default to using `ThrowingReflector`, instead of `EmptyReflector`. This will give a more descriptive
 error when trying to use controllers, etc. without reflection enabled.
+* `mountController` returns the mounted controller.
 
 # 2.0.4+1
 * Run `Controller.configureRoutes` before mounting `@Expose` routes.
diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 2885614b..2c82cde2 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -23,6 +23,11 @@ class Controller {
   /// A mapping of route paths to routes, produced from the [Expose] annotations on this class.
   Map<String, Route> routeMappings = {};
 
+  SymlinkRoute<RequestHandler> _mountPoint;
+
+  /// The route at which this controller is mounted on the server.
+  SymlinkRoute<RequestHandler> get mountPoint => _mountPoint;
+
   Controller({this.injectSingleton = true});
 
   /// Applies routes, DI, and other configuration to an [app].
@@ -42,7 +47,7 @@ class Controller {
   }
 
   /// Applies the routes from this [Controller] to some [router].
-  Future<String> applyRoutes(Router router, Reflector reflector) async {
+  Future<String> applyRoutes(Router<RequestHandler> router, Reflector reflector) async {
     // Load global expose decl
     var classMirror = reflector.reflectClass(this.runtimeType);
     Expose exposeDecl = findExpose(reflector);
@@ -52,7 +57,7 @@ class Controller {
     }
 
     var routable = Routable();
-    router.mount(exposeDecl.path, routable);
+    _mountPoint = router.mount(exposeDecl.path, routable);
     var typeMirror = reflector.reflectType(this.runtimeType);
 
     // Pre-reflect methods
@@ -77,6 +82,7 @@ class Controller {
     return (ReflectedDeclaration decl) {
       var methodName = decl.name;
 
+      // Ignore built-in methods.
       if (methodName != 'toString' &&
           methodName != 'noSuchMethod' &&
           methodName != 'call' &&
@@ -129,14 +135,18 @@ class Controller {
         var path = exposeDecl.path;
         var httpMethod = exposeDecl.method ?? 'GET';
         if (path == null) {
+          // Try to build a route path by finding all potential
+          // path segments, and then joining them.
           var parts = <String>[];
-          var methodMatch = _methods.firstMatch(method.name);
 
+          // If the name starts with get/post/patch, etc., then that
+          // should be the path.
+          var methodMatch = _methods.firstMatch(method.name);
           if (methodMatch != null) {
             var rest = method.name.replaceAll(_methods, '');
             var restPath = ReCase(rest.isEmpty ? 'index' : rest)
                 .snakeCase
-                .replaceAll(_multiScore, '_');
+                .replaceAll(_rgxMultipleUnderscores, '_');
             httpMethod = methodMatch[1].toUpperCase();
 
             if (['index', 'by_id'].contains(restPath)) {
@@ -144,16 +154,23 @@ class Controller {
             } else {
               parts.add(restPath);
             }
-          } else {
+          }
+          // If the name does NOT start with get/post/patch, etc. then
+          // snake_case-ify the name, and add it to the list of segments.
+          // If the name is index, though, add "/".
+          else {
             if (method.name == 'index') {
               parts.add('/');
             } else {
-              parts.add(
-                  ReCase(method.name).snakeCase.replaceAll(_multiScore, '_'));
+              parts.add(ReCase(method.name)
+                  .snakeCase
+                  .replaceAll(_rgxMultipleUnderscores, '_'));
             }
           }
 
-          // Try to infer String, int, or double.
+          // Try to infer String, int, or double. We called
+          // preInject() earlier, so we can figure out the types
+          // of required parameters, and add those to the path.
           for (var p in injection.required) {
             if (p is List && p.length == 2 && p[0] is String && p[1] is Type) {
               var name = p[0] as String;
@@ -169,6 +186,7 @@ class Controller {
           }
 
           path = parts.join('/');
+          if (!path.startsWith('/')) path = '/$path';
         }
 
         routeMappings[name] = routable.addRoute(
@@ -190,9 +208,12 @@ class Controller {
   FutureOr<void> configureRoutes(Routable routable) {}
 
   static final RegExp _methods = RegExp(r'^(get|post|patch|delete)');
-  static final RegExp _multiScore = RegExp(r'__+');
+  static final RegExp _rgxMultipleUnderscores = RegExp(r'__+');
 
   /// Finds the [Expose] declaration for this class.
+  ///
+  /// If [concreteOnly] is `false`, then if there is no actual
+  /// [Expose], one will be automatically created.
   Expose findExpose(Reflector reflector, {bool concreteOnly = false}) {
     var existing = reflector
         .reflectClass(runtimeType)
@@ -206,6 +227,6 @@ class Controller {
                 .snakeCase
                 .replaceAll('_controller', '')
                 .replaceAll('_ctrl', '')
-                .replaceAll(_multiScore, '_')));
+                .replaceAll(_rgxMultipleUnderscores, '_')));
   }
 }
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index e2f71760..6ddd2ed5 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -334,13 +334,15 @@ class Angel extends Routable {
   }
 
   /// Shorthand for using the [container] to instantiate, and then mount a [Controller].
+  /// Returns the created controller.
   ///
   /// Just like [Container].make, in contexts without properly-reified generics (dev releases of Dart 2),
   /// provide a [type] argument as well.
   ///
-  /// If you are on `Dart >=2.0.0`, simply call `mountController<T>()`..
-  Future mountController<T extends Controller>([Type type]) {
-    return configure(container.make<T>(type).configureServer);
+  /// If you are on `Dart >=2.0.0`, simply call `mountController<T>()`.
+  Future<T> mountController<T extends Controller>([Type type]) {
+    var controller = container.make<T>(type);
+    return configure(controller.configureServer).then((_) => controller);
   }
 
   /// Shorthand for calling `all('*', handler)`.
diff --git a/test/controller_test.dart b/test/controller_test.dart
index d8cdb05c..0e0a5f3f 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -30,7 +30,28 @@ class TodoController extends Controller {
   }
 }
 
-class NoExposeController extends Controller {}
+class NoExposeController extends Controller {
+  String getIndex() => 'Hey!';
+
+  int timesTwo(int n) => n * 2;
+
+  String repeatName(String name, int times) {
+    var b = StringBuffer();
+    for (int i = 0; i < times; i++) {
+      b.writeln(name);
+    }
+    return b.toString();
+  }
+
+  @Expose('/yellow', method: 'POST')
+  String someColor() => 'yellow';
+
+  @Expose.patch
+  int three() => 333;
+
+  @noExpose
+  String hideThis() => 'Should not be exposed';
+}
 
 @Expose('/named', as: 'foo')
 class NamedController extends Controller {
@@ -51,6 +72,7 @@ bool bar(RequestContext req, ResponseContext res) {
 main() {
   Angel app;
   TodoController ctrl;
+  NoExposeController noExposeCtrl;
   HttpServer server;
   http.Client client = http.Client();
   String url;
@@ -70,6 +92,8 @@ main() {
     // Using mountController<T>();
     await app.mountController<TodoController>();
 
+    noExposeCtrl = await app.mountController<NoExposeController>();
+
     // Place controller in group...
     app.group('/ctrl_group', (router) {
       app.container
@@ -94,16 +118,6 @@ main() {
     expect(ctrl.app, app);
   });
 
-  test('require expose', () async {
-    try {
-      var app = Angel(reflector: MirrorsReflector());
-      await app.configure(NoExposeController().configureServer);
-      throw 'Should require @Expose';
-    } on Exception {
-      // :)
-    }
-  });
-
   test('create dynamic handler', () async {
     var app = Angel(reflector: MirrorsReflector());
     app.get(
@@ -154,4 +168,40 @@ main() {
     print('Response: ${response.body}');
     expect(response.body, equals("Hello, \"world!\""));
   });
+
+  group('optional expose', () {
+    test('removes suffixes from controller names', () {
+      expect(noExposeCtrl.mountPoint.path, 'no_expose');
+    });
+
+    test('mounts correct routes', () {
+      print(noExposeCtrl.routeMappings.keys);
+      expect(noExposeCtrl.routeMappings.keys.toList(),
+          ['getIndex', 'timesTwo', 'repeatName', 'someColor', 'three']);
+    });
+
+    test('mounts correct methods', () {
+      void expectMethod(String name, String method) {
+        expect(noExposeCtrl.routeMappings[name].method, method);
+      }
+
+      expectMethod('getIndex', 'GET');
+      expectMethod('timesTwo', 'GET');
+      expectMethod('repeatName', 'GET');
+      expectMethod('someColor', 'POST');
+      expectMethod('three', 'PATCH');
+    });
+
+    test('mounts correct paths', () {
+      void expectPath(String name, String path) {
+        expect(noExposeCtrl.routeMappings[name].path, path);
+      }
+
+      expectPath('getIndex', '/');
+      expectPath('timesTwo', '/times_two/int:n');
+      expectPath('repeatName', '/repeat_name/:name/int:times');
+      expectPath('someColor', '/yellow');
+      expectPath('three', '/three');
+    });
+  });
 }

From 0f02f0bd702b1dabfb0f8a67c78dbdd346d7ccc1 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Sat, 12 Oct 2019 10:58:23 -0400
Subject: [PATCH 408/414] 2.0.5-beta

---
 CHANGELOG.md | 2 +-
 pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c629a1b9..fd729a5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 2.0.5
+# 2.0.5-beta
 * Make `@Expose()` in `Controller` optional. https://github.com/angel-dart/angel/issues/107
 * Add `allowHttp1` to `AngelHttp2` constructors. https://github.com/angel-dart/angel/issues/108
 * Add `deserializeBody` and `decodeBody` to `RequestContext`. https://github.com/angel-dart/angel/issues/109
diff --git a/pubspec.yaml b/pubspec.yaml
index 2caf2790..ef9b3c27 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.5
+version: 2.0.5-beta
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From f081a4a515f2520a79f1d91b7e8ef26b8ad08cbe Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Nov 2019 08:20:00 -0500
Subject: [PATCH 409/414] Fix HookedService type error

---
 CHANGELOG.md                     | 4 ++++
 lib/src/core/hooked_service.dart | 8 ++++----
 test/all.dart                    | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd729a5c..b30851f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.0.5
+* Fix a new (did not appear before 2.6/2.7) type error causing compilation to fail.
+https://github.com/angel-dart/framework/issues/249
+
 # 2.0.5-beta
 * Make `@Expose()` in `Controller` optional. https://github.com/angel-dart/angel/issues/107
 * Add `allowHttp1` to `AngelHttp2` constructors. https://github.com/angel-dart/angel/issues/108
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 00216f49..91e6b99f 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -95,12 +95,12 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
 
   /// Adds hooks to this instance.
   void addHooks(Angel app) {
-    Hooks hooks = getAnnotation<Hooks>(inner, app.container.reflector);
+    var hooks = getAnnotation<Hooks>(inner, app.container.reflector);
     List<HookedServiceEventListener<Id, Data, T>> before = [], after = [];
 
     if (hooks != null) {
-      before.addAll(hooks.before);
-      after.addAll(hooks.after);
+      before.addAll(hooks.before.cast());
+      after.addAll(hooks.after.cast());
     }
 
     void applyListeners(
@@ -111,7 +111,7 @@ class HookedService<Id, Data, T extends Service<Id, Data>>
         ..addAll(isAfter == true ? after : before);
 
       if (hooks != null) {
-        listeners.addAll(isAfter == true ? hooks.after : hooks.before);
+        listeners.addAll((isAfter == true ? hooks.after : hooks.before).cast());
       }
 
       listeners.forEach(dispatcher.listen);
diff --git a/test/all.dart b/test/all.dart
index e2a94623..5f517bbb 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -10,7 +10,7 @@ import 'di_test.dart' as di;
 import 'encoders_buffer_test.dart' as encoders_buffer;
 import 'env_test.dart' as env;
 import 'exception_test.dart' as exception;
-import 'extension_test.dart' as extension;
+import 'extension_test.dart' as extension_test;
 import 'find_one_test.dart' as find_one;
 import 'general_test.dart' as general;
 import 'hooked_test.dart' as hooked;
@@ -42,7 +42,7 @@ main() {
   group('encoders_buffer', encoders_buffer.main);
   group('env', env.main);
   group('exception', exception.main);
-  group('extension', extension.main);
+  group('extension', extension_test.main);
   group('find_one', find_one.main);
   group('general', general.main);
   group('hooked', hooked.main);

From a39b33549b45a4d2eb77b8aab22bc11881cf0e30 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Nov 2019 08:21:01 -0500
Subject: [PATCH 410/414] Bump to 2.0.5 (not 2.1.0, semver)

---
 CHANGELOG.md | 4 +++-
 pubspec.yaml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b30851f3..97f7d7c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
-# 2.0.5
+# 2.1.0
+* This release was originally planned to be `2.0.5`, but it adds several features, and has
+therefore been bumped to `2.1.0`.
 * Fix a new (did not appear before 2.6/2.7) type error causing compilation to fail.
 https://github.com/angel-dart/framework/issues/249
 
diff --git a/pubspec.yaml b/pubspec.yaml
index ef9b3c27..664b7291 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.0.5-beta
+version: 2.1.0
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework

From 00e861adbc9058e19639726728f918eb8e64e252 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Nov 2019 08:27:46 -0500
Subject: [PATCH 411/414] Fix controller_test to await async call

---
 test/controller_test.dart | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/controller_test.dart b/test/controller_test.dart
index 0e0a5f3f..d5689c72 100644
--- a/test/controller_test.dart
+++ b/test/controller_test.dart
@@ -71,7 +71,7 @@ bool bar(RequestContext req, ResponseContext res) {
 
 main() {
   Angel app;
-  TodoController ctrl;
+  TodoController todoController;
   NoExposeController noExposeCtrl;
   HttpServer server;
   http.Client client = http.Client();
@@ -86,7 +86,7 @@ main() {
 
     // Register as a singleton, just for the purpose of this test
     if (!app.container.has<TodoController>()) {
-      app.container.registerSingleton(ctrl = TodoController());
+      app.container.registerSingleton(todoController = TodoController());
     }
 
     // Using mountController<T>();
@@ -94,12 +94,12 @@ main() {
 
     noExposeCtrl = await app.mountController<NoExposeController>();
 
-    // Place controller in group...
-    app.group('/ctrl_group', (router) {
-      app.container
-          .make<TodoController>()
-          .applyRoutes(router, app.container.reflector);
-    });
+    // Place controller in group. The applyRoutes() call, however, is async.
+    // Until https://github.com/angel-dart/route/issues/28 is closed,
+    // this will need to be done by manually mounting the router.
+    var subRouter = Router<RequestHandler>();
+    await todoController.applyRoutes(subRouter, app.container.reflector);
+    app.mount('/ctrl_group', subRouter);
 
     print(app.controllers);
     app.dumpTree();
@@ -115,7 +115,7 @@ main() {
   });
 
   test('basic', () {
-    expect(ctrl.app, app);
+    expect(todoController.app, app);
   });
 
   test('create dynamic handler', () async {

From decd4b56e7009f9a5bfa36756cc8f2e4d955b2e5 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Nov 2019 08:29:56 -0500
Subject: [PATCH 412/414] Formatting

---
 lib/src/core/controller.dart      | 3 ++-
 lib/src/core/hostname_router.dart | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/core/controller.dart b/lib/src/core/controller.dart
index 2c82cde2..e531b12b 100644
--- a/lib/src/core/controller.dart
+++ b/lib/src/core/controller.dart
@@ -47,7 +47,8 @@ class Controller {
   }
 
   /// Applies the routes from this [Controller] to some [router].
-  Future<String> applyRoutes(Router<RequestHandler> router, Reflector reflector) async {
+  Future<String> applyRoutes(
+      Router<RequestHandler> router, Reflector reflector) async {
     // Load global expose decl
     var classMirror = reflector.reflectClass(this.runtimeType);
     Expose exposeDecl = findExpose(reflector);
diff --git a/lib/src/core/hostname_router.dart b/lib/src/core/hostname_router.dart
index c6e98f70..b896a895 100644
--- a/lib/src/core/hostname_router.dart
+++ b/lib/src/core/hostname_router.dart
@@ -96,8 +96,7 @@ class HostnameRouter {
           // app.dumpTree();
 
           var r = app.optimizedRouter;
-          var resolved =
-              r.resolveAbsolute(req.path, method: req.method);
+          var resolved = r.resolveAbsolute(req.path, method: req.method);
           var pipeline = MiddlewarePipeline<RequestHandler>(resolved);
           // print('Pipeline: $pipeline');
           for (var handler in pipeline.handlers) {

From 99fbec359e42d50fe7c93b6ffb51b443da3c04dd Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Fri, 22 Nov 2019 08:34:41 -0500
Subject: [PATCH 413/414] Add explicit string_scanner dep

---
 pubspec.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pubspec.yaml b/pubspec.yaml
index 664b7291..7adf6a22 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -27,6 +27,7 @@ dependencies:
   quiver_hashcode: ^2.0.0
   recase: ^2.0.0
   stack_trace: ^1.0.0
+  string_scanner: ^1.0.0
   tuple: ^1.0.0
   uuid: ^2.0.0-rc.1
 dev_dependencies:

From 64d6729def5ffcf225a2c8f74fdf115218df1c56 Mon Sep 17 00:00:00 2001
From: Tobe O <thosakwe@gmail.com>
Date: Wed, 5 Feb 2020 18:02:46 -0500
Subject: [PATCH 414/414] Get rid of pedantic stuff

---
 CHANGELOG.md                   |  3 +++
 analysis_options.yaml          |  7 ++++++-
 lib/src/http/angel_http.dart   |  5 +++--
 lib/src/http2/angel_http2.dart | 13 ++++++-------
 pubspec.yaml                   |  4 ++--
 test/http2/http2_client.dart   |  3 +--
 test/parameter_meta_test.dart  | 30 +++++++++++++++---------------
 test/precontained_test.dart    |  4 ++--
 test/primitives_test.dart      | 10 +++++-----
 test/server_test.dart          | 22 +++++++++++-----------
 test/streaming_test.dart       |  8 ++++----
 11 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97f7d7c6..a3b932db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.1.1
+* `AngelHttp.uri` now returns an empty `Uri` if the server is not listening.
+
 # 2.1.0
 * This release was originally planned to be `2.0.5`, but it adds several features, and has
 therefore been bumped to `2.1.0`.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index d1a52392..42d44a85 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,5 +1,10 @@
-include: package:pedantic/analysis_options.yaml
+# include: package:pedantic/analysis_options.yaml
 analyzer:
+  errors:
+    always_declare_return_types: ignore
+    omit_local_variable_types: ignore
+    prefer_single_quotes: ignore
+    prefer_spread_collections: ignore
   strong-mode:
     implicit-casts: false
 linter:
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 996c5481..bf77bfc8 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -19,8 +19,9 @@ final RegExp _straySlashes = RegExp(r'(^/+)|(/+$)');
 class AngelHttp extends Driver<HttpRequest, HttpResponse, HttpServer,
     HttpRequestContext, HttpResponseContext> {
   @override
-  Uri get uri =>
-      Uri(scheme: 'http', host: server.address.address, port: server.port);
+  Uri get uri => server == null
+      ? Uri()
+      : Uri(scheme: 'http', host: server.address.address, port: server.port);
 
   AngelHttp._(Angel app,
       Future<HttpServer> Function(dynamic, int) serverGenerator, bool useZone)
diff --git a/lib/src/http2/angel_http2.dart b/lib/src/http2/angel_http2.dart
index 166cf99d..94ed6a66 100644
--- a/lib/src/http2/angel_http2.dart
+++ b/lib/src/http2/angel_http2.dart
@@ -5,7 +5,6 @@ import 'package:angel_framework/angel_framework.dart' hide Header;
 import 'package:angel_framework/http.dart';
 import 'package:http2/transport.dart';
 import 'package:mock_request/mock_request.dart';
-import 'package:pedantic/pedantic.dart';
 import 'http2_request_context.dart';
 import 'http2_response_context.dart';
 import 'package:uuid/uuid.dart';
@@ -166,7 +165,7 @@ class _FakeServerSocket extends Stream<Socket> implements ServerSocket {
 
   @override
   Future<ServerSocket> close() async {
-    unawaited(_ctrl.close());
+    (_ctrl.close());
     return this;
   }
 
@@ -219,11 +218,11 @@ class _AngelHttp2ServerSocket extends Stream<SecureSocket>
 
   int get port => socket.port;
 
-  Future<SecureServerSocket> close() async {
-    unawaited(_sub?.cancel());
-    unawaited(_fake.close());
-    unawaited(_ctrl.close());
-    return await socket.close();
+  Future<SecureServerSocket> close() {
+    _sub?.cancel();
+    _fake.close();
+    _ctrl.close();
+    return socket.close();
   }
 
   @override
diff --git a/pubspec.yaml b/pubspec.yaml
index 7adf6a22..bdae6c0a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_framework
-version: 2.1.0
+version: 2.1.1
 description: A high-powered HTTP server with dependency injection, routing and much more.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_framework
@@ -23,7 +23,7 @@ dependencies:
   mime: ^0.9.3
   mock_request: ^1.0.0
   path: ^1.0.0
-  pedantic: ^1.0.0
+  # pedantic: ^1.0.0
   quiver_hashcode: ^2.0.0
   recase: ^2.0.0
   stack_trace: ^1.0.0
diff --git a/test/http2/http2_client.dart b/test/http2/http2_client.dart
index 2bd767a1..efdea1f7 100644
--- a/test/http2/http2_client.dart
+++ b/test/http2/http2_client.dart
@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:http/http.dart';
 import 'package:http2/transport.dart';
-import 'package:pedantic/pedantic.dart';
 
 /// Simple HTTP/2 client
 class Http2Client extends BaseClient {
@@ -47,7 +46,7 @@ class Http2Client extends BaseClient {
     if (body.isNotEmpty) {
       stream.sendData(body, endStream: true);
     } else {
-      unawaited(stream.outgoingMessages.close());
+      (stream.outgoingMessages.close());
     }
 
     return stream;
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 86ea7fa6..cb46f9d3 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -5,7 +5,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
-import 'package:pedantic/pedantic.dart';
+
 import 'package:test/test.dart';
 
 Future<String> readResponse(MockHttpResponse rs) {
@@ -70,9 +70,9 @@ parameterMetaTests() {
   test('injects header or throws', () async {
     // Invalid request
     var rq = MockHttpRequest('GET', Uri.parse('/header'));
-    unawaited(rq.close());
+    (rq.close());
     var rs = rq.response;
-    unawaited(http.handleRequest(rq));
+    (http.handleRequest(rq));
 
     await printResponse(rs);
     expect(rs.statusCode, 400);
@@ -80,9 +80,9 @@ parameterMetaTests() {
     // Valid request
     rq = MockHttpRequest('GET', Uri.parse('/header'))
       ..headers.add('x-foo', 'bar');
-    unawaited(rq.close());
+    (rq.close());
     rs = rq.response;
-    await unawaited(http.handleRequest(rq));
+    await (http.handleRequest(rq));
 
     var body = await readResponse(rs);
     print('Body: $body');
@@ -93,9 +93,9 @@ parameterMetaTests() {
   test('injects session or throws', () async {
     // Invalid request
     var rq = MockHttpRequest('GET', Uri.parse('/session'));
-    unawaited(rq.close());
+    (rq.close());
     var rs = rq.response;
-    unawaited(http
+    (http
         .handleRequest(rq)
         .timeout(const Duration(seconds: 5))
         .catchError((_) => null));
@@ -105,9 +105,9 @@ parameterMetaTests() {
 
     rq = MockHttpRequest('GET', Uri.parse('/session'));
     rq.session['foo'] = 'bar';
-    unawaited(rq.close());
+    (rq.close());
     rs = rq.response;
-    unawaited(http.handleRequest(rq));
+    (http.handleRequest(rq));
 
     await printResponse(rs);
     expect(rs.statusCode, 200);
@@ -119,18 +119,18 @@ parameterMetaTests() {
 
   test('pattern matching', () async {
     var rq = MockHttpRequest('GET', Uri.parse('/match?mode=pos'));
-    unawaited(rq.close());
+    (rq.close());
     var rs = rq.response;
-    unawaited(http.handleRequest(rq));
+    (http.handleRequest(rq));
     var body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
     expect(body, json.encode('YES pos'));
 
     rq = MockHttpRequest('GET', Uri.parse('/match?mode=neg'));
-    unawaited(rq.close());
+    (rq.close());
     rs = rq.response;
-    unawaited(http.handleRequest(rq));
+    (http.handleRequest(rq));
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
@@ -138,9 +138,9 @@ parameterMetaTests() {
 
     // Fallback
     rq = MockHttpRequest('GET', Uri.parse('/match?mode=ambi'));
-    unawaited(rq.close());
+    (rq.close());
     rs = rq.response;
-    unawaited(http.handleRequest(rq));
+    (http.handleRequest(rq));
     body = await readResponse(rs);
     print('Body: $body');
     expect(rs.statusCode, 200);
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 85eef412..6c4abbe8 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -4,7 +4,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
-import 'package:pedantic/pedantic.dart';
+
 import 'package:test/test.dart';
 
 main() {
@@ -17,7 +17,7 @@ main() {
     expect(app.preContained.keys, contains(echoAppFoo));
 
     var rq = MockHttpRequest('GET', Uri(path: '/foo'));
-    unawaited(rq.close());
+    (rq.close());
     await AngelHttp(app).handleRequest(rq);
     var rs = rq.response;
     var body = await rs.transform(utf8.decoder).join();
diff --git a/test/primitives_test.dart b/test/primitives_test.dart
index 4a50beca..63126450 100644
--- a/test/primitives_test.dart
+++ b/test/primitives_test.dart
@@ -5,7 +5,7 @@ import 'package:angel_container/mirrors.dart';
 import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:mock_request/mock_request.dart';
-import 'package:pedantic/pedantic.dart';
+
 import 'package:test/test.dart';
 
 main() {
@@ -40,7 +40,7 @@ main() {
 
   test('String type annotation', () async {
     var rq = MockHttpRequest('GET', Uri.parse('/string/hello'));
-    unawaited(rq.close());
+    (rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
     expect(rs, json.encode('hello'));
@@ -48,7 +48,7 @@ main() {
 
   test('Primitive after parsed param injection', () async {
     var rq = MockHttpRequest('GET', Uri.parse('/num/parsed/24'));
-    unawaited(rq.close());
+    (rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
     expect(rs, json.encode(24));
@@ -56,7 +56,7 @@ main() {
 
   test('globally-injected primitive', () async {
     var rq = MockHttpRequest('GET', Uri.parse('/num/global'));
-    unawaited(rq.close());
+    (rq.close());
     await http.handleRequest(rq);
     var rs = await rq.response.transform(utf8.decoder).join();
     expect(rs, json.encode(305));
@@ -65,7 +65,7 @@ main() {
   test('unparsed primitive throws error', () async {
     try {
       var rq = MockHttpRequest('GET', Uri.parse('/num/unparsed/32'));
-      unawaited(rq.close());
+      (rq.close());
       var req = await http.createRequestContext(rq, rq.response);
       var res = await http.createResponseContext(rq, rq.response, req);
       await app.runContained((num unparsed) => unparsed, req, res);
diff --git a/test/server_test.dart b/test/server_test.dart
index d6acf90d..88b15343 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -7,7 +7,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:matcher/matcher.dart';
 import 'package:mock_request/mock_request.dart';
-import 'package:pedantic/pedantic.dart';
+
 import 'package:test/test.dart';
 
 final Uri $foo = Uri.parse('http://localhost:3000/foo');
@@ -42,7 +42,7 @@ main() {
     var app = Angel(reflector: MirrorsReflector());
     var http = AngelHttp(app);
     var rq = MockHttpRequest('GET', $foo);
-    unawaited(rq.close());
+    (rq.close());
     var rs = rq.response;
     var req = await http.createRequestContext(rq, rs);
     var res = await http.createResponseContext(rq, rs);
@@ -94,7 +94,7 @@ main() {
     var http = AngelHttp(app);
     app.get('/', ioc((String a) => a));
     var rq = MockHttpRequest('GET', Uri.parse('/'));
-    unawaited(rq.close());
+    (rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
     expect(body, json.encode('b'));
@@ -105,7 +105,7 @@ main() {
     var http = AngelHttp(app);
     app.get($foo.path, (req, ResponseContext res) => res.serialize(null));
     var rq = MockHttpRequest('GET', $foo);
-    unawaited(rq.close());
+    (rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'x');
@@ -121,7 +121,7 @@ main() {
 
     setUp(() async {
       var rq = MockHttpRequest('GET', $foo);
-      unawaited(rq.close());
+      (rq.close());
       req = await http.createRequestContext(rq, rq.response);
       res = await http.createResponseContext(rq, rq.response);
     });
@@ -178,8 +178,8 @@ main() {
     test('can send json', () async {
       var rq = MockHttpRequest('GET', Uri(path: 'wtf'))
         ..headers.set('accept', 'application/json');
-      unawaited(rq.close());
-      unawaited(http.handleRequest(rq));
+      (rq.close());
+      (http.handleRequest(rq));
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
       expect(rq.response.headers.contentType.mimeType, 'application/json');
@@ -188,8 +188,8 @@ main() {
     test('can throw in finalizer', () async {
       var rq = MockHttpRequest('GET', Uri(path: 'wtf'))
         ..headers.set('accept', 'application/json');
-      unawaited(rq.close());
-      unawaited(http.handleRequest(rq));
+      (rq.close());
+      (http.handleRequest(rq));
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
       expect(rq.response.headers.contentType.mimeType, 'application/json');
@@ -198,8 +198,8 @@ main() {
     test('can send html', () async {
       var rq = MockHttpRequest('GET', Uri(path: 'wtf2'));
       rq.headers.set('accept', 'text/html');
-      unawaited(rq.close());
-      unawaited(http.handleRequest(rq));
+      (rq.close());
+      (http.handleRequest(rq));
       await rq.response.toList();
       expect(rq.response.statusCode, 403);
       expect(rq.response.headers.contentType?.mimeType, 'text/html');
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index 6b9d12e3..bb0a0777 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -8,7 +8,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_framework/http.dart';
 import 'package:logging/logging.dart';
 import 'package:mock_request/mock_request.dart';
-import 'package:pedantic/pedantic.dart';
+
 import 'package:test/test.dart';
 
 import 'encoders_buffer_test.dart' show encodingTests;
@@ -77,7 +77,7 @@ main() {
 
   _expectHelloBye(String path) async {
     var rq = MockHttpRequest('GET', Uri.parse(path));
-    unawaited(rq.close());
+    (rq.close());
     await http.handleRequest(rq);
     var body = await rq.response.transform(utf8.decoder).join();
     expect(body, 'Hello, world!bye');
@@ -90,7 +90,7 @@ main() {
   test('cannot write after close', () async {
     try {
       var rq = MockHttpRequest('GET', Uri.parse('/overwrite'));
-      unawaited(rq.close());
+      (rq.close());
       await http.handleRequest(rq);
       var body = await rq.response.transform(utf8.decoder).join();
 
@@ -105,7 +105,7 @@ main() {
   test('res => addError', () async {
     try {
       var rq = MockHttpRequest('GET', Uri.parse('/error'));
-      unawaited(rq.close());
+      (rq.close());
       await http.handleRequest(rq);
       var body = await rq.response.transform(utf8.decoder).join();
       throw 'addError should throw error; response: $body';