Merge pull request #46 from elidupuis/detect-mimetype

Add mimetype detection based on `filePattern`/`filePath`

Author: LevelbossMike

lib/s3.js

@@ -4,6 +4,7 @@ var Promise    = require('ember-cli/lib/ext/promise');
 var fs         = require('fs');
 var path       = require('path');
 var readFile   = Promise.denodeify(fs.readFile);
+var mime       = require('mime-types');
 
 function headObject(client, params) {
   return new Promise(function(resolve, reject) {
@@ -47,7 +48,7 @@ module.exports = CoreObject.extend({
       Bucket: bucket,
       Key: key,
       ACL: acl,
-      ContentType: 'text/html',
+      ContentType: mime.lookup(options.filePath) || 'text/html',
       CacheControl: 'max-age=0, no-cache'
     }
 

package.json

@@ -51,7 +51,8 @@
     "aws-sdk": "^2.1.48",
     "core-object": "^1.1.0",
     "ember-cli-babel": "^5.1.3",
-    "ember-cli-deploy-plugin": "^0.2.1"
+    "ember-cli-deploy-plugin": "^0.2.1",
+    "mime-types": "^2.1.9"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

tests/unit/fixtures/test.tar

@@ -124,6 +124,19 @@ describe('s3', function() {
         });
     });
 
+    it('detects `filePattern` other than `index.html` in order to customize ContentType', function() {
+      var filePath = 'tests/unit/fixtures/test.tar';
+
+      options.filePath = filePath;
+      var promise = subject.upload(options);
+
+      return assert.isFulfilled(promise)
+        .then(function() {
+          var expectedContentType = 'application/x-tar';
+          assert.equal(s3Params.ContentType, expectedContentType, 'contentType is set to `application/x-tar');
+        });
+    });
+
     it('allows `prefix` option to be passed to customize upload-path', function() {
       var prefix = 'my-app';