chore(Release): v2.0.0

coldbox-modules · Apr 30, 2019 · 425d474 · 425d474
1 parent ecece5c
commit 425d474
Show file tree

Hide file tree

Showing 79 changed files with 2,891 additions and 1,119 deletions.
diff --git a/.cfconfig.json b/.cfconfig.json
@@ -1,11 +1,45 @@
 {
+    "ACF11Password":"CE9938D7E4E1C617EB071941B1D154016B81A10C1B38DBA3C2828B055D07B40A",
+    "ACF11RDSPassword":"ewAdjyWYEiLoCNKrmPJqPx7R+FpDnJoB2JiE0zyv5uoKtBbhQcRCW70FpruCGHUT7BtpSKfX/wx/C25mcZgzVc61YeN/0UilO7V6qXUcLlOZg7f/A9ljR9saWi6r9BmKVqExs1X+1r2l60gY7QuUeg==",
+    "adminAllowConcurrentLogin":true,
+    "adminAllowedIPList":"",
+    "adminLoginRequired":true,
+    "adminRDSEnabled":"false",
+    "adminRDSLoginRequired":"true",
+    "adminRDSUserIDRequired":true,
+    "adminRootUserID":"admin",
     "adminSalt":"4A23BBE0-AB52-4869-9C3EEEE536DC2256",
-    "applicationListener":"mixed",
+    "adminUserIDRequired":false,
+    "ajaxDebugWindowEnabled":false,
+    "allowApplicationVarsInServletContext":false,
+    "allowExtraAttributesInAttrColl":true,
+    "applicationMangement":true,
+    "applicationMaximumTimeout":"2,0,0,0",
     "applicationMode":"curr2root",
     "applicationTimeout":"1,0,0,0",
-    "clientCookies":"yes",
-    "clientManagement":"no",
-    "clientTimeout":"90,0,0,0",
+    "CFaaSGeneratedFilesExpiryTime":30,
+    "CFFormScriptDirectory":"",
+    "clientStorage":"Cookie",
+    "clientStorageLocations":{
+        "Cookie":{
+            "description":"Client based text file.",
+            "disableGlobals":false,
+            "name":"Cookie",
+            "purgeEnable":true,
+            "purgeTimeout":10,
+            "type":"COOKIE"
+        },
+        "Registry":{
+            "description":"System registry.",
+            "disableGlobals":false,
+            "name":"Registry",
+            "purgeEnable":true,
+            "purgeTimeout":90,
+            "type":"REGISTRY"
+        }
+    },
+    "compileExtForCFInclude":"*",
+    "componentCacheEnabled":true,
     "datasources":{
         "quick":{
             "allowAlter":true,
@@ -16,152 +50,136 @@
             "allowInsert":true,
             "allowRevoke":true,
             "allowSelect":true,
+            "allowStoredProcs":true,
             "allowUpdate":true,
-            "blob":"false",
-            "class":"org.gjt.mm.mysql.Driver",
-            "clob":"false",
-            "connectionTimeout":"1",
+            "blob":false,
+            "blobBuffer":64000,
+            "class":"com.mysql.jdbc.Driver",
+            "clientApplicationName":false,
+            "clientApplicationNamePrefix":"",
+            "clientHostname":false,
+            "clientUsername":false,
+            "clob":false,
+            "clobBuffer":64000,
+            "connectionLimit":-1,
+            "connectionTimeout":1,
+            "connectionTimeoutInterval":420,
             "custom":"useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=true",
-            "database":"quick",
+            "database":"${DB_NAME}",
             "dbdriver":"MySQL",
-            "dsn":"jdbc:mysql://{host}:{port}/{database}",
-            "host":"localhost",
-            "metaCacheTimeout":"60000",
-            "port":"3306",
-            "storage":"false",
-            "username":"root",
-            "validate":"false"
-        }
-    },
-    "hspw":"698f110377566465ee6fb4fc4df80253b41a17505344ad17b41218956baa984a",
-    "loggers":{
-        "application":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/application.log"
-            },
-            "layout":"classic"
-        },
-        "datasource":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/datasource.log"
-            },
-            "layout":"classic"
-        },
-        "deploy":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/deploy.log"
-            },
-            "layout":"classic",
-            "level":"info"
-        },
-        "exception":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/exception.log"
-            },
-            "layout":"classic"
-        },
-        "gateway":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/gateway.log"
-            },
-            "layout":"classic"
-        },
-        "mail":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/mail.log"
-            },
-            "layout":"classic"
-        },
-        "mapping":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/mapping.log"
-            },
-            "layout":"classic"
-        },
-        "memory":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/memory.log"
-            },
-            "layout":"classic"
-        },
-        "orm":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/orm.log"
-            },
-            "layout":"classic"
-        },
-        "remoteclient":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/remoteclient.log"
-            },
-            "layout":"classic",
-            "level":"info"
-        },
-        "requesttimeout":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/requesttimeout.log"
-            },
-            "layout":"classic"
-        },
-        "rest":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/rest.log"
-            },
-            "layout":"classic"
-        },
-        "scheduler":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/scheduler.log"
-            },
-            "layout":"classic"
-        },
-        "scope":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/scope.log"
-            },
-            "layout":"classic"
-        },
-        "search":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/search.log"
-            },
-            "layout":"classic"
-        },
-        "thread":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/thread.log"
-            },
-            "layout":"classic"
-        },
-        "trace":{
-            "appender":"resource",
-            "appenderArguments":{
-                "path":"{lucee-config}/logs/trace.log"
-            },
-            "layout":"classic"
+            "description":"",
+            "disableAutogeneratedKeyRetrieval":false,
+            "disableConnections":false,
+            "dsn":"jdbc:mysql://{host}:{port}/{database}?tinyInt1isBit=false&",
+            "host":"${DB_HOST}",
+            "linkedServers":"true",
+            "logActivity":false,
+            "logActivityFile":"",
+            "loginTimeout":30,
+            "maintainConnections":true,
+            "maxPooledStatements":"100",
+            "password":"${DB_PASSWORD}",
+            "port":"${DB_PORT}",
+            "queryTimeout":"0",
+            "SID":"",
+            "username":"${DB_USER}",
+            "validate":false,
+            "validationQuery":""
         }
     },
