Code for 1.2.1 (#38)

* Updated Readme

* Added location property to box.json to point to MindscapeHQ repo.

* Additional minor changes to stacktrace handling. Request URL now combines script name and path info from CGI.

Author: TheRealAgentK

README.md

@@ -3,7 +3,7 @@ raygun4cfml
 
 Raygun.io API client for CFML.
 
-Current Version: 1.2.0 (Jun 8 2021)
+Current Version: 1.2.1 (Jun 16 2021)
 
 Dependencies: 
 

box.json

@@ -1,6 +1,7 @@
 {
     "name":"raygun4cfml",
-    "version":"1.2.0",
+    "version":"1.2.1",
+    "location":"MindscapeHQ/raygun4cfml#1.2.1",
     "author":"Kai Koenig <kai@ventego-creative.co.nz>",
     "homepage":"https://github.com/MindscapeHQ/raygun4cfml/",
     "documentation":"https://github.com/MindscapeHQ/raygun4cfml/blob/master/README.md",

changelog.md

@@ -1,6 +1,11 @@
 History
 =======
 
+1.2.1 (Jun 16 2021)
+
+- Minor changes to stacktrace handling
+- Additional of Path Info to Request URL data
+
 1.2.0 (Jun 8 2021)
 
 - Support for version (#34)

src/nz/co/ventego-creative/raygun4cfml/RaygunExceptionMessage.cfc

@@ -75,18 +75,11 @@ limitations under the License.
 				tagContextData[j]["lineNumber"] = trim( arguments.issueDataStruct.tagcontext[j]["line"] );
 			}
 
+			returnContent["data"] = {"JavaStrackTrace" = stackTraceData};
 			returnContent["stackTrace"] = tagContextData;
-
-			if (isLucee || isACF2021) {
-				returnContent["stackTrace"] = stackTraceData;
-			} else {
-				returnContent["data"] = {"JavaStrackTrace" = stackTraceData};
-				returnContent["stackTrace"] = tagContextData;
-			}
 
 			// if we deal with an error struct, there'll be a root cause
-			if (StructKeyExists(arguments.issueDataStruct,"RootCause"))
-			{
+			if (StructKeyExists(arguments.issueDataStruct,"RootCause")) {
 				if (StructKeyExists(arguments.issueDataStruct["RootCause"],"Type") and arguments.issueDataStruct["RootCause"]["Type"] eq "expression")
 				{
 					returnContent["data"]["type"] = arguments.issueDataStruct["RootCause"]["Type"];
@@ -95,21 +88,14 @@ limitations under the License.
 				{
 					returnContent["message"] = arguments.issueDataStruct["RootCause"]["Message"];
 				}
-				returnContent["catchingMethod"] = "error struct";
-			}
-			// otherwise there's no root cause and the specific data has to be grabbed from somewhere else
-			else
-			{
-				if (!isLucee || isACF2021) {
+				returnContent["catchingMethod"] = "Error struct";
+			} else {
+                // otherwise there's no root cause and the specific data has to be grabbed from somewhere else
+                if (!isLucee || isACF2021) {
 					returnContent["data"]["type"] = arguments.issueDataStruct.type;
 				}
 				returnContent["message"] = arguments.issueDataStruct.message;
-				returnContent["catchingMethod"] = "cfcatch struct";
-			}
-
-			// Look for CFML code snippet in TagContext
-			if (StructKeyExists(arguments.issueDataStruct,"TagContext") && isArray(arguments.issueDataStruct["TagContext"]) && structKeyExists(arguments.issueDataStruct["TagContext"][1],"codePrintPlain")) {
-				returnContent["data"]["code"] = arguments.issueDataStruct["TagContext"][1]["codePrintPlain"];
+				returnContent["catchingMethod"] = "CFCatch struct";
 			}
 
 			returnContent["className"] = trim( arguments.issueDataStruct.type );

src/nz/co/ventego-creative/raygun4cfml/RaygunRequestMessage.cfc

@@ -33,7 +33,7 @@ limitations under the License.
             var rawDataMaxLength = 4096;
 
 			returnContent["hostName"] = CGI.HTTP_HOST;
-			returnContent["url"] = CGI.SCRIPT_NAME;
+			returnContent["url"] = CGI.SCRIPT_NAME & CGI.PATH_INFO
 			returnContent["httpMethod"] = CGI.REQUEST_METHOD;
 			returnContent["iPAddress"] = CGI.REMOTE_ADDR;
 			returnContent["queryString"] = CGI.QUERY_STRING;