Defining multiple attributes list is possible

E.g. for nodes and edges at the same time
mvdan · Sep 17, 2015 · b327010 · b327010
1 parent 23fa37f
commit b327010
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/gexf.go b/gexf.go
@@ -64,9 +64,9 @@ type Graph struct {
 	IDType  IDType    `xml:"idtype,attr,omitempty"`
 	DefEdge EdgeType  `xml:"defaultedgetype,attr,omitempty"`
 
-	Attrs *Attributes `xml:"attributes,omitempty"`
-	Nodes *[]Node     `xml:"nodes>node,omitempty"`
-	Edges *[]Edge     `xml:"edges>edge,omitempty"`
+	Attrs []ClassAttrs `xml:"attributes,omitempty"`
+	Nodes *[]Node      `xml:"nodes>node,omitempty"`
+	Edges *[]Edge      `xml:"edges>edge,omitempty"`
 }
 
 type EdgeType int
@@ -156,7 +156,7 @@ func (t ClassType) MarshalText() ([]byte, error) {
 	return []byte(t.String()), nil
 }
 
-type Attributes struct {
+type ClassAttrs struct {
 	Class ClassType `xml:"class,attr"`
 	Attrs []Attr    `xml:"attribute"`
 }

diff --git a/gexf_test.go b/gexf_test.go
@@ -112,24 +112,26 @@ func TestAttributes(t *testing.T) {
 	}
 	doc.Graph = Graph{
 		DefEdge: Directed,
-		Attrs: &Attributes{
-			Class: ClassNode,
-			Attrs: []Attr{
-				{
-					ID:    "0",
-					Title: "url",
-					Type:  "string",
-				},
-				{
-					ID:    "1",
-					Title: "indegree",
-					Type:  "float",
-				},
-				{
-					ID:      "2",
-					Title:   "frog",
-					Type:    "boolean",
-					Default: "true",
+		Attrs: []ClassAttrs{
+			{
+				Class: ClassNode,
+				Attrs: []Attr{
+					{
+						ID:    "0",
+						Title: "url",
+						Type:  "string",
+					},
+					{
+						ID:    "1",
+						Title: "indegree",
+						Type:  "float",
+					},
+					{
+						ID:      "2",
+						Title:   "frog",
+						Type:    "boolean",
+						Default: "true",
+					},
 				},
 			},
 		},