Added gob Marshal/Unmarshal for IRI/ID type

Changes

2 changed files (+88/-15)

• iri.go
  • @@ -1,6 +1,8 @@
    package activitypub import ( + "bytes" + "encoding/gob" "fmt" "net/url" "path"
  • @@ -67,35 +69,42 @@ func (i IRI) MarshalJSON() ([]byte, error) {
    return b, nil } - /* // UnmarshalBinary implements the encoding.BinaryUnmarshaler interface. func (i *IRI) UnmarshalBinary(data []byte) error { - return errors.New(fmt.Sprintf("UnmarshalBinary is not implemented for %T", *i)) + return i.GobDecode(data) } // MarshalBinary implements the encoding.BinaryMarshaler interface. func (i IRI) MarshalBinary() ([]byte, error) { - if len(i) == 0 { - return nil, nil - } - w := &bytes.Buffer{} - enc := gobEncoder{ w: w, enc: gob.NewEncoder(w) } - if err := enc.writeS(i.String()); err != nil { - return nil, err - } - return w.Bytes(), nil + return i.GobEncode() } // GobEncode func (i IRI) GobEncode() ([]byte, error) { - return i.MarshalBinary() + if len(i) == 0 { + return []byte{}, nil + } + b := bytes.Buffer{} + gg := gob.NewEncoder(&b) + if err := encodeGobStringLikeType(gg, []byte(i)); err != nil { + return nil, err + } + return b.Bytes(), nil } // GobDecode - func (i *IRI) GobDecode([]byte) error { - return errors.New(fmt.Sprintf("GobDecode is not implemented for %T", *i)) + func (i *IRI) GobDecode(data []byte) error { + if len(data) == 0 { + // NOTE(marius): this behaviour diverges from vanilla gob package + return nil + } + var bb string + if err := gob.NewDecoder(bytes.NewReader(data)).Decode(&bb); err != nil { + return err + } + *i = IRI(bb) + return nil } - */ // AddPath concatenates el elements as a path to i func (i IRI) AddPath(el ...string) IRI {
• iri_test.go
  • @@ -3,6 +3,7 @@ package activitypub
    import ( "errors" "fmt" + "reflect" "testing" )
  • @@ -314,3 +315,66 @@ func TestIRI_AddPath(t *testing.T) {
    func TestIRI_ItemMatches(t *testing.T) { t.Skip("TODO") } + + func TestIRI_GobDecode(t *testing.T) { + tests := []struct { + name string + i IRI + data []byte + wantErr bool + }{ + { + name: "empty", + i: "", + data: []byte{}, + wantErr: false, + }, + { + name: "some iri", + i: "https://example.com", + data: gobValue("https://example.com"), + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if err := tt.i.GobDecode(tt.data); (err != nil) != tt.wantErr { + t.Errorf("GobDecode() error = %v, wantErr %v", err, tt.wantErr) + } + }) + } + } + + func TestIRI_GobEncode(t *testing.T) { + tests := []struct { + name string + i IRI + want []byte + wantErr bool + }{ + { + name: "empty", + i: "", + want: []byte{}, + wantErr: false, + }, + { + name: "some iri", + i: "https://example.com", + want: gobValue([]byte("https://example.com")), + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := tt.i.GobEncode() + if (err != nil) != tt.wantErr { + t.Errorf("GobEncode() error = %v, wantErr %v", err, tt.wantErr) + return + } + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("GobEncode() got = %v, want %v", got, tt.want) + } + }) + } + }