Merge pull request #5 from grifart/fixed-windows-line-endings

decoder: fixed support for CRLF line-endings

src/decoder.js

@@ -44,7 +44,7 @@ function decoder(output) {
 		} else if (input.substr(0, 3) == "\xEF\xBB\xBF") { // BOM
 			input = input.substr(3);
 		}
-		this.input = "\n" + "" + input.replace("\r", ""); // \n forces indent detection
+		this.input = "\n" + "" + input.replace(/\r\n/g, "\n"); // \n forces indent detection
 
 		var regexp = new RegExp('(' + "" + decoder.patterns.join(')|(') + "" + ')', 'mig');
 		this.tokens = this.split(regexp, this.input);

test/Decoder.inline.array.js

@@ -44,6 +44,18 @@ suite('Decoder.inline.array', function () {
 			f: null
 		});
 	});
+
+	test('5 - crlf', function () {
+		assertNeon.equal(neon.decode("{a,\r\nb\r\nc: 1,\r\nd: 1,\r\n\r\ne: 1\r\nf:\r\n}"), {
+			0: "a",
+			1: "b",
+			c: 1,
+			d: 1,
+			e: 1,
+			f: null
+		});
+	});
+
 	test('entity 1', function () {
 		assert.ok(neon.decode("@item(a, b)") instanceof neon.Entity);
 	});