related #2, better handling of contributor in epub3, and add first test suit with goconvey

Author: Bastien Quelen

parser/epub.go

@@ -11,6 +11,8 @@ import (
 	"github.com/feedbooks/webpub-streamer/models"
 )
 
+const epub3 = "3.0"
+
 func init() {
 	parserList = append(parserList, List{fileExt: "epub", parser: EpubParser})
 }
@@ -55,7 +57,9 @@ func EpubParser(filePath string, selfURL string) (models.Publication, error) {
 	publication.Metadata.Language = book.Opf.Metadata.Language
 	addIdentifier(&publication, book, epubVersion)
 	publication.Metadata.Right = strings.Join(book.Opf.Metadata.Rights, " ")
-	publication.Metadata.Description = book.Opf.Metadata.Description[0]
+	if len(book.Opf.Metadata.Description) > 0 {
+		publication.Metadata.Description = book.Opf.Metadata.Description[0]
+	}
 
 	if len(book.Opf.Metadata.Publisher) > 0 {
 		for _, pub := range book.Opf.Metadata.Publisher {
@@ -80,6 +84,10 @@ func EpubParser(filePath string, selfURL string) (models.Publication, error) {
 		}
 	}
 
+	if epubVersion == epub3 {
+		findContributorInMeta(&publication, book, epubVersion)
+	}
+
 	fillSpineAndResource(&publication, book)
 	addCoverRel(&publication, book)
 
@@ -141,12 +149,35 @@ func findInManifestByID(book *epub.Book, ID string) models.Link {
 	return models.Link{}
 }
 
+func findContributorInMeta(publication *models.Publication, book *epub.Book, epubVersion string) {
+
+	for _, meta := range book.Opf.Metadata.Meta {
+		if meta.Property == "dcterms:creator" || meta.Property == "dcterms:contributor" {
+			cont := epub.Author{}
+			cont.Data = meta.Data
+			cont.ID = meta.ID
+			addContributor(publication, book, epubVersion, cont)
+
+		}
+	}
+
+}
+
 func addContributor(publication *models.Publication, book *epub.Book, epubVersion string, cont epub.Author) {
 	var contributor models.Contributor
+	var role string
 
 	contributor.Name = cont.Data
+	if epubVersion == "3.0" {
+		meta := findMetaByRefineAndProperty(book, cont.ID, "role")
+		if meta.Property == "role" {
+			role = meta.Data
+		}
+	} else {
+		role = cont.Role
+	}
 
-	switch contributor.Role {
+	switch role {
 	case "aut":
 		publication.Metadata.Author = append(publication.Metadata.Author, contributor)
 	case "trl":
@@ -170,14 +201,7 @@ func addContributor(publication *models.Publication, book *epub.Book, epubVersio
 	case "pbl":
 		publication.Metadata.Publisher = append(publication.Metadata.Publisher, contributor)
 	default:
-		if epubVersion == "3.0" {
-			meta := findMetaByRefineAndProperty(book, cont.ID, "role")
-			if meta.Property == "role" {
-				contributor.Role = meta.Data
-			}
-		} else {
-			contributor.Role = cont.Role
-		}
+		contributor.Role = role
 		publication.Metadata.Contributor = append(publication.Metadata.Contributor, contributor)
 	}
 }

parser/epub_test.go

@@ -0,0 +1,81 @@
+package parser
+
+import (
+	"errors"
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+type testDataStruct struct {
+	filepath     string
+	err          error
+	title        string
+	authorName   string
+	identifier   string
+	thirdChapter string
+	tocChildren  bool
+}
+
+func TestPublication(t *testing.T) {
+	testData := []testDataStruct{
+		{"../test/empty.epub", errors.New("can't open or parse epub file with err : open ../test/empty.epub: no such file or directory"), "", "", "", "", false},
+		{"../test/moby-dick.epub", nil, "Moby-Dick", "Herman Melville", "code.google.com.epub-samples.moby-dick-basic", "ETYMOLOGY.", false},
+		{"../test/kusamakura.epub", nil, "草枕", "夏目 漱石", "http://www.aozora.gr.jp/cards/000148/card776.html", "三", false},
+		{"../test/feedbooks_book_6816.epub", nil, "Mémoires d'Outre-tombe", "François-René de Chateaubriand", "urn:uuid:47f6aaf6-aa7e-11e6-8357-4c72b9252ec6", "Partie 1", true},
+	}
+
+	for _, d := range testData {
+		Convey("Given "+d.title+" book", t, func() {
+			publication, err := Parse(d.filepath, "http://localhost/")
+			Convey("There no exception parsing", func() {
+				if d.err != nil {
+					So(err.Error(), ShouldEqual, d.err.Error())
+				} else {
+					So(err, ShouldEqual, nil)
+				}
+			})
+			Convey("The title is good", func() {
+				So(publication.Metadata.Title, ShouldEqual, d.title)
+			})
+
+			if err == nil {
+				Convey("There must be an author", func() {
+					So(len(publication.Metadata.Author), ShouldBeGreaterThanOrEqualTo, 1)
+				})
+			}
+
+			if d.authorName != "" && len(publication.Metadata.Author) > 0 {
+				Convey("first author is good", func() {
+					So(publication.Metadata.Author[0].Name, ShouldEqual, d.authorName)
+				})
+			}
+
+			Convey("Identifier is good", func() {
+				So(publication.Metadata.Identifier, ShouldEqual, d.identifier)
+			})
+
+			Convey("The third chapter is good", func() {
+				if len(publication.TOC) > 3 {
+					So(publication.TOC[2].Title, ShouldEqual, d.thirdChapter)
+				}
+			})
+
+			Convey("There Chapter with children", func() {
+				emptyChildren := false
+				for _, toc := range publication.TOC {
+					if len(toc.Children) > 0 {
+						emptyChildren = true
+					}
+				}
+				if d.tocChildren == true {
+					So(emptyChildren, ShouldBeTrue)
+				} else {
+					So(emptyChildren, ShouldBeFalse)
+				}
+			})
+
+		})
+	}
+
+}