Merge pull request #52 from coldbox-modules/development

- Renamed `renderView()` to `view` to be ColdBox 7 compliant now.
coldbox-modules · May 9, 2024 · e8eea0b · e8eea0b
2 parents 20c226d + c9ce626
commit e8eea0b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 17 deletions.
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Security",
-    "version":"3.4.2",
+    "version":"3.4.3",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions.com <[email protected]>",
     "slug":"cbsecurity",
@@ -52,15 +52,15 @@
         "start:lucee":"server start [email protected]",
         "start:2018":"server start [email protected]",
         "start:2021":"server start [email protected]",
-		"start:2023":"server start [email protected]",
+        "start:2023":"server start [email protected]",
         "stop:lucee":"server stop [email protected]",
         "stop:2018":"server stop [email protected]",
         "stop:2021":"server stop [email protected]",
-		"stop:2023":"server stop [email protected]",
+        "stop:2023":"server stop [email protected]",
         "logs:lucee":"server log [email protected] --follow",
         "logs:2018":"server log [email protected] --follow",
         "logs:2021":"server log [email protected] --follow",
-		"logs:2023":"server log [email protected] --follow"
+        "logs:2023":"server log [email protected] --follow"
     },
     "installPaths":{
         "jwt-cfml":"modules/jwtcfml/",

diff --git a/build/Build.cfc b/build/Build.cfc
@@ -12,6 +12,7 @@ component {
 		variables.cwd          = getCWD().reReplace( "\.$", "" );
 		variables.artifactsDir = cwd & "/.artifacts";
 		variables.buildDir     = cwd & "/.tmp";
+		variables.apidDocsDir = variables.buildDir & "/apidocs";
 		variables.apiDocsURL   = "http://localhost:60299/apidocs/";
 		variables.testRunner   = "http://localhost:60299/tests/runner.cfm";
 
@@ -31,7 +32,8 @@ component {
 		// Cleanup + Init Build Directories
 		[
 			variables.buildDir,
-			variables.artifactsDir
+			variables.artifactsDir,
+			variables.apidDocsDir
 		].each( function( item ){
 			if ( directoryExists( item ) ) {
 				directoryDelete( item, true );

diff --git a/changelog.md b/changelog.md
@@ -15,6 +15,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Renamed `renderView()` to `view` to be ColdBox 7 compliant now.
+
+## [3.4.2] - 2024-01-10
+
+## [3.4.1] - 2023-08-09
+
+### Fixed
+
 - Markdown rules updated to fix duplicate headers
 - Updated security logs columns to work in Oracle as `clob`
 - `cbsecurity_logs` is hard coded instead of using module setting

diff --git a/layouts/Main.cfm b/layouts/Main.cfm
@@ -76,7 +76,7 @@
 		</nav>
 
 		<div class="container-fluid m-2 mt-4 mb-5">
-			#renderView()#
+			#view()#
 		</div>
 
 		<!--- Scripts --->

diff --git a/[email protected] b/[email protected]
@@ -2,7 +2,7 @@
     "name":"cbsecurity-adobe@2023",
     "app":{
         "serverHomeDirectory":".engine/adobe2023",
-        "cfengine":"adobe@2023.0.0-beta.1"
+        "cfengine":"adobe@2023"
     },
     "web":{
         "http":{

diff --git a/test-harness/layouts/Main.cfm b/test-harness/layouts/Main.cfm
@@ -1,6 +1,6 @@
 <cfoutput>
 <h1>Module Tester</h1>
 <div>
-	#renderView()#
+	#view()#
 </div>
-</cfoutput>
+</cfoutput>
diff --git a/views/home/index.cfm b/views/home/index.cfm
@@ -137,49 +137,49 @@
 
 	<div class="tab-content w-100 ms-5 me-2">
 		<div class="tab-pane fade show active" id="activity-pane" role="tabpanel" aria-labelledby="activity-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/activity",
 				module = "cbsecurity"
 			)#
 		</div>
 		<div class="tab-pane fade show" id="authentication-pane" role="tabpanel" aria-labelledby="authentication-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/authentication",
 				module = "cbsecurity"
 			)#
 		</div>
 		<div class="tab-pane fade show" id="basicAuth-pane" role="tabpanel" aria-labelledby="basicAuth-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/basicAuth",
 				module = "cbsecurity"
 			)#
 		</div>
 		<div class="tab-pane fade show" id="csrf-pane" role="tabpanel" aria-labelledby="csrf-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/csrf",
 				module = "cbsecurity"
 			)#
 		</div>
 		<div class="tab-pane fade show" id="firewall-pane" role="tabpanel" aria-labelledby="firewall-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/firewall",
 				module = "cbsecurity"
 			)#
 		</div>
 		<div class="tab-pane fade show" id="rules-pane" role="tabpanel" aria-labelledby="rules-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/rules",
 				module = "cbsecurity"
 			)#
 		</div>
 		<div class="tab-pane fade show" id="jwt-pane" role="tabpanel" aria-labelledby="jwt-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/jwt",
 				module = "cbsecurity"
 			)#
 		</div>
 		<div class="tab-pane fade show" id="security-headers-pane" role="tabpanel" aria-labelledby="security-headers-tab" tabindex="0">
-			#renderView(
+			#view(
 				view = "home/tabs/security-headers",
 				module = "cbsecurity"
 			)#