jason/atom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

Delete extensionAttribute.go and simplify undefined attributes

Browse Source
This commit is contained in:
Jason Streifling 2024-10-17 21:08:41 +02:00
parent 3172a4865a
commit b70ff82141
3 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atom.go
View File

@ -82,6 +82,12 @@ func isValidLanguageTag(tag LanguageTag) bool {
return err == nil return err == nil
} }
// isValidAttribute checks whether an Attribute is valid. It returns a bool.
func isValidAttribute(attribute string) bool {
regex := regexp.MustCompile(`^[a-zA-Z0-9_]+="[^"]*"$`)
return regex.MatchString(attribute)
}
// NewURN generates an new valid IRI based on a UUID. It returns an IRI. // NewURN generates an new valid IRI based on a UUID. It returns an IRI.
func NewURN() IRI { func NewURN() IRI {
return IRI(fmt.Sprint("urn:uuid:", uuid.New())) return IRI(fmt.Sprint("urn:uuid:", uuid.New()))

20
commonAttributes.go
View File

@ -3,9 +3,9 @@ package atom
import "fmt" import "fmt"
type CommonAttributes struct { type CommonAttributes struct {
Base IRI `xml:"base,attr,omitempty"` Base IRI `xml:"base,attr,omitempty"`
Lang LanguageTag `xml:"lang,attr,omitempty"` Lang LanguageTag `xml:"lang,attr,omitempty"`
UndefinedAttributes []*ExtensionAttribute `xml:",any"` UndefinedAttributes []string `xml:",attr"`
} }
// NewCommonAttributes creates a new set of CommonAttributes. It returns a // NewCommonAttributes creates a new set of CommonAttributes. It returns a
@ -15,21 +15,21 @@ func NewCommonAttributes() *CommonAttributes {
} }
// AddExtensionAttribute adds the ExtensionAttribute to the CommonAttributes. // AddExtensionAttribute adds the ExtensionAttribute to the CommonAttributes.
func (c *CommonAttributes) AddExtensionAttribute(e *ExtensionAttribute) { func (c *CommonAttributes) AddExtensionAttribute(name, value string) {
if c.UndefinedAttributes == nil { if c.UndefinedAttributes == nil {
c.UndefinedAttributes = make([]*ExtensionAttribute, 1) c.UndefinedAttributes = make([]string, 1)
c.UndefinedAttributes[0] = e c.UndefinedAttributes[0] = fmt.Sprint(name, `="`, value, `"`)
} else { } else {
c.UndefinedAttributes = append(c.UndefinedAttributes, e) c.UndefinedAttributes = append(c.UndefinedAttributes, fmt.Sprint(name, `="`, value, `"`))
} }
} }
// Check checks the CommonAttributes for incompatibilities with RFC4287. It // Check checks the CommonAttributes for incompatibilities with RFC4287. It
// returns an error. // returns an error.
func (c *CommonAttributes) Check() error { func (c *CommonAttributes) Check() error {
for i, e := range c.UndefinedAttributes { for _, a := range c.UndefinedAttributes {
if err := e.Check(); err != nil { if !isValidAttribute(a) {
return fmt.Errorf("extension attribute %v of common attributes: %v", i, err) return fmt.Errorf("attribute %v of undefined attributes of common attributes not correctly formatted", a)
} }
} }

26
extensionAttribute.go
View File

@ -1,26 +0,0 @@
package atom
import (
"errors"
"fmt"
)
type ExtensionAttribute struct {
Attr string `xml:",attr"`
}
// NewExtensionAttribute creates a new ExtensionAttribute. It returns a
// *ExtensionAttribute.
func NewExtensionAttribute(name, value string) *ExtensionAttribute {
return &ExtensionAttribute{Attr: fmt.Sprint(name, `="`, value, `"`)}
}
// Check checks the ExtensionAttribute for incompatibilities with RFC4287. It
// returns an error.
func (e *ExtensionAttribute) Check() error {
if e.Attr == "" {
return errors.New("value element of extension attribute empty")
}
return nil
}