Significant fixes and refactoring

11 years ago · e4facc2b54
2 changed files with 88 additions and 105 deletions
--- a/index.html
+++ b/index.html
@ -52,6 +52,13 @@
				@@ -52,6 +52,13 @@
 	</head>
 	<body>
 		<div class="container">
+			<div class="text-center">
+				Delimiter: <input type="text" id="delim" value="," maxlength="1">
+				<label><input type="checkbox" id="header" checked> Header row</label>
+				&nbsp; &nbsp;
+				<label><input type="checkbox" id="dyntype" checked> Dynamic typing</label>
+			</div>
+			<br>
 			<textarea id="tb" placeholder="CSV input">Address,City,State,Zipcode,Name,Phone Number,Group,URL
 1 Crossgates Mall Road,Albany,NY,12203,Apple Store Cross Gates,(518) 869-3192,"Example ""Group"" 1",http://www.apple.com/retail/crossgates/
 Duke Rd & Walden Ave,Buffalo,NY,14225,Apple Store Walden Galleria,(716) 685-2762,Example Group 2,http://www.apple.com/retail/walden/
@ -65,11 +72,6 @@ Duke Rd & Walden Ave,Buffalo,NY,14225,Apple Store Walden Galleria,(716) 685-2762
				@@ -65,11 +72,6 @@ Duke Rd & Walden Ave,Buffalo,NY,14225,Apple Store Walden Galleria,(716) 685-2762
 103 Prince Street,New York,NY,10012,Apple Store SoHo,(212) 226-3126,Example Group 2,http://www.apple.com/retail/soho/</textarea>
 			<br>
 			<div class="text-center">
-				Delimiter: <input type="text" id="delim" value="," maxlength="1">
-				<label><input type="checkbox" id="header" checked> Header row</label>
-				&nbsp; &nbsp;
-				<label><input type="checkbox" id="dyntype" checked> Dynamic typing</label>
-				<br>
 				<button id="parseText">Parse Text</button>
 				<br><hr>
 				or
