Added gob Marshal/Unmarshal for MimeType type

Changes

2 changed files (+94/-12)

• object.go
  • @@ -1,6 +1,8 @@
    package activitypub import ( + "bytes" + "encoding/gob" "fmt" "reflect" "strings"
  • @@ -374,25 +376,42 @@ func (m MimeType) MarshalJSON() ([]byte, error) {
    return b, nil } - /* + // GobEncode + func (m MimeType) GobEncode() ([]byte, error) { + if len(m) == 0 { + return []byte{}, nil + } + b := bytes.Buffer{} + gg := gob.NewEncoder(&b) + if err := encodeGobStringLikeType(gg, []byte(m)); err != nil { + return nil, err + } + return b.Bytes(), nil + } + + // GobDecode + func (m *MimeType) 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 + } + *m = MimeType(bb) + return nil + } + // UnmarshalBinary implements the encoding.BinaryUnmarshaler interface. func (m *MimeType) UnmarshalBinary(data []byte) error { - return errors.New(fmt.Sprintf("UnmarshalBinary is not implemented for %T", *m)) + return m.GobDecode(data) } // MarshalBinary implements the encoding.BinaryMarshaler interface. func (m MimeType) MarshalBinary() ([]byte, error) { - return nil, errors.New(fmt.Sprintf("MarshalBinary is not implemented for %T", m)) - } - - // GobEncode - func (m MimeType) GobEncode() ([]byte, error) { - if len(m) == 0 { - return nil, nil - } - return nil, errors.New(fmt.Sprintf("GobEncode is not implemented for %T", m)) + return m.GobEncode() } - */ // ToLink returns a Link pointer to the data in the current Item func ToLink(it Item) (*Link, error) {
• object_test.go
  • @@ -361,6 +361,69 @@ func TestMimeType_UnmarshalJSON(t *testing.T) {
    } } + func TestMimeType_GobDecode(t *testing.T) { + tests := []struct { + name string + m MimeType + data []byte + wantErr bool + }{ + { + name: "empty", + m: "", + data: []byte{}, + wantErr: false, + }, + { + name: "some mime-type", + m: "application/json", + data: gobValue("application/json"), + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if err := tt.m.GobDecode(tt.data); (err != nil) != tt.wantErr { + t.Errorf("GobDecode() error = %v, wantErr %v", err, tt.wantErr) + } + }) + } + } + + func TestMimeType_GobEncode(t *testing.T) { + tests := []struct { + name string + m MimeType + want []byte + wantErr bool + }{ + { + name: "empty", + m: "", + want: []byte{}, + wantErr: false, + }, + { + name: "some mime-type", + m: "application/json", + want: gobValue([]byte("application/json")), + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := tt.m.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) + } + }) + } + } + func TestLangRefValue_String(t *testing.T) { t.Skipf("TODO") }