refactor out the exception parsing

Author: icewind1991

js/Components/Exception.js

@@ -13,12 +13,11 @@ export class Exception extends Component {
 	};
 
 	render () {
-		var trace = this.props.Trace.split('\n');
 		var traceElements;
 		if (this.state.expanded) {
-			traceElements = trace.map((line, i) => {
+			traceElements = this.props.Trace.map((trace, i) => {
 				return (
-					<TraceLine key={i} line={line}/>
+					<TraceLine key={i} {...trace}/>
 				);
 			});
 			traceElements = (

js/Components/LogEntry.js

@@ -1,11 +1,17 @@
 import {Component} from 'react/addons';
 
+import {ExceptionParser} from '../ExceptionParser.js';
 import {Exception} from './Exception.js';
 
 export class LogEntry extends Component {
+	constructor () {
+		super();
+		this.exceptionParser = new ExceptionParser();
+	}
+
 	render () {
 		if (this.isException()) {
-			return this.renderExcetion();
+			return this.renderException();
 		} else {
 			return this.renderBasic();
 		}
@@ -17,14 +23,14 @@ export class LogEntry extends Component {
 		);
 	}
 
-	renderExcetion () {
-		var exceptionData = JSON.parse(this.props.message.substr(10));
+	renderException () {
+		var exceptionData = this.exceptionParser.parse(this.props.message);
 		return (
 			<Exception {...exceptionData}/>
 		);
 	}
 
 	isException () {
-		return this.props.message.substr(0, 12) === 'Exception: {';
+		return this.exceptionParser.isException(this.props.message);
 	}
 }

js/Components/TraceLine.js

@@ -2,33 +2,13 @@ import {Component} from 'react/addons';
 
 export class TraceLine extends Component {
 	render () {
-		var parts = this.props.line.split(' ');
-		var number = parts.shift();
-		var line = parts.join(' ');
-		parts = line.split(':');
-
-		console.log(line);
-		if (parts.length > 1) {
-			var fileAndLine = parts.shift();
-			line = parts.join(' ');
-			if (fileAndLine[0] === '[') {
-				lineNumber = false;
-				file = fileAndLine;
-			} else {
-				var [file, lineNumber]=fileAndLine.split('(', 2);
-				lineNumber = lineNumber.substr(0, lineNumber.length - 1);
-			}
-		} else {
-			file = false;
-		}
-
 		return (
 			<li>
-				<span className="file">{file}</span>
+				<span className="file">{this.props.file}</span>
 				<span
-					className="line">{lineNumber ? ' - line ' + lineNumber + ': ' : ''}
+					className="line">{this.props.lineNumber ? ' - line ' + this.props.lineNumber + ': ' : ''}
 				</span>
-				<span className="call">{line}</span>
+				<span className="call">{this.props.call}</span>
 			</li>
 		);
 	}

js/ExceptionParser.js

@@ -0,0 +1,46 @@
+export class ExceptionParser {
+	isException (logMessage) {
+		return logMessage.substr(0, 12) === 'Exception: {';
+	}
+
+	parse (logMessage) {
+		let data = JSON.parse(logMessage.substr(10));
+		let traceLines = data.Trace.split('\n');
+		data.Trace = traceLines.map(this.parseTraceLine);
+		return data;
+	}
+
+	parseTraceLine (line) {
+		let parts = line.split(' ');
+		let number = parts.shift();
+		let traceData = parts.join(' ');
+		parts = traceData.split(':');
+
+		if (parts.length > 1) {
+			let file, lineNumber;
+			let fileAndLine = parts.shift();
+			let call = parts.join(' ');
+			if (fileAndLine[0] === '[') {
+				lineNumber = false;
+				file = fileAndLine;
+			} else {
+				let filePaths = fileAndLine.split('(', 2);
+				file = filePaths[0];
+				lineNumber = filePaths[1].substr(0, filePaths[1].length - 1);
+			}
+			return {
+				call: call,
+				number: number,
+				file: file,
+				lineNumber: lineNumber
+			};
+		} else {
+			return {
+				call: traceData,
+				number: number,
+				file: false,
+				lineNumber: false
+			};
+		}
+	}
+}