fix(parser): verify document with leading empty line (#757)

ignore heading blank lines after the front-matter Fixes #707 Signed-off-by: Xavier Coulon <[email protected]>
bytesparadise · Sep 29, 2020 · 921565a · 921565a
1 parent ec1fc87
commit 921565a
Show file tree

Hide file tree

Showing 4 changed files with 3,928 additions and 3,833 deletions.
diff --git a/pkg/parser/document_processing_include_files_test.go b/pkg/parser/document_processing_include_files_test.go
@@ -1698,7 +1698,7 @@ include::../../test/includes/chapter-a.adoc[]
 					source := `include::../../test/includes/tag-include-unclosed.adoc[tag=unclosed]`
 					expected := types.RawDocument{
 						Blocks: []interface{}{
-							types.BlankLine{},
+							// leading blanklines are ignored
 							types.Paragraph{
 								Lines: []interface{}{
 									types.RawLine{
@@ -1936,7 +1936,7 @@ include::../../test/includes/chapter-a.adoc[]
 						source := `include::../../test/includes/tag-include.adoc[tag=**;!*]` // includes all sections
 						expected := types.RawDocument{
 							Blocks: []interface{}{
-								types.BlankLine{},
+								// leading blanklines are ignored
 								types.Paragraph{
 									Lines: []interface{}{
 										types.RawLine{

diff --git a/pkg/parser/document_test.go b/pkg/parser/document_test.go
@@ -12,16 +12,104 @@ var _ = Describe("documents", func() {
 
 	Context("draft document", func() {
 
-		It("empty document", func() {
+		It("should parse empty document", func() {
 			source := ``
 			expected := types.DraftDocument{}
 			Expect(ParseDraftDocument(source)).To(MatchDraftDocument(expected))
 		})
+
+		It("should parse header without empty first line", func() {
+			source := `= My title
+Garrett D'Amore
+1.0, July 4, 2020
+`
+			expected := types.DraftDocument{
+				Attributes: types.Attributes{
+					"revnumber":      "1.0",
+					"revdate":        "July 4, 2020",
+					"author":         "Garrett D'Amore",
+					"authorinitials": "GD",
+					"authors": []types.DocumentAuthor{
+						{
+							FullName: "Garrett D'Amore",
+							Email:    "",
+						},
+					},
+					"firstname": "Garrett",
+					"lastname":  "D'Amore",
+					"revision": types.DocumentRevision{
+						Revnumber: "1.0",
+						Revdate:   "July 4, 2020",
+						Revremark: "",
+					},
+				},
+				Blocks: []interface{}{
+					types.Section{
+						Level: 0,
+						Attributes: types.Attributes{
+							"id": "_my_title",
+						},
+						Title: []interface{}{
+							types.StringElement{
+								Content: "My title",
+							},
+						},
+						Elements: []interface{}{},
+					},
+				},
+			}
+			Expect(ParseDraftDocument(source)).To(MatchDraftDocument(expected))
+
+		})
+
+		It("should parse header with empty first line", func() {
+			source := `
+= My title
+Garrett D'Amore
+1.0, July 4, 2020`
+			expected := types.DraftDocument{
+				Attributes: types.Attributes{
+					"revnumber":      "1.0",
+					"revdate":        "July 4, 2020",
+					"author":         "Garrett D'Amore",
+					"authorinitials": "GD",
+					"authors": []types.DocumentAuthor{
+						{
+							FullName: "Garrett D'Amore",
+							Email:    "",
+						},
+					},
+					"firstname": "Garrett",
+					"lastname":  "D'Amore",
+					"revision": types.DocumentRevision{
+						Revnumber: "1.0",
+						Revdate:   "July 4, 2020",
+						Revremark: "",
+					},
+				},
+				Blocks: []interface{}{
+					types.Section{
+						Level: 0,
+						Attributes: types.Attributes{
+							"id": "_my_title",
+						},
+						Title: []interface{}{
+							types.StringElement{
+								Content: "My title",
+							},
+						},
+						Elements: []interface{}{},
+					},
+				},
+			}
+			Expect(ParseDraftDocument(source)).To(MatchDraftDocument(expected))
+
+		})
 	})
 
 	Context("final document", func() {
 
-		It("empty document", func() {
+		It("should parse empty document", func() {
 			source := ``
 			expected := types.Document{
 				Elements: []interface{}{},