mirror of
https://github.com/wneessen/go-mail.git
synced 2024-11-22 13:50:49 +01:00
feat: remove unused content disposition
This commit is contained in:
parent
894936092e
commit
65b9fd07da
5 changed files with 0 additions and 107 deletions
13
encoding.go
13
encoding.go
|
@ -19,9 +19,6 @@ type MIMEVersion string
|
||||||
// MIMEType represents the MIME type for the mail
|
// MIMEType represents the MIME type for the mail
|
||||||
type MIMEType string
|
type MIMEType string
|
||||||
|
|
||||||
// Disposition represents a content disposition for the Msg
|
|
||||||
type Disposition string
|
|
||||||
|
|
||||||
// List of supported encodings
|
// List of supported encodings
|
||||||
const (
|
const (
|
||||||
// EncodingB64 represents the Base64 encoding as specified in RFC 2045.
|
// EncodingB64 represents the Base64 encoding as specified in RFC 2045.
|
||||||
|
@ -163,11 +160,6 @@ const (
|
||||||
MIMESMime MIMEType = `signed; protocol="application/pkcs7-signature"; micalg=sha256`
|
MIMESMime MIMEType = `signed; protocol="application/pkcs7-signature"; micalg=sha256`
|
||||||
)
|
)
|
||||||
|
|
||||||
// List of common content disposition
|
|
||||||
const (
|
|
||||||
DispositionSMime Disposition = `attachment; filename="smime.p7s"`
|
|
||||||
)
|
|
||||||
|
|
||||||
// String is a standard method to convert an Charset into a printable format
|
// String is a standard method to convert an Charset into a printable format
|
||||||
func (c Charset) String() string {
|
func (c Charset) String() string {
|
||||||
return string(c)
|
return string(c)
|
||||||
|
@ -182,8 +174,3 @@ func (c ContentType) String() string {
|
||||||
func (e Encoding) String() string {
|
func (e Encoding) String() string {
|
||||||
return string(e)
|
return string(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
// String is a standard method to convert an Disposition into a printable format
|
|
||||||
func (d Disposition) String() string {
|
|
||||||
return string(d)
|
|
||||||
}
|
|
||||||
|
|
|
@ -126,22 +126,3 @@ func TestCharset_String(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestDisposition_String tests the string method of the Disposition object
|
|
||||||
func TestDisposition_String(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
d Disposition
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"Disposition: S/Mime", DispositionSMime, `attachment; filename="smime.p7s"`},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
if tt.d.String() != tt.want {
|
|
||||||
t.Errorf("wrong string for Disposition returned. Expected: %s, got: %s",
|
|
||||||
tt.want, tt.d.String())
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -269,9 +269,6 @@ func (mw *msgWriter) writePart(part *Part, charset Charset) {
|
||||||
if part.description != "" {
|
if part.description != "" {
|
||||||
mimeHeader.Add(string(HeaderContentDescription), part.description)
|
mimeHeader.Add(string(HeaderContentDescription), part.description)
|
||||||
}
|
}
|
||||||
if part.disposition != "" {
|
|
||||||
mimeHeader.Add(string(HeaderContentDisposition), part.disposition.String())
|
|
||||||
}
|
|
||||||
mimeHeader.Add(string(HeaderContentType), contentType)
|
mimeHeader.Add(string(HeaderContentType), contentType)
|
||||||
mimeHeader.Add(string(HeaderContentTransferEnc), contentTransferEnc)
|
mimeHeader.Add(string(HeaderContentTransferEnc), contentTransferEnc)
|
||||||
mw.newPart(mimeHeader)
|
mw.newPart(mimeHeader)
|
||||||
|
|
18
part.go
18
part.go
|
@ -17,7 +17,6 @@ type Part struct {
|
||||||
contentType ContentType
|
contentType ContentType
|
||||||
charset Charset
|
charset Charset
|
||||||
description string
|
description string
|
||||||
disposition Disposition
|
|
||||||
encoding Encoding
|
encoding Encoding
|
||||||
isDeleted bool
|
isDeleted bool
|
||||||
writeFunc func(io.Writer) (int64, error)
|
writeFunc func(io.Writer) (int64, error)
|
||||||
|
@ -57,11 +56,6 @@ func (p *Part) GetDescription() string {
|
||||||
return p.description
|
return p.description
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetDisposition returns the currently set Content-Disposition of the Part
|
|
||||||
func (p *Part) GetDisposition() Disposition {
|
|
||||||
return p.disposition
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetContent overrides the content of the Part with the given string
|
// SetContent overrides the content of the Part with the given string
|
||||||
func (p *Part) SetContent(content string) {
|
func (p *Part) SetContent(content string) {
|
||||||
buffer := bytes.NewBufferString(content)
|
buffer := bytes.NewBufferString(content)
|
||||||
|
@ -88,11 +82,6 @@ func (p *Part) SetDescription(description string) {
|
||||||
p.description = description
|
p.description = description
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetDisposition overrides the Content-Disposition of the Part
|
|
||||||
func (p *Part) SetDisposition(disposition Disposition) {
|
|
||||||
p.disposition = disposition
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetWriteFunc overrides the WriteFunc of the Part
|
// SetWriteFunc overrides the WriteFunc of the Part
|
||||||
func (p *Part) SetWriteFunc(writeFunc func(io.Writer) (int64, error)) {
|
func (p *Part) SetWriteFunc(writeFunc func(io.Writer) (int64, error)) {
|
||||||
p.writeFunc = writeFunc
|
p.writeFunc = writeFunc
|
||||||
|
@ -124,10 +113,3 @@ func WithPartContentDescription(description string) PartOption {
|
||||||
p.description = description
|
p.description = description
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithContentDisposition overrides the default Part Content-Disposition
|
|
||||||
func WithContentDisposition(disposition Disposition) PartOption {
|
|
||||||
return func(p *Part) {
|
|
||||||
p.disposition = disposition
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
54
part_test.go
54
part_test.go
|
@ -102,35 +102,6 @@ func TestPart_WithPartContentDescription(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestPart_withContentDisposition tests the WithContentDisposition method
|
|
||||||
func TestPart_withContentDisposition(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
disposition Disposition
|
|
||||||
}{
|
|
||||||
{"Part disposition: test", "test"},
|
|
||||||
{"Part disposition: empty", ""},
|
|
||||||
}
|
|
||||||
for _, tt := range tests {
|
|
||||||
m := NewMsg()
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
part := m.newPart(TypeTextPlain, WithContentDisposition(tt.disposition), nil)
|
|
||||||
if part == nil {
|
|
||||||
t.Errorf("newPart() WithPartContentDescription() failed: no part returned")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if part.disposition != tt.disposition {
|
|
||||||
t.Errorf("newPart() WithContentDisposition() failed: expected: %s, got: %s", tt.disposition, part.description)
|
|
||||||
}
|
|
||||||
part.disposition = ""
|
|
||||||
part.SetDisposition(tt.disposition)
|
|
||||||
if part.disposition != tt.disposition {
|
|
||||||
t.Errorf("newPart() SetDisposition() failed: expected: %s, got: %s", tt.disposition, part.description)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TestPartContentType tests Part.SetContentType
|
// TestPartContentType tests Part.SetContentType
|
||||||
func TestPart_SetContentType(t *testing.T) {
|
func TestPart_SetContentType(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
|
@ -352,31 +323,6 @@ func TestPart_SetDescription(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestPart_SetDisposition tests Part.SetDisposition
|
|
||||||
func TestPart_SetDisposition(t *testing.T) {
|
|
||||||
c := "This is a test"
|
|
||||||
d := Disposition("test-disposition")
|
|
||||||
m := NewMsg()
|
|
||||||
m.SetBodyString(TypeTextPlain, c)
|
|
||||||
pl, err := getPartList(m)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("failed: %s", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
pd := pl[0].GetDisposition()
|
|
||||||
if pd != "" {
|
|
||||||
t.Errorf("Part.GetDisposition failed. Expected empty description but got: %s", pd)
|
|
||||||
}
|
|
||||||
pl[0].SetDisposition(d)
|
|
||||||
if pl[0].disposition != d {
|
|
||||||
t.Errorf("Part.SetDisposition failed. Expected description to be: %s, got: %s", d, pd)
|
|
||||||
}
|
|
||||||
pd = pl[0].GetDisposition()
|
|
||||||
if pd != d {
|
|
||||||
t.Errorf("Part.GetDisposition failed. Expected: %s, got: %s", d, pd)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TestPart_Delete tests Part.Delete
|
// TestPart_Delete tests Part.Delete
|
||||||
func TestPart_Delete(t *testing.T) {
|
func TestPart_Delete(t *testing.T) {
|
||||||
c := "This is a test with ümläutß"
|
c := "This is a test with ümläutß"
|
||||||
|
|
Loading…
Reference in a new issue