asset_sync 2.14.2 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56414f299dce966e768266fd6a06f73896a95fbd7747be08bf94481dcd25f6ce
-  data.tar.gz: 906057c77eca271b2042aa174de7644c235f58cbd36db95dbec6eae17180f3d0
+  metadata.gz: a42f7c7165955b9d333a17c2c734948699b76dfdc1682c37f3188af87896d72d
+  data.tar.gz: 7b0cec36a35ace13ceac1aa6e1681c608b3a4ef688ba8870d1d32e9c7d8160b1
 SHA512:
-  metadata.gz: f45ce18cf34f17ab8fb9fcfffe2ab9746fe8642fe02b779d8ed53b94f8ba884e23fae6c2180ee2b5478d756c5dd3510ae12b4055a4bd8a46e2447fee0f9e6d38
-  data.tar.gz: 37b916a3e8531351719b209c58660a7e26438689ea5bc8c0ca059af83c879b764ec7333c4a9612db629a89ee381796535ee53a71af8dea0c2cbfdaa3c83c77dc
+  metadata.gz: 2d6ff1f9c5b9c9fa8dd53ee0000d00d42d9746801e9c5dd10400b8c18ae177c2dfd9f5f749bae52553c79550e71c5940771a069bfbe807af437744a61fc6fe72
+  data.tar.gz: 565480826f1820bbb8b4438886fa92d6f49369209ddbb0981f5cdb948b03d73ee5bbb4803febef56907d279a434cc819f2877804a7e5135ad28beb412c6a91ac

data/CHANGELOG.md

