encoder: fixed block mode

matej21 · May 25, 2015 · 7a3886e · 7a3886e
1 parent def434b
commit 7a3886e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/encoder.js b/src/encoder.js
@@ -58,14 +58,14 @@ function encoder() {
 				if (options & encoder.BLOCK) {
 					v = this.encode(v, encoder.BLOCK);
 					s += (isList ? '-' : this.encode(k) + "" + ':')
-					+ "" + (v.indexOf("\n") === -1 ? (' ' + "" + v) : "\n\t" + "" + v.replace("\n", "\n\t"))
+					+ "" + (v.indexOf("\n") === -1 ? (' ' + "" + v) : "\n\t" + "" + v.replace(/\n/g, "\n\t"))
 					+ "" + "\n";
 				} else {
 					s += (isList ? '' : this.encode(k) + "" + ': ') + "" + this.encode(v) + "" + ', ';
 				}
 			}
 			if (options & encoder.BLOCK) {
-				return s.trim() + "\n";
+				return s.trim().replace(/^\s*\n/gm, '') + "\n";
 			} else {
 				return (isList ? '[' : '{') + "" + s.substr(0, s.length - 2) + "" + (isList ? ']' : '}');
 			}

diff --git a/test/Encoder.js b/test/Encoder.js
@@ -94,5 +94,12 @@ suite('Encoder', function () {
 		"	- 1\n" +
 		"	- 2\n");
 	});
+	test('block 6', function () {
+		assert.strictEqual(neon.encode({a: {foo1: {lorem: 1}, foo2: {lorem: 2}}}, neon.BLOCK), "a:\n" +
+			"	foo1:\n" +
+			"		lorem: 1\n" +
+			"	foo2:\n" +
+			"		lorem: 2\n");
+	});
 
 });