Simplify inline text content

atom.go

@@ -1,10 +1,12 @@
 package atom
 
 import (
+	"fmt"
 	"mime"
 	"regexp"
 	"strings"
 
+	"github.com/google/uuid"
 	"golang.org/x/text/language"
 )
 
@@ -61,8 +63,17 @@ func isXMLMediaType(mediaType string) bool {
 // isValidMediaType checks whether a string is a valid media type. It returns a
 // bool.
 func isValidMediaType(mediaType string) bool {
-	_, _, err := mime.ParseMediaType(mediaType)
+	mediaType, _, err := mime.ParseMediaType(mediaType)
-	return err == nil
+	if err != nil {
+		return false
+	}
+
+	typeParts := strings.Split(mediaType, "/")
+	if len(typeParts) != 2 || typeParts[0] == "" || typeParts[1] == "" {
+		return false
+	}
+
+	return true
 }
 
 // isValidLanguageTag checks whether a LanguageTag is valid. It returns a bool.
@@ -70,3 +81,8 @@ func isValidLanguageTag(tag LanguageTag) bool {
 	_, err := language.Parse(string(tag))
 	return err == nil
 }
+
+// NewURN generates an new valid IRI based on a UUID. It returns an IRI.
+func NewURN() IRI {
+	return IRI(fmt.Sprint("urn:uuid:", uuid.New()))
+}

date.go

@@ -7,7 +7,7 @@ import (
 
 type Date struct {
 	*CommonAttributes
-	DateTime string
+	DateTime string `xml:",chardata"`
 }
 
 // DateTime formats a time.Time to string formated as defined by RFC3339. It

entry.go

@@ -63,7 +63,7 @@ func NewEntry(title string) (*Entry, error) {
 	}
 
 	return &Entry{
-		ID:      NewID(),
+		ID:      NewID(NewURN()),
 		Title:   text,
 		Updated: NewDate(time.Now()),
 	}, nil
@@ -213,7 +213,7 @@ func (e *Entry) Check() error {
 		// is not an XML media type [RFC3023], does not begin with "text/", and
 		// does not end with "/xml" or "+xml".
 		mediaType := e.Content.getType()
-		if !isXMLMediaType(mediaType) && !strings.HasPrefix(mediaType, "text/") {
+		if isValidMediaType(mediaType) && !isXMLMediaType(mediaType) && !strings.HasPrefix(mediaType, "text/") {
 			return fmt.Errorf("no summary element of entry %v but media type not xml", e.ID.URI)
 		}
 	}

feed.go

@@ -34,7 +34,7 @@ func NewFeed(title string) (*Feed, error) {
 	}
 
 	return &Feed{
-		ID:      NewID(),
+		ID:      NewID(NewURN()),
 		Title:   text,
 		Updated: NewDate(time.Now()),
 	}, nil

id.go

@@ -3,18 +3,16 @@ package atom
 import (
 	"errors"
 	"fmt"
-
-	"github.com/google/uuid"
 )
 
 type ID struct {
 	*CommonAttributes
-	URI IRI `xml:"uri"`
+	URI IRI `xml:",chardata"`
 }
 
 // NewID creates a new ID. It returns a *ID.
-func NewID() *ID {
+func NewID(id IRI) *ID {
-	return &ID{URI: IRI(fmt.Sprint("urn:uuid:", uuid.New()))}
+	return &ID{URI: IRI(id)}
 }
 
 // Check checks the ID for incompatibilities with RFC4287. It returns an error.

inlineOtherContent.go

@@ -8,7 +8,7 @@ import (
 
 type InlineOtherContent struct {
 	*CommonAttributes
-	AnyElement any       `xml:"anyelement,omitempty"`
+	AnyElement any       `xml:",chardata"`
 	Type       MediaType `xml:"type,attr,omitempty"`
 }
 

inlineTextContent.go

@@ -8,8 +8,8 @@ import (
 
 type InlineTextContent struct {
 	*CommonAttributes
-	Type  string   `xml:"type,attr,omitempty"` // Must be text or html
+	Type string `xml:"type,attr,omitempty"` // Must be text or html
-	Texts []string `xml:"texts,omitempty"`
+	Text string `xml:",chardata"`
 }
 
 // newInlineTextContent creates a new InlineTextContent. It returns a
@@ -19,23 +19,11 @@ func newInlineTextContent(mediaType string, content any) (*InlineTextContent, er
 		return nil, fmt.Errorf("media type %v incompatible with inline text content", mediaType)
 	}
 
-	texts := make([]string, 0)
+	if reflect.TypeOf(content).Kind() != reflect.String {
-
-	t := reflect.TypeOf(content)
-	switch t.Kind() {
-	case reflect.Slice:
-		if t.Elem().Kind() == reflect.String {
-			for _, t := range content.([]string) {
-				texts = append(texts, t)
-			}
-		}
-	case reflect.String:
-		texts = append(texts, content.(string))
-	default:
 		return nil, fmt.Errorf("content type %T incompatible with inline text content", content)
 	}
 
-	return &InlineTextContent{Type: mediaType, Texts: texts}, nil
+	return &InlineTextContent{Type: mediaType, Text: content.(string)}, nil
 }
 
 // isContent checks whether the InlineTextContent is a Content. It returns a

link.go

@@ -38,16 +38,22 @@ func (l *Link) Check() error {
 		}
 	}
 
-	if strings.Contains(l.Rel, ":") || !isValidIRI(IRI(l.Rel)) {
+	if l.Rel != "" {
-		return fmt.Errorf("rel attribute %v of link %v not correctly formatted", l.Rel, l.Href)
+		if strings.Contains(l.Rel, ":") && !isValidIRI(IRI(l.Rel)) {
+			return fmt.Errorf("rel attribute %v of link %v not correctly formatted", l.Rel, l.Href)
+		}
 	}
 
-	if !isValidMediaType(string(l.Type)) {
+	if l.Type != "" {
-		return fmt.Errorf("type attribute %v of link %v invalid media type", l.Type, l.Href)
+		if !isValidMediaType(string(l.Type)) {
+			return fmt.Errorf("type attribute %v of link %v invalid media type", l.Type, l.Href)
+		}
 	}
 
-	if !isValidLanguageTag(l.HrefLang) {
+	if l.HrefLang != "" {
-		return fmt.Errorf("hreflang attribute %v of link %v invalid language tag", l.Type, l.HrefLang)
+		if !isValidLanguageTag(l.HrefLang) {
+			return fmt.Errorf("hreflang attribute %v of link %v invalid language tag", l.Type, l.HrefLang)
+		}
 	}
 
 	if l.Content == nil {

plainText.go

@@ -5,7 +5,7 @@ import "errors"
 type PlainText struct {
 	*CommonAttributes
 	Type string `xml:"type,attr,omitempty"` // Must be text or html
-	Text string `xml:"text"`
+	Text string `xml:",chardata"`
 }
 
 // isText checks whether the PlainText is a Text. It returns a bool.