Merge branch 'development'

coldbox-modules · May 28, 2020 · ef95679 · ef95679
2 parents a2445ee + 7c0f43b
commit ef95679
Show file tree

Hide file tree

Showing 28 changed files with 342 additions and 150 deletions.
diff --git a/.cfformat.json b/.cfformat.json
@@ -1,56 +1,62 @@
 {
-    "array.empty_padding" : false,
-    "array.padding" : true,
-    "array.multiline.min_length" : 40,
-    "array.multiline.element_count" : 4,
-    "array.multiline.leading_comma.padding" : true,
-    "array.multiline.leading_comma" : false,
-    "alignment.consecutive.assignments" : true,
-    "alignment.consecutive.properties" : true,
-    "alignment.consecutive.params" : true,
-    "brackets.padding" : true,
-    "comment.asterisks" : "align",
-    "binary_operators.padding" : true,
-    "for_loop_semicolons.padding" : true,
-    "function_call.empty_padding" : false,
-    "function_call.padding" : true,
-    "function_call.multiline.leading_comma.padding" : true,
-    "function_call.casing.builtin" : "cfdocs",
-    "function_call.casing.userdefined" : "",
-    "function_call.multiline.element_count" : 4,
-    "function_call.multiline.leading_comma" : false,
-    "function_call.multiline.min_length" : 40,
-    "function_declaration.padding" : true,
-    "function_declaration.empty_padding" : false,
-    "function_declaration.multiline.leading_comma" : false,
-    "function_declaration.multiline.leading_comma.padding" : true,
-    "function_declaration.multiline.element_count" : 4,
-    "function_declaration.multiline.min_length" : 40,
-    "function_declaration.group_to_block_spacing" : "compact",
-    "function_anonymous.empty_padding" : false,
-    "function_anonymous.group_to_block_spacing" : "compact",
-    "function_anonymous.multiline.element_count" : 4,
-    "function_anonymous.multiline.leading_comma" : false,
-    "function_anonymous.multiline.leading_comma.padding" : true,
-    "function_anonymous.multiline.min_length" : 40,
-    "function_anonymous.padding" : true,
-    "indent_size" : 4,
-    "keywords.block_to_keyword_spacing" : "spaced",
-    "keywords.group_to_block_spacing" : "spaced",
-    "keywords.padding_inside_group" : true,
-    "keywords.spacing_to_block" : "spaced",
-    "keywords.spacing_to_group" : true,
-    "keywords.empty_group_spacing" : false,
-    "max_columns" : 120,
-    "parentheses.padding" : true,
-    "strings.quote" : "double",
-    "strings.attributes.quote" : "double",
-    "struct.separator" : " : ",
-    "struct.padding" : true,
-    "struct.empty_padding" : false,
-    "struct.multiline.leading_comma" : false,
-    "struct.multiline.leading_comma.padding" : true,
-    "struct.multiline.element_count" : 4,
-    "struct.multiline.min_length" : 40,
-    "tab_indent" : true
+	"array.empty_padding": false,
+	"array.padding": true,
+	"array.multiline.min_length": 40,
+	"array.multiline.element_count": 2,
+	"array.multiline.leading_comma.padding": true,
+	"array.multiline.leading_comma": false,
+	"alignment.consecutive.assignments": true,
+	"alignment.consecutive.properties": true,
+	"alignment.consecutive.params": true,
+	"brackets.padding": true,
+	"comment.asterisks": "align",
+	"binary_operators.padding": true,
+	"for_loop_semicolons.padding": true,
+	"function_call.empty_padding": false,
+	"function_call.padding": true,
+	"function_call.multiline.leading_comma.padding": true,
+	"function_call.casing.builtin": "cfdocs",
+	"function_call.casing.userdefined": "camel",
+	"function_call.multiline.element_count": 2,
+	"function_call.multiline.leading_comma": false,
+	"function_call.multiline.min_length": 40,
+	"function_declaration.padding": true,
+	"function_declaration.empty_padding": false,
+	"function_declaration.multiline.leading_comma": false,
+	"function_declaration.multiline.leading_comma.padding": true,
+	"function_declaration.multiline.element_count": 2,
+	"function_declaration.multiline.min_length": 40,
+	"function_declaration.group_to_block_spacing": "compact",
+	"function_anonymous.empty_padding": false,
+	"function_anonymous.group_to_block_spacing": "compact",
+	"function_anonymous.multiline.element_count": 2,
+	"function_anonymous.multiline.leading_comma": false,
+	"function_anonymous.multiline.leading_comma.padding": true,
+	"function_anonymous.multiline.min_length": 40,
+	"function_anonymous.padding": true,
+	"indent_size": 4,
+	"keywords.block_to_keyword_spacing": "spaced",
+	"keywords.group_to_block_spacing": "spaced",
+	"keywords.padding_inside_group": true,
+	"keywords.spacing_to_block": "spaced",
+	"keywords.spacing_to_group": true,
+	"keywords.empty_group_spacing": false,
+	"max_columns": 120,
+	"metadata.multiline.element_count": 3,
+	"metadata.multiline.min_length": 40,
+	"method_call.chain.multiline" : 3,
+	"newline":"\n",
+	"property.multiline.element_count": 3,
+	"property.multiline.min_length": 40,
+	"parentheses.padding": true,
+	"strings.quote": "double",
+	"strings.attributes.quote": "double",
+	"struct.separator": " : ",
+	"struct.padding": true,
+	"struct.empty_padding": false,
+	"struct.multiline.leading_comma": false,
+	"struct.multiline.leading_comma.padding": true,
+	"struct.multiline.element_count": 2,
+	"struct.multiline.min_length": 40,
+	"tab_indent": true
 }