-    "mergeURLAndForm":"no",
+    "debuggingEnabled":false,
+    "debuggingIPList":"127.0.0.1,0:0:0:0:0:0:0:1",
+    "debuggingReportExecutionTimes":false,
+    "debuggingReportExecutionTimesMinimum":250,
+    "debuggingReportExecutionTimesTemplate":"summary",
+    "debuggingShowDatabase":true,
+    "debuggingShowException":true,
+    "debuggingShowFlashFormCompileErrors":false,
+    "debuggingShowGeneral":true,
+    "debuggingShowTimer":false,
+    "debuggingShowTrace":true,
+    "debuggingShowVariableApplication":false,
+    "debuggingShowVariableCGI":true,
+    "debuggingShowVariableClient":true,
+    "debuggingShowVariableCookie":true,
+    "debuggingShowVariableForm":true,
+    "debuggingShowVariableRequest":false,
+    "debuggingShowVariables":true,
+    "debuggingShowVariableServer":false,
+    "debuggingShowVariableSession":true,
+    "debuggingShowVariableURL":true,
+    "debuggingTemplate":"/WEB-INF/debug/classic.cfm",
+    "disableInternalCFJavaComponents":false,
+    "disallowUnamedAppScope":false,
+    "dotNetClientPort":"6086",
+    "dotNetInstallDir":"C:\\Work\\CF\\depot\\ColdFusion\\cf_main\\cfusion\\jnbridge",
+    "dotNetPort":"6085",
+    "dotNetProtocol":"tcp",
+    "dotNotationUpperCase":true,
+    "errorStatusCode":true,
+    "eventGatewayEnabled":false,
+    "FlashRemotingEnable":true,
+    "flexDataServicesEnable":false,
+    "generalErrorTemplate":"",
+    "googleMapKey":"",
+    "inMemoryFileSystemAppLimit":20,
+    "inMemoryFileSystemEnabled":true,
+    "inMemoryFileSystemLimit":100,
+    "inspectTemplate":"always",
+    "lineDebuggerEnabled":false,
+    "lineDebuggerMaxSessions":5,
+    "lineDebuggerPort":5005,
+    "mailConnectionTimeout":60,
+    "mailDefaultEncoding":"UTF-8",
+    "mailSpoolInterval":15,
+    "maxCFCFunctionRequests":15,
+    "maxCFThreads":10,
+    "maxFlashRemotingRequests":5,
+    "maxOutputBufferSize":1024,
+    "maxReportRequests":8,
+    "maxTemplateRequests":25,
+    "maxWebServiceRequests":5,
+    "missingErrorTemplate":"",
+    "monitoringServiceHost":"0.0.0.0",
+    "monitoringServicePort":"5500",
+    "ORMSearchIndexDirectory":"",
+    "perAppSettingsEnabled":true,
+    "postParametersLimit":100,
+    "postSizeLimit":20,
+    "requestQueueTimeout":60,
+    "requestQueueTimeoutPage":"",
     "requestTimeout":"0,0,0,50",
