Merge pull request #11 from strange-studios/add-encoding-to-content-type

Add content encoding to ContentType for text files

Author: lukemelia

lib/s3.js

@@ -80,9 +80,15 @@ module.exports = CoreObject.extend({
       var basePath    = path.join(cwd, filePath);
       var data        = fs.readFileSync(basePath);
       var contentType = mime.lookup(basePath);
+      var encoding    = mime.charsets.lookup(contentType);
       var key         = path.join(prefix, filePath);
       var isGzipped   = gzippedFilePaths.indexOf(filePath) !== -1;
 
+      if (encoding) {
+        contentType += '; charset=';
+        contentType += encoding.toLowerCase();
+      }
+
       var params = {
         Bucket: bucket,
         ACL: acl,

tests/fixtures/dist/app.css

@@ -0,0 +1 @@
+body: {}

tests/unit/lib/s3-nodetest.js

@@ -93,7 +93,7 @@ describe('s3', function() {
         };
 
         var options = {
-          filePaths: ['app.js'],
+          filePaths: ['app.css'],
           cwd: process.cwd() + '/tests/fixtures/dist',
           prefix: 'js-app',
           bucket: 'some-bucket'
@@ -105,9 +105,9 @@ describe('s3', function() {
           .then(function() {
             assert.equal(s3Params.Bucket, 'some-bucket');
             assert.equal(s3Params.ACL, 'public-read');
-            assert.equal(s3Params.Body.toString(), 'some content here\n');
-            assert.equal(s3Params.ContentType, 'application/javascript');
-            assert.equal(s3Params.Key, 'js-app/app.js');
+            assert.equal(s3Params.Body.toString(), 'body: {}\n');
+            assert.equal(s3Params.ContentType, 'text/css; charset=utf-8');
+            assert.equal(s3Params.Key, 'js-app/app.css');
             assert.equal(s3Params.CacheControl, 'max-age=63072000, public');
             assert.deepEqual(s3Params.Expires, new Date('2030'));
           });