Merge branch 'development'

# Conflicts:
#	.travis.yml
#	tests/test.properties

.cfformat.json

@@ -0,0 +1,56 @@
+{
+    "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
+}

.gitignore

@@ -1,18 +1,14 @@
-.settings
-logs/*.log
-settings.xml
-.netbeans
-tests/results/*
-modules/cbvalidation/*
-coldbox/*
-testbox/*
-artifacts/*
-apidocs/docbox/*
-workbench/build.number
-build/*
-apidocs/cbmarkdown-APIDocs
+.vscode
 
-modules/cbjavaloader
-modules/cbemoji
+.artifacts/**
+.tmp/**
 
-workbench/**
+test-harness/.engine/**
+test-harness/coldbox/**
+test-harness/docbox/**
+test-harness/testbox/**
+test-harness/logs/**
+test-harness/modules/**
+
+# log files
+logs/**

.module.properties

@@ -1,3 +1,3 @@
 project.name=cbmarkdown
-project.version=3.2.0
+project.version=3.3.0
 module.name=cbmarkdown

.travis.yml

@@ -1,71 +1,110 @@
 language: java
-notifications: 
-   slack: 
-      secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
-env: 
-   global: 
-   - MODULE_ID=cbmarkdown
-   matrix: 
-   - ENGINE=lucee@5
-   - [email protected]
-   - ENGINE=adobe@2018
-   - ENGINE=adobe@2016
-   - ENGINE=adobe@11
-branches: 
-   only: 
-   - development
-   - master
+
+notifications:
+  slack:
+    secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
+
+env:
+  # Fill out these global variables for build process
+  global:
+    - MODULE_ID=cbmarkdown
+  matrix:
+    - ENGINE=lucee@5
+    - ENGINE=adobe@2016
+    - ENGINE=adobe@2018
+
+branches:
+  only:
+  - development
+  - master
+
 dist: trusty
+
 sudo: required
-before_install: 
-- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
-- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list
-install: 
-- sudo apt-get update && sudo apt-get --assume-yes install rsync jq commandbox
-- box version
-- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
-- mkdir tests/results
-- sudo chmod -R 775 tests/results
-script: 
-- box install
-- printf "\nmodule.name=$MODULE_ID" >> workbench/build.properties
-- printf "\ncfengine=$ENGINE" >> workbench/build.properties
-- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f workbench/build.xml
-after_failure: 
-- cd $TRAVIS_BUILD_DIR
-- box server log name=$ENGINE
-- cat `box system-log`
-before_deploy: 
-- cd $TRAVIS_BUILD_DIR
-- mkdir -p s3deploy
-- rsync -av ./artifacts/$MODULE_ID/ ./s3deploy/
-- rm -f ./s3deploy/box-repo.json
-deploy: 
--  provider: s3
-   on: 
-      branch: 
-      - master
-      - development
-      condition: $ENGINE = [email protected]
-   skip_cleanup: true
-   access_key_id: $AWS_ACCESS_KEY
-   secret_access_key: $AWS_ACCESS_SECRET
-   bucket: downloads.ortussolutions.com
-   local-dir: s3deploy
-   upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
-   acl: public_read
--  provider: s3
-   on: 
-      branch: 
-      - master
-      - development
-      condition: $ENGINE = [email protected]
-   skip_cleanup: true
-   access_key_id: $AWS_ACCESS_KEY
-   secret_access_key: $AWS_ACCESS_SECRET
-   bucket: apidocs.ortussolutions.com
-   local-dir: build/apidocs
-   upload-dir: coldbox-modules/$MODULE_ID
-   acl: public_read
-after_deploy: 
-- cd $TRAVIS_BUILD_DIR/build && box forgebox publish
+
+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
+    /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
+  # 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
+  - TARGET_VERSION=`cat $TRAVIS_BUILD_DIR/box.json | jq '.version' -r`
+  - echo "Starting build for ${MODULE_ID} v${TARGET_VERSION}"
+  # Replace version so builder can issue it
+  - box package set [email protected]@[email protected]@
+  # Startup the harness
+  - cd test-harness
+  # run our dependency install to ensure the workbench is in place
+  - box install
+  # run our matrix server
+  - box server start serverConfigFile="server-${ENGINE}.json"
+  # Startup the app
+  - curl http://localhost:60299
+  # Debugging of tests
+  #- 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
+
+after_failure:
+  - cd $TRAVIS_BUILD_DIR/test-harness
+  # Display the contents of our root directory
+  # Spit out our Commandbox log in case we need to debug
+  - box server log server-${ENGINE}.json
+  - cat `box system-log`
+
+deploy:
+  # Module Deployment
+  - provider: s3
+    on:
+      branch:
+        - master
+        - development
+      condition: "$ENGINE = lucee@5"
+    skip_cleanup: true
+    #AWS Credentials need to be set in Travis
+    access_key_id: $AWS_ACCESS_KEY
+    secret_access_key: $AWS_ACCESS_SECRET
+    # Destination
+    bucket: "downloads.ortussolutions.com"
+    local-dir: $TRAVIS_BUILD_DIR/.artifacts/$MODULE_ID
+    upload-dir: ortussolutions/coldbox-modules/$MODULE_ID
+    acl: public_read
+
+  # API Docs Deployment
+  - provider: s3
+    on:
+      branch:
+        - master
+        - development
+      condition: "$ENGINE = lucee@5"
+    skip_cleanup: true
+    #AWS Credentials need to be set in Travis
+    access_key_id: $AWS_ACCESS_KEY
+    secret_access_key: $AWS_ACCESS_SECRET
+    bucket: "apidocs.ortussolutions.com"
+    local-dir: $TRAVIS_BUILD_DIR/.tmp/apidocs
+    upload-dir: coldbox-modules/$MODULE_ID/$TARGET_VERSION
+    acl: public_read
+
+after_deploy:
+  # Move to build out artifact
+  - cd ${TRAVIS_BUILD_DIR}/.tmp/${MODULE_ID}
+  - cat box.json
+  # Only publish once
+  - if [ ${ENGINE} = 'lucee@5' ]; then box forgebox publish; fi

ModuleConfig.cfc

@@ -0,0 +1,62 @@
+/**
+ * Ortus Markdown Module
+ * Copyright 2013 Ortus Solutions, Corp
+ * www.ortussolutions.com
+ * ---
+ * Module Configuration
+ */
+component {
+
+	// Module Properties
+	this.title              = "ColdBox Markdown Processor";
+	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]@";
+	// 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
+	this.layoutParentLookup = true;
+	// CF Mapping
+	this.cfmapping          = "cbmarkdown";
+	// Module Dependencies That Must Be Loaded First, use internal names or aliases
+	this.dependencies       = [ "cbjavaloader", "cbemoji" ];
+
+	/**
+	 * Configure this module
+	 */
+	function configure(){
+		settings = {
+			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.
+				appendMissingColumns        : true,
+				// Whether to discard body columns that are beyond what is defined in the header
+				discardExtraColumns         : true,
+				// Class name to use on tables
+				className                   : "table",
+				// When true only tables whose header lines contain the same number of columns as the separator line will be recognized
+				headerSeparationColumnMatch : true
+			}
+		};
+	}
+
+	/**
+	 * Fired when the module is registered and activated.
+	 */
+	function onLoad(){
+		// Class load FlexMark Processor
+		controller
+			.getWireBox()
+			.getInstance( "loader@cbjavaloader" )
+			.appendPaths( variables.modulePath & "/models/lib" );
+	}
+
+	/**
+	 * Fired when the module is unregistered and unloaded
+	 */
+	function onUnload(){
+	}
+
+}