Merge pull request #10 from stuart-warren/doc-sep

fix: remove extra doc separator

format.go

@@ -17,10 +17,10 @@ const indent = 2
 func Format(r io.Reader) ([]byte, error) {
 	dec := yaml.NewDecoder(r)
 	out := bytes.NewBuffer(nil)
-	enc := yaml.NewEncoder(out)
-	enc.SetIndent(indent)
-	defer enc.Close()
 	for {
+		enc := yaml.NewEncoder(out)
+		enc.SetIndent(indent)
+		defer enc.Close()
 		var doc yaml.Node
 		err := dec.Decode(&doc)
 		if err == io.EOF {
@@ -33,6 +33,7 @@ func Format(r io.Reader) ([]byte, error) {
 		if err := enc.Encode(sortYAML(&doc)); err != nil {
 			return nil, fmt.Errorf("failed encoding: %s", err)
 		}
+		enc.Close()
 	}
 	return out.Bytes(), nil
 }

format_test.go

@@ -27,7 +27,7 @@ k:
     c: i
 `
 	exp := []byte(expected)
-	out, err := yamlfmt.Format(bytes.NewBuffer([]byte(in)))
+	out, err := yamlfmt.Format(bytes.NewReader([]byte(in)))
 	if err != nil {
 		t.Fatalf("Unexpected error: %s\n", err)
 	}
@@ -50,7 +50,54 @@ bar:
   foo: baz # comment
 `
 	exp := []byte(expected)
-	out, err := yamlfmt.Format(bytes.NewBuffer([]byte(in)))
+	out, err := yamlfmt.Format(bytes.NewReader([]byte(in)))
+	if err != nil {
+		t.Fatalf("Unexpected error: %s\n", err)
+	}
+	if !bytes.Equal(out, exp) {
+		t.Fatalf("Got:\n%s\nexpected:\n%s\n", out, exp)
+	}
+	t.Logf("got:\n%v\n", out)
+	t.Logf("expected:\n%v\n", exp)
+}
+
+func TestYamlMultiSort(t *testing.T) {
+	var in = `---
+k:
+  c: l
+  i:
+    i: k
+  v:
+    # comment
+    c: i
+---
+k:
+  c: l
+  i:
+    i: k
+  v:
+    # comment
+    c: i
+`
+	var expected = `---
+k:
+  c: l
+  i:
+    i: k
+  v:
+    # comment
+    c: i
+---
+k:
+  c: l
+  i:
+    i: k
+  v:
+    # comment
+    c: i
+`
+	exp := []byte(expected)
+	out, err := yamlfmt.Format(bytes.NewReader([]byte(in)))
 	if err != nil {
 		t.Fatalf("Unexpected error: %s\n", err)
 	}