1.0

.analysis_options

@@ -1,2 +1,4 @@
 analyzer:
-  strong-mode: true
+  strong-mode: true
+  exclude:
+    - tmp_templates/**

.travis.yml

@@ -10,7 +10,8 @@ before_script:
   - psql -c "alter user dart with password 'dart';" -U postgres
   - psql -c 'grant all on database dart_test to dart;' -U postgres
   - pub get
-script: pub run test -j 1 -r expanded
+script: bash ci/script.sh
+after_success: bash ci/after_script.sh
 branches:
   only:
     - master

CHANGELOG.md

@@ -1,5 +1,11 @@
 # aqueduct changelog
 
+## 1.0.4
+- BREAKING CHANGE: Added new `Response.contentType` property. Adding "Content-Type" to the headers of a `Response` no longer has any effect; use this property instead.
+- `ManagedDataModel`s now scan all libraries for `ManagedObject<T>` subclasses to generate a data model. Use `ManagedDataModel.fromCurrentMirrorSystem` to create instances of `ManagedDataModel`.
+- The *last* instantiated `ManagedContext` now becomes the `ManagedContext.defaultContext`; prior to this change, it was the first instantiated context. Added `ManagedContext.standalone` to opt out of setting the default context.
+- @HTTPQuery parameters in HTTPController responder method will now only allow multiple keys in the query string if and only if the argument type is a List.
+
 ## 1.0.3
 - Fix to allow Windows user to use `aqueduct setup`.
 - Fix to CORS processing.

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+### Running Tests
+
+A local database must exist, configured using the same script in .travis.yml.
+
+Tests are run with the following command:
+
+                pub run test -j 1

bin/aqueduct.dart

@@ -1,8 +1,9 @@
-import 'dart:async';
-import 'package:args/args.dart';
+import 'dart:io';
+
 import 'package:aqueduct/aqueduct.dart';
+import 'package:args/args.dart';
 
-Future<int> main(List<String> args) async {
+main(List<String> args) async {
   var templateCreator = new CLITemplateCreator();
   var migrationRunner = new CLIMigrationRunner();
   var setupCommand = new CLISetup();
@@ -19,16 +20,20 @@ Future<int> main(List<String> args) async {
   if (values.command == null) {
     print(
         "Invalid command, options are: ${totalParser.commands.keys.join(", ")}");
-    return -1;
+    exitCode = 1;
+    return;
   } else if (values.command.name == "create") {
-    return await templateCreator.process(values.command);
+    exitCode = await templateCreator.process(values.command);
+    return;
   } else if (values.command.name == "db") {
-    return await migrationRunner.process(values.command);
+    exitCode = await migrationRunner.process(values.command);
+    return;
   } else if (values.command.name == "setup") {
-    return await setupCommand.process(values.command);
+    exitCode = await setupCommand.process(values.command);
+    return;
   }
 
   print(
       "Invalid command, options are: ${totalParser.commands.keys.join(", ")}");
-  return -1;
+  exitCode = 1;
 }

ci/after_script.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ "$TRAVIS_BRANCH" == "master" ]]; then
+  curl -s https://codecov.io/bash > .codecov
+  chmod +x .codecov
+  ./.codecov -f lcov.info -X xcode
+fi

ci/script.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+pub run test -j 1 -r expanded
+if [[ "$TRAVIS_BRANCH" == "master" ]]; then
+  pub global activate -sgit https://github.com/stablekernel/codecov_dart.git
+  dart_codecov_generator --report-on=lib/ --verbose --no-html
+fi

example/templates/default/bin/start.dart

@@ -23,9 +23,6 @@ main() async {
 
     var signalPath = new File(".aqueductsignal");
     await signalPath.writeAsString("ok");
-  } on ApplicationSupervisorException catch (e, st) {
-    await writeError(
-        "IsolateSupervisorException, server failed to start: ${e.message} $st");
   } catch (e, st) {
     await writeError("Server failed to start: $e $st");
   }

example/templates/default/lib/src/controller/identity_controller.dart → example/templates/default/lib/controller/identity_controller.dart

@@ -1,4 +1,4 @@
-part of wildfire;
+import '../wildfire.dart';
 
 class IdentityController extends HTTPController {
   @httpGet

example/templates/default/lib/src/controller/register_controller.dart → example/templates/default/lib/controller/register_controller.dart

@@ -1,12 +1,14 @@
-part of wildfire;
+import '../wildfire.dart';
 
 class RegisterController extends QueryController<User> {
   @httpPost
   createUser() async {
-    if (query.values.username == null || query.values.password == null) {
+    if (query.values.email == null || query.values.password == null) {
       return new Response.badRequest(
-          body: {"error": "Username and password required."});
+          body: {"error": "email and password required."});
     }
+    var credentials = AuthorizationBasicParser
+        .parse(request.innerRequest.headers.value(HttpHeaders.AUTHORIZATION));
 
     var salt = AuthServer.generateRandomSalt();
     var hashedPassword =
@@ -15,9 +17,6 @@ class RegisterController extends QueryController<User> {
     query.values.salt = salt;
 
     var u = await query.insert();
-
-    var credentials = AuthorizationBasicParser
-        .parse(request.innerRequest.headers.value(HttpHeaders.AUTHORIZATION));
     var token = await request.authorization.grantingServer.authenticate(
         u.username,
         query.values.password,

example/templates/default/lib/src/controller/user_controller.dart → example/templates/default/lib/controller/user_controller.dart

@@ -1,4 +1,4 @@
-part of wildfire;
+import '../wildfire.dart';
 
 class UserController extends QueryController<User> {
   @httpGet

example/templates/default/lib/src/model/token.dart → example/templates/default/lib/model/token.dart

@@ -1,4 +1,4 @@
-part of wildfire;
+import '../wildfire.dart';
 
 class AuthCode extends ManagedObject<_AuthCode> implements _AuthCode {}
 

example/templates/default/lib/src/model/user.dart → example/templates/default/lib/model/user.dart

@@ -1,4 +1,4 @@
-part of wildfire;
+import '../wildfire.dart';
 
 class User extends ManagedObject<_User> implements _User, Authenticatable {
   @managedTransientInputAttribute

example/templates/default/lib/src/utilities/auth_delegate.dart → example/templates/default/lib/utilities/auth_delegate.dart

@@ -1,6 +1,6 @@
-part of wildfire;
+import '../wildfire.dart';
 
-class WildfireAuthenticationDelegate
+class WildfireAuthDelegate
     implements AuthServerDelegate<User, Token, AuthCode> {
   Future<AuthClient> clientForID(AuthServer server, String id) async {
     var clientQ = new Query<ClientRecord>()..matchOn.id = id;

example/templates/default/lib/wildfire.dart

@@ -6,18 +6,17 @@
 /// A web server.
 library wildfire;
 
-import 'dart:io';
-import 'dart:async';
-import 'package:aqueduct/aqueduct.dart';
-import 'package:scribe/scribe.dart';
+export 'dart:async';
+export 'dart:io';
 
 export 'package:aqueduct/aqueduct.dart';
 export 'package:scribe/scribe.dart';
 
-part 'src/model/token.dart';
-part 'src/model/user.dart';
-part 'src/wildfire_sink.dart';
-part 'src/controller/user_controller.dart';
-part 'src/controller/identity_controller.dart';
-part 'src/controller/register_controller.dart';
-part 'src/utilities/auth_delegate.dart';
+export 'wildfire_sink.dart';
+export 'model/token.dart';
+export 'model/user.dart';
+export 'controller/user_controller.dart';
+export 'controller/identity_controller.dart';
+export 'controller/register_controller.dart';
+export 'utilities/auth_delegate.dart';
+

example/templates/default/lib/wildfire_sink.dart

@@ -0,0 +1,104 @@
+import 'wildfire.dart';
+
+/// This class handles setting up this application.
+///
+/// Override methods from [RequestSink] to set up the resources your
+/// application uses and the routes it exposes.
+///
+/// Instances of this class are the type argument to [Application].
+/// See http://stablekernel.github.io/aqueduct/http/request_sink.html
+/// for more details.
+///
+/// See bin/start.dart for usage.
+class WildfireSink extends RequestSink {
+  static const String ConfigurationKey = "ConfigurationKey";
+  static const String LoggingTargetKey = "LoggingTargetKey";
+
+  /// [Application] creates instances of this type with this constructor.
+  ///
+  /// The options will be the values set in the spawning [Application]'s
+  /// [Application.configuration] [ApplicationConfiguration.configurationOptions].
+  /// See bin/start.dart.
+  WildfireSink(Map<String, dynamic> opts) : super(opts) {
+    WildfireConfiguration configuration = opts[ConfigurationKey];
+
+    LoggingTarget target = opts[LoggingTargetKey];
+    target?.bind(logger);
+
+    context = contextWithConnectionInfo(configuration.database);
+
+    authServer = new AuthServer<User, Token, AuthCode>(
+        new WildfireAuthDelegate());
+  }
+
+  ManagedContext context;
+  AuthServer<User, Token, AuthCode> authServer;
+
+  /// All routes must be configured in this method.
+  @override
+  void setupRouter(Router router) {
+    router
+        .route("/auth/token")
+        .pipe(
+            new Authorizer(authServer, strategy: AuthStrategy.client))
+        .generate(() => new AuthController(authServer));
+
+    router
+        .route("/auth/code")
+        .pipe(
+            new Authorizer(authServer, strategy: AuthStrategy.client))
+        .generate(() => new AuthCodeController(authServer));
+
+    router
+        .route("/identity")
+        .pipe(new Authorizer(authServer))
+        .generate(() => new IdentityController());
+
+    router
+        .route("/register")
+        .pipe(
+            new Authorizer(authServer, strategy: AuthStrategy.client))
+        .generate(() => new RegisterController());
+
+    router
+        .route("/users/[:id]")
+        .pipe(new Authorizer(authServer))
+        .generate(() => new UserController());
+  }
+
+  ManagedContext contextWithConnectionInfo(
+      DatabaseConnectionConfiguration connectionInfo) {
+    var dataModel =
+        new ManagedDataModel.fromCurrentMirrorSystem();
+    var psc = new PostgreSQLPersistentStore.fromConnectionInfo(
+        connectionInfo.username,
+        connectionInfo.password,
+        connectionInfo.host,
+        connectionInfo.port,
+        connectionInfo.databaseName);
+
+    var ctx = new ManagedContext(dataModel, psc);
+    ManagedContext.defaultContext = ctx;
+
+    return ctx;
+  }
+
+  @override
+  Map<String, APISecurityScheme> documentSecuritySchemes(
+      PackagePathResolver resolver) {
+    return authServer.documentSecuritySchemes(resolver);
+  }
+}
+
+/// An instance of this class represents values from a configuration
+/// file specific to this application.
+///
+/// Configuration files must have key-value for the properties in this class.
+/// For more documentation on configuration files, see
+/// https://pub.dartlang.org/packages/safe_config.
+class WildfireConfiguration extends ConfigurationItem {
+  WildfireConfiguration(String fileName) : super.fromFile(fileName);
+
+  DatabaseConnectionConfiguration database;
+  int port;
+}