Support for working with a gzip plugin.

If the deployment context has a gzippedFiles list, then gzipped files will be uploaded with a ContentEncoding param equal to 'gzip'.

Author: lukemelia

index.js

@@ -3,7 +3,6 @@
 
 var Promise   = require('ember-cli/lib/ext/promise');
 var minimatch = require('minimatch');
-var path      = require('path');
 
 var chalk  = require('chalk');
 var blue   = chalk.blue;
@@ -60,6 +59,7 @@ module.exports = {
         var filePattern   = config.filePattern;
         var distDir       = context.distDir;
         var distFiles     = context.distFiles || [];
+        var gzippedFiles  = context.gzippedFiles || []; // e.g. from ember-cli-deploy-gzip
         var filesToUpload = distFiles.filter(minimatch.filter(filePattern, { matchBase: true }));
 
         var s3 = context.s3Client || new S3({
@@ -69,8 +69,9 @@ module.exports = {
         });
 
         var options = {
-          cwd: context.distDir,
+          cwd: distDir,
           filePaths: filesToUpload,
+          gzippedFilePaths: gzippedFiles,
           prefix: config.prefix,
           bucket: config.bucket
         };

lib/s3.js

@@ -30,14 +30,15 @@ module.exports = CoreObject.extend({
   upload: function(options) {
     options = options || {};
 
-    var ui           = this._ui;
-    var cwd          = options.cwd;
-    var bucket       = options.bucket;
-    var prefix       = options.prefix;
-    var acl          = options.acl || 'public-read';
-    var filePaths    = options.filePaths || [];
-    var cacheControl = 'max-age='+TWO_YEAR_CACHE_PERIOD_IN_SEC+', public';
-    var expires      = EXPIRE_IN_2030;
+    var ui               = this._ui;
+    var cwd              = options.cwd;
+    var bucket           = options.bucket;
+    var prefix           = options.prefix;
+    var acl              = options.acl || 'public-read';
+    var filePaths        = options.filePaths || [];
+    var gzippedFilePaths = options.gzippedFilePaths || [];
+    var cacheControl     = 'max-age='+TWO_YEAR_CACHE_PERIOD_IN_SEC+', public';
+    var expires          = EXPIRE_IN_2030;
 
     if (typeof filePaths === 'string') {
       filePaths = [filePaths];
@@ -48,6 +49,7 @@ module.exports = CoreObject.extend({
       var data        = fs.readFileSync(basePath);
       var contentType = mime.lookup(basePath);
       var key         = path.join(prefix, filePath);
+      var isGzipped   = gzippedFilePaths.indexOf(filePath) !== -1;
 
       var params = {
         Bucket: bucket,
@@ -58,6 +60,9 @@ module.exports = CoreObject.extend({
         CacheControl: cacheControl,
         Expires: expires
       };
+      if (isGzipped) {
+        params.ContentEncoding = 'gzip';
+      }
 
       return new Promise(function(resolve, reject) {
         this._client.putObject(params, function(error, data) {

tests/unit/index-nodetest.js

@@ -149,5 +149,33 @@ describe('s3 plugin', function() {
           assert.match(mockUi.messages[1], /- something bad went wrong/);
         });
     });
+
+    it('sets the appropriate header if the file is inclued in gzippedFiles list', function(done) {
+      var plugin = subject.createDeployPlugin({
+        name: 's3'
+      });
+
+      context.gzippedFiles = ['app.css'];
+      var assertionCount = 0;
+      context.client = {
+        putObject: function(params, cb) {
+          if (params.Key === 'app.css') {
+            assert.equal(params.ContentEncoding, 'gzip');
+            assertionCount++;
+          } else {
+            assert.isUndefined(params.ContentEncoding);
+            assertionCount++;
+          }
+          cb();
+        }
+      };
+
+      return assert.isFulfilled(plugin.upload.call(plugin, context)).then(function(){
+        assert.equal(assertionCount, 2);
+        done();
+      }).catch(function(reason){
+        done(reason.actual.stack);
+      });
+    });
   });
 });