diff --git a/.markdownlintrc.json b/.markdownlintrc.json
@@ -0,0 +1,8 @@
+{
+	"line-length": false,
+	"single-h1": false,
+	"first-line-h1": false,
+	"no-multiple-blanks": {
+		"maximum": 2
+	}
+}
diff --git a/.module.properties b/.module.properties
diff --git a/.travis.yml b/.travis.yml
@@ -25,20 +25,21 @@ sudo: required
 before_install:
   # CommandBox Keys
   - curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -
-  - sudo echo "deb https://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
+  - sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
     /etc/apt/sources.list.d/commandbox.list
 
 install:
   # Install Commandbox
   - sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
   # Install CommandBox Supporting Librarires
-  - box install commandbox-cfconfig,commandbox-dotenv,commandbox-docbox,commandbox-cfformat
+  - box install commandbox-cfconfig,commandbox-dotenv,commandbox-docbox
   # If using auto-publish, you will need to provide your API token with this line:
   - box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
 
 script:
-  # Set Current Version
+  # Set Current Version and Travis Tag
   - TARGET_VERSION=`cat $TRAVIS_BUILD_DIR/box.json | jq '.version' -r`
+  - TRAVIS_TAG=${TARGET_VERSION}
   - echo "Starting build for ${MODULE_ID} v${TARGET_VERSION}"
   # Replace version so builder can issue it
   - box package set [email protected]@[email protected]@
@@ -54,12 +55,10 @@ script:
   #- curl http://localhost:60299/tests/runner.cfm?reporter=json -o testresults.json && cat testresults.json
   # move back to build dir to build it
   - cd $TRAVIS_BUILD_DIR
-  # Check formatting
-  - box run-script format:check
   # Build Project
   - box task run taskfile=build/Build target=run :version=${TARGET_VERSION} :projectName=${MODULE_ID} :buildID=${TRAVIS_BUILD_NUMBER} :branch=${TRAVIS_BRANCH}
   # Cat results for debugging
-  - cat build/results.json
+  #- cat build/results.json
 
 after_failure:
   - cd $TRAVIS_BUILD_DIR/test-harness
@@ -102,9 +101,26 @@ deploy:
     upload-dir: coldbox-modules/$MODULE_ID/$TARGET_VERSION
     acl: public_read
 
+  # Github Release only on Master
+  - provider: releases
+    api_key: ${GITHUB_TOKEN}
+    on:
+      branch:
+        - master
+      condition: "$ENGINE = lucee@5"
+    skip_cleanup: true
+    edge: true
+    file_glob: true
+    file: $TRAVIS_BUILD_DIR/.artifacts/$MODULE_ID/**/*
+    release_notes_file: changelog.md
+    name: v${TRAVIS_TAG}
+    tag_name: v${TRAVIS_TAG}
+    overwrite: true
+
+# Once API Docs and Binaries are deployed to S3 Publish to ForgeBox
 after_deploy:
   # Move to build out artifact
   - cd ${TRAVIS_BUILD_DIR}/.tmp/${MODULE_ID}
   - cat box.json
