Merge pull request #33 from snipem/hugo-upstream-asciidoc-fix

Use native Asciidoc Plugins Support of Hugo, no Workaround needed

Author: snipem

Makefile

@@ -1,5 +1,4 @@
-
-# run: make theme && head internal/theme/bindata.go     
+# run: make theme && head internal/theme/bindata.go
 SHELL := /bin/bash
 .PHONY: compose test
 
@@ -59,8 +58,8 @@ run_prd: build secrets
 
 run: build compose serve
 
-run_local: build 
-	# Runs locally, clons this git repo to use test data
+run_local: build
+	# Runs locally, clones this git repo to use test data
 	./monako -config test/config.local.yaml -menu-config test/config.menu.local.md
 	$(MAKE) serve
 

cmd/monako/main_test.go

@@ -68,19 +68,19 @@ func TestMainMonakoTest(t *testing.T) {
 	})
 
 	t.Run("Check for generated test doc markdown page", func(t *testing.T) {
-		assert.FileExists(t, filepath.Join(targetDir, "compose/public/docs/test/test_doc_markdown/index.html"), "Generated Test doc does not exist")
+		assert.FileExists(t, filepath.Join(targetDir, "compose/public/docs/test/test_doc_markdown.html"), "Generated Test doc does not exist")
 
-		contentBytes, err := ioutil.ReadFile(filepath.Join(targetDir, "compose/public/docs/test/test_doc_markdown/index.html"))
+		contentBytes, err := ioutil.ReadFile(filepath.Join(targetDir, "compose/public/docs/test/test_doc_markdown.html"))
 		content := string(contentBytes)
 
 		assert.NoError(t, err, "Can't read file")
 		assert.Contains(t, content, "<strong>Test docs</strong>", "Contains menu")
 
-		assert.Contains(t, content, "<img src=\"../profile.png\" alt=\"Picture in same folder\" />", "Contains relative picture")
+		assert.Contains(t, content, "<img src=\"profile.png\" alt=\"Picture in same folder\" />", "Contains picture")
 		assert.FileExists(t, filepath.Join(targetDir, "compose/public/docs/test/profile.png"), "Relative picture right placed")
 
 		assert.FileExists(t, filepath.Join(targetDir, "compose/public/docs/test/subfolder/subfolderprofile.png"), "Relative subfolder picture right placed")
-		assert.Contains(t, content, "<img src=\"../subfolder/subfolderprofile.png\" alt=\"Picture in sub folder\" />", "Contains relative picture")
+		assert.Contains(t, content, "<img src=\"subfolder/subfolderprofile.png\" alt=\"Picture in sub folder\" />", "Contains picture")
 	})
 
 	// Provide the public folder over a webserver
@@ -90,7 +90,7 @@ func TestMainMonakoTest(t *testing.T) {
 
 	t.Run("Check if images and sources are served", func(t *testing.T) {
 
-		content, err := getContentFromURL(ts, "/docs/test/test_doc_markdown/index.html")
+		content, err := getContentFromURL(ts, "/docs/test/test_doc_markdown.html")
 		assert.NoError(t, err, "HTTP Call failed")
 
 		srcs, err := getURLKeyValuesFromHTML(content, "src", ts.URL)
@@ -118,7 +118,7 @@ func TestMainMonakoTest(t *testing.T) {
 
 	t.Run("Check contents of served page markdown", func(t *testing.T) {
 
-		content, err := getContentFromURL(ts, "/docs/test/test_doc_markdown/index.html")
+		content, err := getContentFromURL(ts, "/docs/test/test_doc_markdown.html")
 		assert.NoError(t, err, "HTTP Call failed")
 
 		assert.Contains(t, content, "Ihr naht euch wieder, schwankende Gestalten!", "Does not contain Goethe")
@@ -129,7 +129,7 @@ func TestMainMonakoTest(t *testing.T) {
 
 	t.Run("Check contents of served page asciidoc", func(t *testing.T) {
 
-		content, err := getContentFromURL(ts, "/docs/test/test_doc_asciidoc/index.html")
+		content, err := getContentFromURL(ts, "/docs/test/test_doc_asciidoc.html")
 		assert.NoError(t, err, "HTTP Call failed")
 
 		assert.Contains(t, content, "Ihr naht euch wieder, schwankende Gestalten!", "Does not contain Goethe")
@@ -150,6 +150,14 @@ func TestMainMonakoTest(t *testing.T) {
 
 	})
 
+	t.Run("Test if asciidoc diagram is served as svg", func(t *testing.T) {
+		content, err := getContentFromURL(ts, "/docs/test/ditaa-diagram.svg")
+		assert.NoError(t, err, "HTTP Call failed")
+
+		assert.Contains(t, content, "Lots of work")
+
+	})
+
 	t.Run("Check for RSS feed", func(t *testing.T) {
 		content, err := getContentFromURL(ts, "/docs/index.xml")
 		assert.NoError(t, err, "HTTP Call failed")

go.mod

@@ -7,10 +7,9 @@ require (
 	github.com/PuerkitoBio/goquery v1.5.1
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/gobuffalo/envy v1.9.0 // indirect
-	github.com/gohugoio/hugo v0.67.0
+	github.com/gohugoio/hugo v0.73.1-0.20200625075133-f0266e2ef348
 	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mitchellh/mapstructure v1.2.2 // indirect
 	github.com/mmcdole/gofeed v1.0.0-beta2
 	github.com/mmcdole/goxpp v0.0.0-20181012175147-0068e33feabf // indirect
@@ -20,10 +19,8 @@ require (
 	github.com/spf13/cobra v0.0.7 // indirect
 	github.com/spf13/viper v1.6.2 // indirect
 	github.com/stretchr/testify v1.5.1
-	github.com/yuin/goldmark v1.1.25 // indirect
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
-	golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775 // indirect
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
 	gopkg.in/ini.v1 v1.55.0 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2