fix: Use properties for custom migration managers

The properties defined for a custom QBMigrationManager were not being
used.  Added test coverage to ensure that custom managers defined
in `config/ColdBox.cfc` will be configured with the appropriate settings.

Author: elpete

ModuleConfig.cfc

@@ -12,7 +12,7 @@ component {
             "managers": {
                 "default": {
                     "manager": "cfmigrations.models.QBMigrationManager",
-                    "properties": { "defaultGrammar": "BaseGrammar" }
+                    "properties": { "defaultGrammar": "AutoDiscover@qb" }
                 }
             }
         };

models/MigrationService.cfc

@@ -1,4 +1,4 @@
-component singleton accessors="true" {
+component accessors="true" {
 
     property name="wirebox" inject="wirebox";
     property name="environment" inject="coldbox:setting:environment" default="development";
@@ -19,11 +19,11 @@ component singleton accessors="true" {
      * @properties
      */
     MigrationService function init(
-        any manager,
-        string migrationsDirectory,
-        string seedsDirectory,
-        any seedEnvironments,
-        struct properties
+        any manager = "cfmigrations.models.QBMigrationManager",
+        string migrationsDirectory = "/resources/database/migrations",
+        string seedsDirectory = "/resources/database/seeds",
+        any seedEnvironments = [ "development" ],
+        struct properties = {}
     ) {
         variables.managerProperties = {};
         var args = arguments;
@@ -33,7 +33,7 @@ component singleton accessors="true" {
             } )
             .each( function( key ) {
                 if ( isSimpleValue( args[ key ] ) ) {
-                    variables[ key ] = args[ key ];
+                    invoke( this, "set" & key, { key: args[ key ] } );
                 } else if ( key == "properties" ) {
                     variables.managerProperties = args[ key ];
                 }
@@ -47,10 +47,12 @@ component singleton accessors="true" {
     }
 
     function onDIComplete() {
-        variables.manager = variables.wirebox.getInstance(
-            name = variables.manager,
-            initArguments = variables.managerProperties
-        );
+        if ( isSimpleValue( variables.manager ) ) {
+            variables.manager = variables.wirebox.getInstance(
+                name = variables.manager,
+                initArguments = variables.managerProperties
+            );
+        }
     }
 
     /**

models/QBMigrationManager.cfc

@@ -8,6 +8,15 @@ component accessors="true" {
     property name="schema";
     property name="useTransactions" default="true";
 
+    public QBMigrationManager function init() {
+        for ( var key in arguments ) {
+            if ( !isNull( arguments[ key ] ) ) {
+                variables[ key ] = arguments[ key ];
+            }
+        }
+        return this;
+    }
+
     boolean function isReady() {
         return isMigrationTableInstalled();
     }

tests/resources/app/config/Coldbox.cfc

@@ -41,7 +41,27 @@
 
 		moduleSettings = {
 			"quick" : { "defaultGrammar" : "PostgresGrammar@qb" },
-			"qb"    : { "defaultGrammar" : "PostgresGrammar@qb" }
+			"qb"    : { "defaultGrammar" : "PostgresGrammar@qb" },
+            "cfmigrations": {
+                "managers": {
+                    "default": {
+                        "manager": "cfmigrations.models.QBMigrationManager",
+                        "migrationsDirectory": "/resources/database/migrations",
+                        "seedsDirectory": "/resources/database/seeds",
+                        "properties": {}
+                    },
+                    "db1": {
+                        "manager": "cfmigrations.models.QBMigrationManager",
+                        "migrationsDirectory": "/resources/database/db1/migrations",
+                        "seedsDirectory": "/resources/database/db1/seeds",
+                        "properties": {
+                            "defaultGrammar": "MySQLGrammar@qb",
+                            "datasource": "db1",
+                            "useTransactions": "false",    
+                        }
+                    }
+                }
+            }
 		};
 
 		// custom settings

tests/specs/MigrationServiceSpec.cfc

@@ -0,0 +1,31 @@
+component extends="tests.resources.ModuleIntegrationSpec" appMapping="/app" {
+
+    function run() {
+        describe( "MigrationService", function() {
+            it( "can instantiate with a default migration manager", function() {
+                var migrationService = application.wirebox.getInstance( "migrationService:default" );
+                expect( migrationService.getMigrationsDirectory() ).toBe( "/resources/database/migrations" );
+                expect( migrationService.getSeedsDirectory() ).toBe( "/resources/database/seeds" );
+                var manager = migrationService.getManager();
+                expect( manager.getDefaultGrammar() ).toBe( "AutoDiscover@qb" );
+                expect( manager.getDatasource() ).toBeNull();
+                expect( manager.getMigrationsTable() ).toBe( "cfmigrations" );
+                expect( manager.getSchema() ).toBeNull();
+                expect( manager.getUseTransactions() ).toBeTrue();
+            } );
+
+            it( "can instantiate with different named migration managers", function() {
+                var migrationService = application.wirebox.getInstance( "migrationService:db1" );
+                expect( migrationService.getMigrationsDirectory() ).toBe( "/resources/database/db1/migrations" );
+                expect( migrationService.getSeedsDirectory() ).toBe( "/resources/database/db1/seeds" );
+                var manager = migrationService.getManager();
+                expect( manager.getDefaultGrammar() ).toBe( "MySQLGrammar@qb" );
+                expect( manager.getDatasource() ).notToBeNull();
+                expect( manager.getDatasource() ).toBe( "db1" );
+                expect( manager.getMigrationsTable() ).toBe( "cfmigrations" );
+                expect( manager.getUseTransactions() ).toBeFalse();
+            } );
+        } );
+    }
+
+}