-  # Only publish once
+  # Only publish once using the lucee matrix
   - if [ ${ENGINE} = 'lucee@5' ]; then box forgebox publish; fi
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -12,7 +12,7 @@ component {
 	this.author             = "Ortus Solutions, Corp";
 	this.webURL             = "http://www.ortussolutions.com/products/codexwiki";
 	this.description        = "Markdown processor for ColdBox applications";
-	this.version            = "@build.version@[email protected]@";
+	this.version            = "3.3.0+35";
 	// If true, looks for views in the parent first, if not found, then in the module. Else vice-versa
 	this.viewParentLookup   = true;
 	// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa
@@ -27,7 +27,26 @@ component {
 	 */
 	function configure(){
 		settings = {
-			tableOptions : {
+			// Looks for www or emails and converts them to links
+			autoLinkUrls             : true,
+			// Creates anchor links for headings
+			anchorLinks              : true,
+			// Set the anchor id
+			anchorSetId              : true,
+			// Set the anchor id but also the name
+			achorSetName             : true,
+			// Do we create the anchor for the full header or just before it. True is wrap, false is just create anchor tag
+			anchorWrapText           : false,
+			// The class(es) to apply to the anchor
+			anchorClass              : "anchor",
+			// raw html prefix. Added before heading text, wrapped or unwrapped
+			anchorPrefix             : "",
+			// raw html suffix. Added before heading text, wrapped or unwrapped
+			anchorSuffix             : "",
+			// Enable youtube embedded link transformer
+			enableYouTubeTransformer : false,
+			// Table options
+			tableOptions             : {
 				// Treat consecutive pipes at the end of a column as defining spanning column.
 				columnSpans                 : true,
 				// Whether table body columns should be at least the number or header columns.

diff --git a/box.json b/box.json
@@ -1,33 +1,37 @@
 {
-	"name" 		: "ColdBox Markdown",
-	"version"	: "3.3.0",
-	"location"  : "http://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbmarkdown/@build.version@/[email protected]@.zip",
-	"author" 	: "Ortus Solutions.com <[email protected]>",
-	"slug"		: "cbmarkdown",
-	"type"		: "modules",
-	"homepage"	: "https://github.com/coldbox-modules/cbmarkdown",
-	"documentation"		: "https://github.com/coldbox-modules/cbmarkdown",
-	"repository"		: { "type" : "git", "url" : "https://github.com/coldbox-modules/cbmarkdown" },
-	"shortDescription"	: "ColdBox Module that provides markdown processing",
-	"license"			: [
-		{ "type" : "Apache2", "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" }
-	],
-	"contributors"		: [
-
-	],
-	"dependencies" 	:{
-		"cbjavaloader":"^2.0.0",
-		"cbemoji":"^1.0.1"
-	},
+    "name":"ColdBox Markdown",
+    "version":"3.4.0",
+    "location":"http://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbmarkdown/@build.version@/[email protected]@.zip",
+    "author":"Ortus Solutions.com <[email protected]>",
+    "slug":"cbmarkdown",
+    "type":"modules",
+    "homepage":"https://github.com/coldbox-modules/cbmarkdown",
+    "documentation":"https://github.com/coldbox-modules/cbmarkdown",
+    "repository":{
+        "type":"git",
+        "url":"https://github.com/coldbox-modules/cbmarkdown"
+    },
+    "shortDescription":"ColdBox Module that provides markdown processing",
+    "license":[
+        {
+            "type":"Apache2",
+            "url":"http://www.apache.org/licenses/LICENSE-2.0.html"
+        }
+    ],
+    "contributors":[],
+    "dependencies":{
+        "cbjavaloader":"^2.0.0",
+        "cbemoji":"^1.0.1"
+    },
     "ignore":[
         "**/.*",
         "tests",
         "*/.md"
     ],
     "scripts":{
-		"toMaster":"recipe build/toMaster.boxr",
-		"format": "cfformat ModuleConfig.cfc,models/**/*.cfc,test-harness/tests/specs/**/*.cfc --overwrite",
-        "format:watch": "cfformat ModuleConfig.cfc,models/**/*.cfc,test-harness/tests/specs/**/*.cfc --watch",
-        "format:check": "cfformat ModuleConfig.cfc,models/**/*.cfc,test-harness/tests/specs/**/*.cfc --check"
+        "release":"recipe build/release.boxr",
+        "format":"cfformat run models/,test-harness/tests/,*.cfc --overwrite",
+        "format:watch":"cfformat watch models/,test-harness/tests/,*.cfc ./.cfformat.json",
+        "format:check":"cfformat check models/,test-harness/tests/,*.cfc"
     }
 }
diff --git a/build/Build.cfc b/build/Build.cfc
@@ -78,7 +78,7 @@ component{
             .toConsole();
     }
 
-     /**
+    /**
      * Run the test suites
      */
     function runTests(){

diff --git a/build/toMaster.boxr → build/release.boxr b/build/toMaster.boxr → build/release.boxr
@@ -1,19 +1,25 @@
 # This recipe signifies a new release of the module by doing merges and bumps accordingly
 
-# Check out master
+# Check out master and update it locally
 !git checkout -f master
-# Merge development into it
+!git pull origin master
+
+# Merge development into it for release
 !git merge --no-ff development
-# Tag the master repo with the version in box.json
+
+# Tag the master repo with the version from box.json
 !git tag v`box package show version`
-# Push all branches
+
+# Push all branches back out to github
 !git push origin --all
+
 # Push all tags
 !git push origin --tags
+
 # Check development again
 !git checkout -f development
+
 # Bump to prepare for a new release, do minor, change if needed and don't tag
 bump --minor --!tagVersion
-# Send it out
 !git commit -a -m "version bump"
 !git push origin development
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ component{ @@
                 .toConsole();
         }
-         /**
+        /**
          * Run the test suites
          */
         function runTests(){
@@ Expand Down @@