Merge lp:~scalia/goamz/add-content-encoding into lp:goamz

[Antonio Nicolás Pina]

Added a method to indicate the content-encoding of a file in S3.

[lp:~scalia/goamz/add-content-encoding]

49. By Antonio Nicolás Pina <email address hidden> on 2014-06-11

Added test for the new function.

[Dimiter Naydenov (dimitern)]

@scalia can you re-propose this against http://github.com/go-amz/amz ?

Unmerged revisions

49. By Antonio Nicolás Pina <email address hidden> on 2014-06-11

Added test for the new function.

48. By Antonio Nicolás Pina <email address hidden> on 2014-06-11

Added a method to indicate the content-encoding of a file in S3.

=== modified file 's3/s3.go'
--- s3/s3.go	2014-02-12 13:42:33 +0000
+++ s3/s3.go	2014-06-11 10:23:55 +0000
@@ -191,10 +191,19 @@
 // PutReader inserts an object into the S3 bucket by consuming data
 // from r until EOF.
 func (b *Bucket) PutReader(path string, r io.Reader, length int64, contType string, perm ACL) error {
+	return b.PutReaderEncoding(path, r, length, contType, perm, "")
+}
+
+// PutReaderEncoding inserts an object into the S3 bucket by consuming data
+// from r until EOF with a Content-Encoding header.
+func (b *Bucket) PutReaderEncoding(path string, r io.Reader, length int64, contType string, perm ACL, contEncoding string) error {
 	headers := map[string][]string{
-		"Content-Length": {strconv.FormatInt(length, 10)},
-		"Content-Type":   {contType},
-		"x-amz-acl":      {string(perm)},
+		"Content-Length":   {strconv.FormatInt(length, 10)},
+		"Content-Type":     {contType},
+		"x-amz-acl":        {string(perm)},
+	}
+	if "" != contEncoding {
+		headers["Content-Encoding"] = []string{contEncoding}
 	}
 	req := &request{
 		method:  "PUT",

=== modified file 's3/s3_test.go'
--- s3/s3_test.go	2013-08-15 13:18:02 +0000
+++ s3/s3_test.go	2014-06-11 10:23:55 +0000
@@ -191,6 +191,25 @@
 	c.Assert(req.Header["X-Amz-Acl"], DeepEquals, []string{"private"})
 }
 
+func (s *S) TestPutReaderEncoding(c *C) {
+	testServer.Response(200, nil, "")
+
+	b := s.s3.Bucket("bucket")
+	buf := bytes.NewBufferString("content")
+	err := b.PutReaderEncoding("name", buf, int64(buf.Len()), "content-type", s3.Private, "xz")
+	c.Assert(err, IsNil)
+
+	req := testServer.WaitRequest()
+	c.Assert(req.Method, Equals, "PUT")
+	c.Assert(req.URL.Path, Equals, "/bucket/name")
+	c.Assert(req.Header["Date"], Not(DeepEquals), []string{""})
+	c.Assert(req.Header["Content-Type"], DeepEquals, []string{"content-type"})
+	c.Assert(req.Header["Content-Length"], DeepEquals, []string{"7"})
+	c.Assert(req.Header["Content-Encoding"], DeepEquals, []string{"xz"})
+	//c.Assert(req.Header["Content-MD5"], Equals, "...")
+	c.Assert(req.Header["X-Amz-Acl"], DeepEquals, []string{"private"})
+}
+
 // DelObject docs: http://goo.gl/APeTt
 
 func (s *S) TestDelObject(c *C) {