-    "scopeCascading":"standard",
-    "searchResultsets":"yes",
-    "sessionMangement":"yes",
+    "requestTimeoutEnabled":true,
+    "RMISSLEnable":false,
+    "RMISSLKeystore":"",
+    "robustExceptionEnabled":true,
+    "sandboxEnabled":false,
+    "saveClassFiles":true,
+    "schedulerClusterDatasource":"",
+    "schedulerLogFileExtensions":"log,txt",
+    "schedulerLoggingEnabled":false,
+    "scriptProtect":"FORM,URL,COOKIE,CGI",
+    "secureJSON":false,
+    "secureJSONPrefix":"//",
+    "secureProfileEnabled":false,
+    "serverCFC":"Server",
+    "serverCFCEenabled":false,
+    "sessionCookieDisableUpdate":false,
+    "sessionCookieHTTPOnly":true,
+    "sessionCookieSecure":false,
+    "sessionCookieTimeout":946080000,
+    "sessionMangement":true,
+    "sessionMaximumTimeout":"2,0,0,0",
     "sessionTimeout":"0,0,30,0",
-    "timeServer":"pool.ntp.org"
-}
+    "sessionType":"cfml",
+    "templateCacheSize":1024,
+    "throttleThreshold":4,
+    "totalThrottleMemory":200,
+    "UDFTypeChecking":false,
+    "useUUIDForCFToken":true,
+    "watchConfigFilesForChangesEnabled":false,
+    "watchConfigFilesForChangesExtensions":"xml,properties",
+    "watchConfigFilesForChangesInterval":120,
+    "websocketEnabled":true,
+    "weinreRemoteInspectionEnabled":false
+}
diff --git a/.env.example b/.env.example
@@ -0,0 +1,5 @@
+DB_HOST=
+DB_PORT=
+DB_NAME=
+DB_USER=
+DB_PASSWORD=
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@
 !.engine/WEB-INF/lib
 .engine/WEB-INF/lib/*
 !.engine/WEB-INF/lib/h2-1.4.196.jar
+
+.env
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -3,17 +3,17 @@ component {
     this.name = "quick";
     this.author = "Eric Peterson";
     this.webUrl = "https://github.com/coldbox-modules/quick";
-    this.dependencies = [ "qb", "str", "cfcollection" ];
+    this.dependencies = [ "qb", "str" ];
     this.cfmapping = "quick";
 
     function configure() {
         settings = {
-            defaultGrammar = "BaseGrammar",
-            automaticValidation = true
+            defaultGrammar = "AutoDiscover"
         };
 
         interceptorSettings = {
             customInterceptionPoints = [
+                "quickInstanceReady",
                 "quickPreLoad",
                 "quickPostLoad",
                 "quickPreSave",
@@ -33,19 +33,19 @@ component {
 
         binder.map( "quick.models.BaseEntity" )
             .to( "#moduleMapping#.models.BaseEntity" );
+
+        binder.getInjector().registerDSL( "quickService", "#moduleMapping#.dsl.QuickServiceDSL" );
+
+        var creatorType = server.keyExists( "lucee" ) ? "LuceeEntityCreator" : "ACFEntityCreator";
+        binder.map( "EntityCreator@quick" )
+            .to( "#moduleMapping#.extras.#creatorType#" );
     }
 
     function onLoad() {
-        // remap to force the return format to be QuickCollection
-        binder.map( alias = "QueryBuilder@qb", force = true )
+        binder.map( "QuickQB@quick" )
             .to( "qb.models.Query.QueryBuilder" )
             .initArg( name = "grammar", dsl = "#settings.defaultGrammar#@qb" )
             .initArg( name = "utils", dsl = "QueryUtils@qb" )
-            .initArg( name = "returnFormat", value = function( q ) {
-                return wirebox.getInstance(
-                    name = "QuickCollection@quick",
-                    initArguments = { collection = q }
-                );
-            } );
+            .initArg( name = "returnFormat", value = "array" );
     }
 }