Merge pull request #24 from flecno/acl

Add support for ACL on objects

Author: ghedamat

README.md

@@ -78,6 +78,12 @@ A file matching this pattern will be uploaded to S3. The active key in S3 will b
 
 *Default:* `'index.html'`
 
+### acl
+
+The ACL to apply to the objects.
+
+*Default:* `'public-read'`
+
 ### distDir
 
 The root directory where the file matching `filePattern` will be searched for. By default, this option will use the `distDir` property of the deployment context.

index.js

@@ -16,6 +16,7 @@ module.exports = {
         region: 'us-east-1',
         filePattern: 'index.html',
         prefix: '',
+        acl: 'public-read',
         distDir: function(context) {
           return context.distDir;
         },
@@ -33,6 +34,7 @@ module.exports = {
       upload: function(context) {
         var bucket         = this.readConfig('bucket');
         var prefix         = this.readConfig('prefix');
+        var acl            = this.readConfig('acl');
         var revisionKey    = this.readConfig('revisionKey');
         var distDir        = this.readConfig('distDir');
         var filePattern    = this.readConfig('filePattern');
@@ -42,6 +44,7 @@ module.exports = {
         var options = {
           bucket: bucket,
           prefix: prefix,
+          acl: acl,
           filePattern: filePattern,
           filePath: filePath,
           revisionKey: revisionKey,

lib/s3.js

@@ -34,7 +34,7 @@ module.exports = CoreObject.extend({
     var client         = this._client;
     var plugin         = this._plugin;
     var bucket         = options.bucket;
-    var acl            = options.acl || 'public-read';
+    var acl            = options.acl;
     var allowOverwrite = options.allowOverwrite;
     var key            = path.join(options.prefix, options.filePattern + ":" + options.revisionKey);
     var putObject      = Promise.denodeify(client.putObject.bind(client));

tests/unit/lib/s3-nodetest.js

@@ -72,6 +72,7 @@ describe('s3', function() {
       options = {
         bucket: bucket,
         prefix: '',
+        acl: 'public-read',
         filePattern: filePattern,
         revisionKey: revisionKey,
         filePath: 'tests/unit/fixtures/test.html',