@@ -18,8 +18,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Nothing
 
 
-=======
-## [2.14.2]
+## [2.15.0] - 2021-08-05
+
+### Added
+
+- Add support for option `aws_acl`
+  (https://github.com/AssetSync/asset_sync/pull/420)
+
+
+## [2.14.2] - 2021-05-31
 
 ### Added
 
@@ -27,8 +34,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   (https://github.com/AssetSync/asset_sync/pull/419)
 
 
-=======
-## [2.14.1]
+## [2.14.1] - 2021-05-14
 
 ### Added
 
@@ -1020,7 +1026,8 @@ Changes:
     * Merge branch 'sinatra'
 
 
-[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.14.2...HEAD
+[Unreleased]: https://github.com/AssetSync/asset_sync/compare/v2.15.0...HEAD
+[2.15.0]: https://github.com/AssetSync/asset_sync/compare/v2.14.2...v2.15.0
 [2.14.2]: https://github.com/AssetSync/asset_sync/compare/v2.14.1...v2.14.2
 [2.14.1]: https://github.com/AssetSync/asset_sync/compare/v2.14.0...v2.14.1
 [2.14.0]: https://github.com/AssetSync/asset_sync/compare/v2.13.1...v2.14.0

data/README.md

@@ -239,6 +239,11 @@ AssetSync.configure do |config|
   # Change AWS signature version. Default is 4
   # config.aws_signature_version = 4
   #
+  # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+  # Choose from: private | public-read | public-read-write | aws-exec-read |
+  #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+  # config.aws_acl = nil 
+  #
   # Change host option in fog (only if you need to)
   # config.fog_host = 's3.amazonaws.com'
   #
@@ -309,6 +314,11 @@ defaults: &defaults
   # Change AWS signature version. Default is 4
   # aws_signature_version: 4
   #
+  # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+  # Choose from: private | public-read | public-read-write | aws-exec-read |
+  #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+  # aws_acl: null
+  #
   # Change host option in fog (only if you need to)
   # fog_host: "s3.amazonaws.com"
   #
@@ -420,6 +430,7 @@ The blocks are run when local files are being scanned and uploaded
 
 * **aws\_access\_key\_id**: your Amazon S3 access key
 * **aws\_secret\_access\_key**: your Amazon S3 access secret
+* **aws\_acl**: set [canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#canned-acl) of uploaded object, will override fog_public if set
 
 #### Rackspace
 

data/lib/asset_sync/config.rb

@@ -37,7 +37,15 @@ module AssetSync
     attr_reader   :fog_public            # e.g. true, false, "default"
 
     # Amazon AWS
-    attr_accessor :aws_access_key_id, :aws_secret_access_key, :aws_session_token, :aws_reduced_redundancy, :aws_iam_roles, :aws_signature_version
+    attr_accessor :aws_access_key_id
+    attr_accessor :aws_secret_access_key
+    attr_accessor :aws_session_token
+    attr_accessor :aws_reduced_redundancy
+    attr_accessor :aws_iam_roles
+    attr_accessor :aws_signature_version
+    attr_accessor :aws_acl
+
+    # Fog
     attr_accessor :fog_host              # e.g. 's3.amazonaws.com'
     attr_accessor :fog_port              # e.g. '9000'
     attr_accessor :fog_path_style        # e.g. true
@@ -221,6 +229,7 @@ module AssetSync
       self.aws_reduced_redundancy = yml["aws_reduced_redundancy"]
       self.aws_iam_roles          = yml["aws_iam_roles"]
       self.aws_signature_version  = yml["aws_signature_version"]
+      self.aws_acl                = yml["aws_acl"]
       self.rackspace_username     = yml["rackspace_username"]
       self.rackspace_auth_url     = yml["rackspace_auth_url"] if yml.has_key?("rackspace_auth_url")
       self.rackspace_api_key      = yml["rackspace_api_key"]

data/lib/asset_sync/engine.rb

@@ -25,6 +25,7 @@ module AssetSync
           config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('AWS_SECRET_ACCESS_KEY')
           config.aws_session_token = ENV['AWS_SESSION_TOKEN'] if ENV.has_key?('AWS_SESSION_TOKEN')
           config.aws_signature_version = ENV['AWS_SIGNATURE_VERSION'] if ENV.has_key?('AWS_SIGNATURE_VERSION')
+          config.aws_acl = ENV['AWS_ACL'] if ENV.has_key?('AWS_ACL')
           config.aws_reduced_redundancy = ENV['AWS_REDUCED_REDUNDANCY'] == true  if ENV.has_key?('AWS_REDUCED_REDUNDANCY')
 
           config.rackspace_username = ENV['RACKSPACE_USERNAME'] if ENV.has_key?('RACKSPACE_USERNAME')

data/lib/asset_sync/storage.rb

@@ -195,7 +195,9 @@ module AssetSync
 
       # region fog_public
 
-      if config.fog_public.use_explicit_value?
+      if config.aws? && config.aws_acl
+        file[:acl] = config.aws_acl
+      elsif config.fog_public.use_explicit_value?
         file[:public] = config.fog_public.to_bool
       end
 

data/lib/asset_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AssetSync
-  VERSION = "2.14.2"
+  VERSION = "2.15.0"
 end

data/lib/generators/asset_sync/templates/asset_sync.rb

@@ -11,6 +11,11 @@ if defined?(AssetSync)
     # Change AWS signature version. Default is 4
     # config.aws_signature_version = 4
     #
+    # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+    # Choose from: private | public-read | public-read-write | aws-exec-read |
+    #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+    # config.aws_acl = nil 
+    #
     # Change host option in fog (only if you need to)
     # config.fog_host = "s3.amazonaws.com"
     #

data/lib/generators/asset_sync/templates/asset_sync.yml

@@ -10,6 +10,11 @@ defaults: &defaults
   # Change AWS signature version. Default is 4
   # aws_signature_version: 4
   #
+  # Change canned ACL of uploaded object. Default is unset. Will override fog_public if set.
+  # Choose from: private | public-read | public-read-write | aws-exec-read |
+  #              authenticated-read | bucket-owner-read | bucket-owner-full-control 
+  # aws_acl: null
+  #
   # Change host option in fog (only if you need to)
   # fog_host: "s3.amazonaws.com"
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset_sync
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.15.0
 platform: ruby
 authors:
 - Simon Hamilton
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.25
 signing_key:
 specification_version: 4
 summary: Synchronises Assets in a Rails 3 application and Amazon S3/Cloudfront and