Got rid of 'part', added 'export'. Also fixed attachment

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

lib/angel_framework.dart

@@ -2,3 +2,4 @@
 library angel_framework;
 
 export 'src/http/http.dart';
+export 'src/defs.dart';

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 {

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.";
+}

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

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);
 }

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

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';
+export 'angel_base.dart';
-import 'dart:convert';
+export 'angel_http_exception.dart';
-import 'dart:io';
+export 'controller.dart';
-import 'dart:math';
+export 'hooked_service.dart';
-import 'dart:mirrors';
+export 'metadata.dart';
-import 'package:body_parser/body_parser.dart';
+export 'memory_service.dart';
-import 'package:json_god/json_god.dart' as god;
+export 'request_context.dart';
-import 'package:merge_map/merge_map.dart';
+export 'response_context.dart';
-import 'package:mime/mime.dart';
+export 'routable.dart';
-import '../../defs.dart';
+export 'route.dart';
-
+export 'server.dart';
-part 'controller.dart';
+export 'service.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';
 

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 {

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 {

lib/src/http/request_context.dart

@@ -1,18 +1,15 @@
-part of angel_framework.http;
+library angel_framework.http.request_context;
-
+import 'dart:async';
-/// A function that intercepts a request and determines whether handling of it should continue.
+import 'dart:io';
-typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
+import 'package:body_parser/body_parser.dart';
-
+import '../../src/extensible.dart';
-/// A function that receives an incoming [RequestContext] and responds to it.
+import 'angel_base.dart';
-typedef Future RequestHandler(RequestContext req, ResponseContext res);
+import 'route.dart';
-
-/// A function that handles an [HttpRequest].
-typedef Future RawRequestHandler(HttpRequest request);
 
 /// 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;

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.
+import 'dart:async';
-typedef Future<String> ViewGenerator(String path, [Map data]);
+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",
+    header("Content-Disposition", 'attachment; filename="${filename ?? file.path}"');
-        '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;

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) {
+/// A function that intercepts a request and determines whether handling of it should continue.
-  for (InstanceMirror metaDatum in metadata) {
+typedef Future<bool> RequestMiddleware(RequestContext req, ResponseContext res);
-    if (metaDatum.hasReflectee) {
-      var reflectee = metaDatum.reflectee;
-      if (reflectee.runtimeType == T) {
-        return reflectee;
-      }
-    }
-  }
-  return null;
-}
 
-_getAnnotation(obj, Type T) {
+/// A function that receives an incoming [RequestContext] and responds to it.
-  if (obj is Function || obj is Future) {
+typedef Future RequestHandler(RequestContext req, ResponseContext res);
-    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 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);

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 {

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.
+/// A function that configures an [AngelBase] server in some way.
-typedef Future AngelConfigurer(Angel app);
+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 = [];
 

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

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;
+}

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);
+}

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;
 

test/controller.dart

@@ -19,13 +19,13 @@ 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;
@@ -58,13 +58,15 @@ main() {
   });
 
   test("middleware", () async {
+    var rgx = new RegExp("^Hello, world!");
     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));
+    Map todo = JSON.decode(response.body.replaceAll(rgx, ""));
-      expect(todo.keys.length, equals(2));
+    print("Todo: $todo");
+    expect(todo.keys.length, equals(3));
     expect(todo['text'], equals("Hello"));
     expect(todo['over'], equals("world"));
   });
@@ -75,5 +77,4 @@ main() {
 
     expect(response.body, equals("Hello, \"world!\""));
   });
-  });
 }

test/hooked.dart

@@ -5,7 +5,6 @@ import 'package:test/test.dart';
 import 'common.dart';
 
 main() {
-  group('Hooked', () {
   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"));
     });
-  });
 }

test/routing.dart

@@ -19,7 +19,6 @@ class QueryService extends Service {
 }
 
 main() {
-  group('routing', () {
   Angel angel;
   Angel nested;
   Angel todos;
@@ -31,12 +30,10 @@ main() {
     nested = new Angel();
     todos = new Angel();
 
-      angel
+    angel..registerMiddleware('interceptor', (req, res) async {
-        ..registerMiddleware('interceptor', (req, res) async {
       res.write('Middleware');
       return false;
-        })
+    })..registerMiddleware('intercept_service',
-        ..registerMiddleware('intercept_service',
         (RequestContext req, res) async {
       print("Intercepting a service!");
       return true;
@@ -158,5 +155,4 @@ main() {
     print(response.body);
     expect(response.body, equals("Middleware"));
   });
-  });
 }

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,7 +10,6 @@ class Todo extends MemoryModel {
 }
 
 main() {
-  group('Services', () {
   Map headers = {
     'Accept': 'application/json',
     'Content-Type': 'application/json'
@@ -114,5 +113,4 @@ main() {
           .length, equals(0));
     });
   });
-  });
 }