From 6586db782ea6dcb5f2eb191a690ec7e7df51161f Mon Sep 17 00:00:00 2001 From: tjpcc Date: Tue, 17 Jan 2023 16:41:04 -0700 Subject: Updates * update README * move "gemtext" to within "gemini" --- gemtext/htmlconv/convert.go | 86 ---------------------------------------- gemtext/htmlconv/convert_test.go | 46 --------------------- 2 files changed, 132 deletions(-) delete mode 100644 gemtext/htmlconv/convert.go delete mode 100644 gemtext/htmlconv/convert_test.go (limited to 'gemtext/htmlconv') diff --git a/gemtext/htmlconv/convert.go b/gemtext/htmlconv/convert.go deleted file mode 100644 index c703211..0000000 --- a/gemtext/htmlconv/convert.go +++ /dev/null @@ -1,86 +0,0 @@ -package htmlconv - -import ( - "html/template" - "io" - - "tildegit.org/tjp/gus/gemtext" - "tildegit.org/tjp/gus/gemtext/internal" -) - -// Convert writes markdown to a writer from the provided gemtext document. -// -// Templates can be provided to override the output for different line types. -// The templates supported are: -// - "header" is called before any lines and is passed the full Document. -// - "footer" is called after the lines and is passed the full Document. -// - "textline" is called once per line of text and is passed a gemtext.TextLine. -// - "linkline" is called once per link line and is passed an object which wraps -// a gemtext.LinkLine but also supports a ValidatedURL() method returning a -// string which html/template will always allow as href attributes. -// - "preformattedtextlines" is called once for a block of preformatted text and is -// passed a slice of gemtext.PreformattedTextLines. -// - "heading1line" is called once per h1 line and is passed a gemtext.Heading1Line. -// - "heading2line" is called once per h2 line and is passed a gemtext.Heading2Line. -// - "heading3line" is called once per h3 line and is passed a gemtext.Heading3Line. -// - "listitemlines" is called once for a block of contiguous list item lines and -// is passed a slice of gemtext.ListItemLines. -// - "quoteline" is passed once per blockquote line and is passed a gemtext.QuoteLine. -// -// There exist default implementations of each of these templates, so the "overrides" -// argument can be nil. -func Convert(wr io.Writer, doc gemtext.Document, overrides *template.Template) error { - if err := internal.ValidateLinks(doc); err != nil { - return err - } - - tmpl, err := baseTmpl.Clone() - if err != nil { - return err - } - - tmpl, err = internal.AddHTMLTemplates(tmpl, overrides) - if err != nil { - return err - } - - for _, item := range internal.RenderItems(doc) { - if err := tmpl.ExecuteTemplate(wr, item.Template, item.Object); err != nil { - return err - } - } - - return nil -} - -var baseTmpl = template.Must(template.New("htmlconv").Parse(` -{{ define "header" }}{{ end }} -{{ define "textline" }}{{ if ne .String "\n" }}

{{ . }}

{{ end }}{{ end }} -{{ define "linkline" -}} -

=> {{ if eq .Label "" -}} - {{ .URL }} - {{- else -}} - {{ .Label }} - {{- end -}} -

-{{- end }} -{{ define "preformattedtextlines" -}} - 
-	{{- range . -}}
-		{{ . }}
-	{{- end -}}
-
-{{- end }} -{{ define "heading1line" }}

{{ .Body }}

{{ end }} -{{ define "heading2line" }}

{{ .Body }}

{{ end }} -{{ define "heading3line" }}

{{ .Body }}

{{ end }} -{{ define "listitemlines" -}} - -{{- end }} -{{ define "quoteline" }}
{{ .Body }}
{{ end }} -{{ define "footer" }}{{ end }} -`)) diff --git a/gemtext/htmlconv/convert_test.go b/gemtext/htmlconv/convert_test.go deleted file mode 100644 index 967cece..0000000 --- a/gemtext/htmlconv/convert_test.go +++ /dev/null @@ -1,46 +0,0 @@ -package htmlconv_test - -import ( - "bytes" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "tildegit.org/tjp/gus/gemtext" - "tildegit.org/tjp/gus/gemtext/htmlconv" -) - -var gmiDoc = ` -# top-level header line - -## subtitle - -This is some non-blank regular text. - -* an -* unordered -* list - -=> gemini://google.com/ as if -=> https://google.com/ - -> this is a quote -> -tjp - -`[1:] + "```pre-formatted code\ndoc := gemtext.Parse(req.Body)\n```ignored closing alt-text\n" - -func TestConvert(t *testing.T) { - htmlDoc := ` -

top-level header line

subtitle

This is some non-blank regular text. -

=> as if

=> https://google.com/

this is a quote
-tjp
doc := gemtext.Parse(req.Body)
-
`[1:] - - doc, err := gemtext.Parse(bytes.NewBufferString(gmiDoc)) - require.Nil(t, err) - - buf := &bytes.Buffer{} - require.Nil(t, htmlconv.Convert(buf, doc, nil)) - - assert.Equal(t, htmlDoc, buf.String()) -} -- cgit v1.2.3