@ -87,18 +89,12 @@ $(function()
				@@ -87,18 +89,12 @@ $(function()
 {
 	$('#parseText').click(function()
 	{
-		var results = $.parse($('#tb').val(), {
-			delimiter: $("#delim").val(),
-			header: $('#header').is(':checked'),
-			dynamicTyping: $('#dyntype').is(':checked')
-		});
-
-		render(results);
+		render($.parse($('#tb').val(), userConfig()));
 	});

 	$('#parseFiles').click(function()
 	{
-		$('#fileinput1, #fileinput2').parse(
+		$('#fileinput1').parse(
 		{
 			before: function(file, inputElem)
 			{
@ -112,10 +108,20 @@ $(function()
				@@ -112,10 +108,20 @@ $(function()
 			{
 				console.log("COMPLETE", data, file, inputElem, event);
 				render(data);
-			}
+			},
+			config: userConfig()
 		});
 	});

+	function userConfig()
+	{
+		return {
+			delimiter: $("#delim").val(),
+			header: $('#header').is(':checked'),
+			dynamicTyping: $('#dyntype').is(':checked')
+		};
+	}
+
 	function render(results)
 	{
 		$('#output').text(JSON.stringify(results, undefined, 2));
--- a/jquery.parse.js
+++ b/jquery.parse.js
@ -8,18 +8,6 @@
				@@ -8,18 +8,6 @@
 {
 	"use strict";

-	var reader = new FileReader();
-	var defaults = {
-		delimiter: ",",
-		header: true,
-		dynamicTyping: false
-	};
-	var config = {
-		delimiter: defaults.delimiter,
-		header: defaults.header,
-		dynamicTyping: defaults.dynamicTyping
-	};
-
 	$.fn.parse = function(options)
 	{
 		function error(name, elem, file)
@ -28,6 +16,8 @@
				@@ -28,6 +16,8 @@
 				options.error({name: name}, elem, file);
 		}

+		var config = isDef(options.config) ? options.config : {};
+
 		this.each(function(idx)
 		{
 			var supported = $(this).prop('tagName').toUpperCase() == "INPUT"
@ -82,6 +72,8 @@
				@@ -82,6 +72,8 @@
 					}
 				}

+				var reader = new FileReader();
+
 				if (isFunction(options.error))
 					reader.onerror = function() { options.error(reader.error, file, this); };

@ -104,29 +96,10 @@
				@@ -104,29 +96,10 @@

 	$.parse = function(input, options)
 	{
-		options = verifyOptions(options);
-		var parser = new Parser(input, options);
-		return {
-			results: parser.parse(),
-			errors: parser.getErrors()
-		};
+		var parser = new Parser(options);
+		return parser.parse(input);
 	};

-	function verifyOptions(opt)
-	{
-		opt.delimiter = opt.delimiter || defaults.delimiter;
-		opt.header = !isDef(opt.header) ? defaults.header : opt.header;
-		opt.dynamicTyping = !isDef(opt.dynamicTyping) ? defaults.dynamicTyping : opt.dynamicTyping;
-
-		if (opt.delimiter == '"' || opt.delimiter == "\n")
-			opt.delimiter = defaults.delimiter;
-
-		if (opt.delimiter.length > 1)
-			opt.delimiter = opt.delimiter[0];
-
-		return opt;
-	}
-
 	function isFunction(func)
 	{
 		return typeof func === 'function';
@ -137,27 +110,49 @@
				@@ -137,27 +110,49 @@
 		return typeof val !== 'undefined'
 	}

-	function Parser(input, config)
+	// Parser is the actual parsing component.
+	// It is under test and does not depend on jQuery.
+	function Parser(config)
 	{
 		var self = this;
-		var _input = input;
-		var _config = config;
-		var _errors = [];
+		var _input = "";
+		var _config = {};
+		var _state = emptyState();
+		var _defaultConfig = {
+			delimiter: ",",
+			header: true,
+			dynamicTyping: true
+		};
 		var _regex = {
 			floats: /^\s*-?(\d*\.?\d+|\d+\.?\d*)(e[-+]?\d+)?\s*$/i,
 			empty: /^\s*$/
-		}
-		var _state = emptyState();
+		};

-		this.parse = function(arg)
+		this.setOptions = function(opt)
 		{
-			if (typeof arg === 'object')
-				self.setConfig(arg)
-			else if (typeof arg === 'string')
-				self.setInput(arg);
+			opt = validConfig(opt);
+			_config = {
+				delimiter: opt.delimiter,
+				header: opt.header,
+				dynamicTyping: opt.dynamicTyping
+			};
+		};

-			_errors = [];
-			_state = emptyState();
+		this.getOptions = function()
+		{
+			return {
+				delimiter: _config.delimiter,
+				header: _config.header,
+				dynamicTyping: _config.dynamicTyping
+			};
+		};
+
+		this.parse = function(input)
+		{
+			if (typeof input !== 'string')
+				return returnable();
+
+			reset(input);

 			for (_state.i = 0; _state.i < _input.length; _state.i++)
 			{
@ -172,66 +167,47 @@
				@@ -172,66 +167,47 @@
 					notInQuotes();
 			}

-			// End of input is also end of the last row
-			endRow();
+			endRow();	// End of input is also end of the last row

 			if (_state.inQuotes)
 				addError("Quotes", "MissingQuotes", "Unescaped or mismatched quotes");

-			return self.getParsed();
-		};
-
-		this.getDelimiter = function()
-		{
-			return config.delimiter;
-		};
-
-		this.setDelimiter = function(delim)
-		{
-			var comma = ",";
-			delim = delim
-				? (delim == '"' || delim == "\n" ? comma : delim)
-				: comma;
-			_config.delimiter = delim[0];
+			return returnable();
 		};

-		this.setConfig = function(opt)
-		{
-			if ((typeof opt.header !== 'undefined'
-					&& opt.header != config.header)
-				|| (typeof opt.delimiter !== 'undefined'
-					&& opt.delimiter != config.delimiter))
-			{
-				_state.parsed = emptyParsed(opt.header);
-			}
-
-			_config = opt;
-
-			if (typeof opt.delimiter !== 'undefined')
-				self.setDelimiter(opt.delimiter);
-			console.log("DELIM:", _config);
-		}
+		this.setOptions(config);

-		this.getInput = function()
+		function returnable()
 		{
-			return _input;
+			return {
+				results: _state.parsed,
+				errors: _state.errors
+			};
 		}

-		this.setInput = function(input)
+		function reset(input)
 		{
+			_state = emptyState();
 			_input = input;
 		}

-		this.getParsed = function()
+		function validConfig(config)
 		{
-			return _state.parsed;
-		}
+			if (typeof config.delimiter !== 'string'
+				|| config.delimiter.length != 1)
+				config.delimiter = _defaultConfig.delimiter;

-		this.getErrors = function()
-		{
-			return _errors;
-		}
+			if (config.delimiter == '"' || config.delimiter == "\n")
+				config.delimiter = _defaultConfig.delimiter;

+			if (typeof config.header !== 'boolean')
+				config.header = _defaultConfig.header;
+			
+			if (typeof config.dynamicTyping !== 'boolean')
+				config.dynamicTyping = _defaultConfig.dynamicTyping;
+
+			return config;
+		}

 		function emptyParsed(header)
 		{
@ -248,7 +224,8 @@
				@@ -248,7 +224,8 @@
 				line: "",
 				ch: "",
 				inQuotes: false,
-				parsed: emptyParsed(config.header)
+				parsed: emptyParsed(_config.header),
+				errors: []
 			};
 		}

@ -439,7 +416,7 @@
				@@ -439,7 +416,7 @@

 		function addError(type, code, msg)
 		{
-			_errors.push({
+			_state.errors.push({
 				type: type, 
 				code: code,
 				message: msg,