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

Use built-in xml attributes

Browse Source
This commit is contained in:
Jason Streifling 2024-10-17 21:44:19 +02:00
parent 42416d13e7
commit 9445a7c4cd
2 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
commonAttributes.go
View File

@ -1,11 +1,13 @@
package atom package atom
import "fmt" import (
"encoding/xml"
)
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:",attr"` UndefinedAttributes []*xml.Attr `xml:",attr,omitempty"`
} }
// NewCommonAttributes creates a new set of CommonAttributes. It returns a // NewCommonAttributes creates a new set of CommonAttributes. It returns a
@ -15,23 +17,11 @@ 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([]*xml.Attr, 1)
c.UndefinedAttributes[0] = e c.UndefinedAttributes[0] = &xml.Attr{Name: xml.Name{Local: name}, Value: value}
} else { } else {
c.UndefinedAttributes = append(c.UndefinedAttributes, e) c.UndefinedAttributes = append(c.UndefinedAttributes, &xml.Attr{Name: xml.Name{Local: name}, Value: value})
} }
} }
// Check checks the CommonAttributes for incompatibilities with RFC4287. It
// returns an error.
func (c *CommonAttributes) Check() error {
for i, a := range c.UndefinedAttributes {
if err := a.Check(); err != nil {
return fmt.Errorf("extension attribute %v of common attributes: %v", i, err)
}
}
return nil
}

27
extensionAttribute.go
View File

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