From f66a69076f43617bacfe45961e229268ed15faa7 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Mon, 10 Jul 2017 16:17:48 -0400
Subject: Expose chunked downloads

---
 lib/active_storage/blob.rb                 | 4 ++--
 lib/active_storage/service/disk_service.rb | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/blob.rb b/lib/active_storage/blob.rb
index 3336c4ebc3..1a15361747 100644
--- a/lib/active_storage/blob.rb
+++ b/lib/active_storage/blob.rb
@@ -56,8 +56,8 @@ class ActiveStorage::Blob < ActiveRecord::Base
     service.upload(key, io, checksum: checksum)
   end
 
-  def download
-    service.download key
+  def download(&block)
+    service.download key, &block
   end
 
 
diff --git a/lib/active_storage/service/disk_service.rb b/lib/active_storage/service/disk_service.rb
index 87fc06c799..7e64e1e909 100644
--- a/lib/active_storage/service/disk_service.rb
+++ b/lib/active_storage/service/disk_service.rb
@@ -20,8 +20,8 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service
   def download(key)
     if block_given?
       instrument :streaming_download, key do
-        File.open(path_for(key)) do |file|
-          while data = file.binread(64.kilobytes)
+        File.open(path_for(key), 'rb') do |file|
+          while data = file.read(64.kilobytes)
             yield data
           end
         end
@@ -55,7 +55,7 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service
     instrument :url, key do |payload|
       verified_key_with_expiration = ActiveStorage::VerifiedKeyWithExpiration.encode(key, expires_in: expires_in)
 
-      generated_url = 
+      generated_url =
         if defined?(Rails) && defined?(Rails.application)
           Rails.application.routes.url_helpers.rails_disk_blob_path(verified_key_with_expiration, disposition: disposition, filename: filename)
         else
@@ -63,7 +63,7 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service
         end
 
       payload[:url] = generated_url
-      
+
       generated_url
     end
   end
-- 
cgit v1.2.3


From 6d3962461fb8d35fc9538d685fee96267663acf2 Mon Sep 17 00:00:00 2001
From: Jeremy Daer <jeremydaer@gmail.com>
Date: Tue, 11 Jul 2017 14:09:39 -0600
Subject: S3: slim down service implementation (#40)

* Use simple core API for duck-type compat with other clients
* initialize: accept an existing client
* initialize: accept arbitrary client args instead of a fixed, required set
* download: use native get_object streaming, no need to implement range requests
* exists?: use head_object (which returns immediately) rather than waiting for existence
---
 lib/active_storage/service/s3_service.rb | 60 +++++++++++++-------------------
 1 file changed, 24 insertions(+), 36 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index c3b6688bb9..ad55db0dc0 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -4,84 +4,72 @@ require "active_support/core_ext/numeric/bytes"
 class ActiveStorage::Service::S3Service < ActiveStorage::Service
   attr_reader :client, :bucket
 
-  def initialize(access_key_id:, secret_access_key:, region:, bucket:)
-    @client = Aws::S3::Resource.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
-    @bucket = @client.bucket(bucket)
+  def initialize(bucket:, client: nil, **client_options)
+    @bucket = bucket
+    @client = client || Aws::S3::Client.new(client_options)
   end
 
   def upload(key, io, checksum: nil)
     instrument :upload, key, checksum: checksum do
       begin
-        object_for(key).put(body: io, content_md5: checksum)
+        client.put_object bucket: bucket, key: key, body: io, content_md5: checksum
       rescue Aws::S3::Errors::BadDigest
         raise ActiveStorage::IntegrityError
       end
     end
   end
 
-  def download(key)
+  def download(key, &block)
     if block_given?
       instrument :streaming_download, key do
-        stream(key, &block)
+        client.get_object bucket: bucket, key: key, &block
       end
     else
       instrument :download, key do
-        object_for(key).get.body.read.force_encoding(Encoding::BINARY)
+        "".b.tap do |data|
+          client.get_object bucket: bucket, key: key, response_target: data
+        end
       end
     end
   end
 
   def delete(key)
     instrument :delete, key do
-      object_for(key).delete
+      client.delete_object bucket: bucket, key: key
     end
   end
 
   def exist?(key)
     instrument :exist, key do |payload|
-      answer = object_for(key).exists?
-      payload[:exist] = answer
-      answer
+      payload[:exist] =
+        begin
+          client.head_object bucket: bucket, key: key
+        rescue Aws::S3::Errors::NoSuckKey
+          false
+        else
+          true
+        end
     end
   end
 
   def url(key, expires_in:, disposition:, filename:)
     instrument :url, key do |payload|
-      generated_url = object_for(key).presigned_url :get, expires_in: expires_in,
+      payload[:url] = presigner.presigned_url :get_object,
+        bucket: bucket, key: key, expires_in: expires_in,
         response_content_disposition: "#{disposition}; filename=\"#{filename}\""
-      
-      payload[:url] = generated_url
-      
-      generated_url
     end
   end
 
   def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
     instrument :url, key do |payload|
-      generated_url = object_for(key).presigned_url :put, expires_in: expires_in,
+      payload[:url] = presigner.presigned_url :put_object,
+        bucket: bucket, key: key, expires_in: expires_in,
         content_type: content_type, content_length: content_length
-      
-      payload[:url] = generated_url
-      
-      generated_url
     end
   end
 
   private
-    def object_for(key)
-      bucket.object(key)
-    end
-
-    # Reads the object for the given key in chunks, yielding each to the block.
-    def stream(key, options = {}, &block)
-      object = object_for(key)
-
-      chunk_size = 5.megabytes
-      offset = 0
-
-      while offset < object.content_length
-        yield object.read(options.merge(range: "bytes=#{offset}-#{offset + chunk_size - 1}"))
-        offset += chunk_size
-      end
+    def presigner
+      @presigner ||= Aws::S3::Presigner.new client: client
     end
 end
-- 
cgit v1.2.3


From 17906fd22f5c6bbb56f10ee3221a62569fb0d5c6 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 12 Jul 2017 08:44:08 +0200
Subject: Revert "S3: slim down service implementation (#40)" (#41)

This reverts commit 6d3962461fb8d35fc9538d685fee96267663acf2.
---
 lib/active_storage/service/s3_service.rb | 60 +++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 24 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index ad55db0dc0..c3b6688bb9 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -4,72 +4,84 @@ require "active_support/core_ext/numeric/bytes"
 class ActiveStorage::Service::S3Service < ActiveStorage::Service
   attr_reader :client, :bucket
 
-  def initialize(bucket:, client: nil, **client_options)
-    @bucket = bucket
-    @client = client || Aws::S3::Client.new(client_options)
+  def initialize(access_key_id:, secret_access_key:, region:, bucket:)
+    @client = Aws::S3::Resource.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
+    @bucket = @client.bucket(bucket)
   end
 
   def upload(key, io, checksum: nil)
     instrument :upload, key, checksum: checksum do
       begin
-        client.put_object bucket: bucket, key: key, body: io, content_md5: checksum
+        object_for(key).put(body: io, content_md5: checksum)
       rescue Aws::S3::Errors::BadDigest
         raise ActiveStorage::IntegrityError
       end
     end
   end
 
-  def download(key, &block)
+  def download(key)
     if block_given?
       instrument :streaming_download, key do
-        client.get_object bucket: bucket, key: key, &block
+        stream(key, &block)
       end
     else
       instrument :download, key do
-        "".b.tap do |data|
-          client.get_object bucket: bucket, key: key, response_target: data
-        end
+        object_for(key).get.body.read.force_encoding(Encoding::BINARY)
       end
     end
   end
 
   def delete(key)
     instrument :delete, key do
-      client.delete_object bucket: bucket, key: key
+      object_for(key).delete
     end
   end
 
   def exist?(key)
     instrument :exist, key do |payload|
-      payload[:exist] =
-        begin
-          client.head_object bucket: bucket, key: key
-        rescue Aws::S3::Errors::NoSuckKey
-          false
-        else
-          true
-        end
+      answer = object_for(key).exists?
+      payload[:exist] = answer
+      answer
     end
   end
 
   def url(key, expires_in:, disposition:, filename:)
     instrument :url, key do |payload|
-      payload[:url] = presigner.presigned_url :get_object,
-        bucket: bucket, key: key, expires_in: expires_in,
+      generated_url = object_for(key).presigned_url :get, expires_in: expires_in,
         response_content_disposition: "#{disposition}; filename=\"#{filename}\""
+      
+      payload[:url] = generated_url
+      
+      generated_url
     end
   end
 
   def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
     instrument :url, key do |payload|
-      payload[:url] = presigner.presigned_url :put_object,
-        bucket: bucket, key: key, expires_in: expires_in,
+      generated_url = object_for(key).presigned_url :put, expires_in: expires_in,
         content_type: content_type, content_length: content_length
+      
+      payload[:url] = generated_url
+      
+      generated_url
     end
   end
 
   private
-    def presigner
-      @presigner ||= Aws::S3::Presigner.new client: client
+    def object_for(key)
+      bucket.object(key)
+    end
+
+    # Reads the object for the given key in chunks, yielding each to the block.
+    def stream(key, options = {}, &block)
+      object = object_for(key)
+
+      chunk_size = 5.megabytes
+      offset = 0
+
+      while offset < object.content_length
+        yield object.read(options.merge(range: "bytes=#{offset}-#{offset + chunk_size - 1}"))
+        offset += chunk_size
+      end
     end
 end
-- 
cgit v1.2.3


From afb7047e52dd6dae160b60b74a0c7efaf536933c Mon Sep 17 00:00:00 2001
From: Chris Smith <quartzmo@gmail.com>
Date: Wed, 12 Jul 2017 10:01:12 -0600
Subject: Update GCSService#url

Update google-cloud-storage dependency to 1.3
Refactor arguments to Google::Cloud::Storage::File#signed_url
---
 lib/active_storage/service/gcs_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
index bca4ab5331..0bcd29cab8 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/lib/active_storage/service/gcs_service.rb
@@ -44,8 +44,8 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
 
   def url(key, expires_in:, disposition:, filename:)
     instrument :url, key do |payload|
-      generated_url = file_for(key).signed_url(expires: expires_in) + "&" +
-        { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }.to_query
+      query = { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }
+      generated_url = file_for(key).signed_url(expires: expires_in, query: query)
       
       payload[:url] = generated_url
       
-- 
cgit v1.2.3


From 2a738b31c538c0627a46504733fca3c914e1724e Mon Sep 17 00:00:00 2001
From: dixpac <dino.onex@gmail.com>
Date: Thu, 13 Jul 2017 20:39:02 +0200
Subject: Remove few ivars from gcs_service implementation

---
 lib/active_storage/service/gcs_service.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
index 0bcd29cab8..1addda6733 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/lib/active_storage/service/gcs_service.rb
@@ -36,20 +36,14 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
 
   def exist?(key)
     instrument :exist, key do |payload|
-      answer = file_for(key).present?
-      payload[:exist] = answer
-      answer
+      payload[:exist] = file_for(key).present?
     end
   end
 
   def url(key, expires_in:, disposition:, filename:)
     instrument :url, key do |payload|
       query = { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }
-      generated_url = file_for(key).signed_url(expires: expires_in, query: query)
-      
-      payload[:url] = generated_url
-      
-      generated_url
+      payload[:url] = file_for(key).signed_url(expires: expires_in, query: query)
     end
   end
 
-- 
cgit v1.2.3


From 6dcdc5c9abb8e4e93a2c582b11ff4bb77d62ed3b Mon Sep 17 00:00:00 2001
From: Cristian Bica <cristian.bica@gmail.com>
Date: Fri, 14 Jul 2017 01:09:56 +0300
Subject: Added rubocop / codeclimate config and fixed current offenses (#45)

---
 lib/active_storage/disk_controller.rb              | 2 +-
 lib/active_storage/download.rb                     | 6 +++---
 lib/active_storage/service.rb                      | 2 +-
 lib/active_storage/service/disk_service.rb         | 2 +-
 lib/active_storage/service/s3_service.rb           | 8 ++++----
 lib/active_storage/verified_key_with_expiration.rb | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/disk_controller.rb b/lib/active_storage/disk_controller.rb
index 7149cc17a6..16a295d00d 100644
--- a/lib/active_storage/disk_controller.rb
+++ b/lib/active_storage/disk_controller.rb
@@ -33,6 +33,6 @@ class ActiveStorage::DiskController < ActionController::Base
     end
 
     def disposition_param
-      params[:disposition].presence_in(%w( inline attachment )) || 'inline'
+      params[:disposition].presence_in(%w( inline attachment )) || "inline"
     end
 end
diff --git a/lib/active_storage/download.rb b/lib/active_storage/download.rb
index 4d656942d8..6040a32de9 100644
--- a/lib/active_storage/download.rb
+++ b/lib/active_storage/download.rb
@@ -14,7 +14,7 @@ class ActiveStorage::Download
     application/xhtml+xml
   )
 
-  BINARY_CONTENT_TYPE = 'application/octet-stream'
+  BINARY_CONTENT_TYPE = "application/octet-stream"
 
   def initialize(stored_file)
     @stored_file = stored_file
@@ -22,11 +22,11 @@ class ActiveStorage::Download
 
   def headers(force_attachment: false)
     {
-      x_accel_redirect:    '/reproxy',
+      x_accel_redirect:    "/reproxy",
       x_reproxy_url:       reproxy_url,
       content_type:        content_type,
       content_disposition: content_disposition(force_attachment),
-      x_frame_options:     'SAMEORIGIN'
+      x_frame_options:     "SAMEORIGIN"
     }
   end
 
diff --git a/lib/active_storage/service.rb b/lib/active_storage/service.rb
index d0d4362006..cba9cd9c83 100644
--- a/lib/active_storage/service.rb
+++ b/lib/active_storage/service.rb
@@ -85,7 +85,7 @@ class ActiveStorage::Service
   private
     def instrument(operation, key, payload = {}, &block)
       ActiveSupport::Notifications.instrument(
-        "service_#{operation}.active_storage", 
+        "service_#{operation}.active_storage",
         payload.merge(key: key, service: service_name), &block)
     end
 
diff --git a/lib/active_storage/service/disk_service.rb b/lib/active_storage/service/disk_service.rb
index 7e64e1e909..a2a27528c1 100644
--- a/lib/active_storage/service/disk_service.rb
+++ b/lib/active_storage/service/disk_service.rb
@@ -20,7 +20,7 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service
   def download(key)
     if block_given?
       instrument :streaming_download, key do
-        File.open(path_for(key), 'rb') do |file|
+        File.open(path_for(key), "rb") do |file|
           while data = file.read(64.kilobytes)
             yield data
           end
diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index c3b6688bb9..e75ac36c7d 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -49,9 +49,9 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service
     instrument :url, key do |payload|
       generated_url = object_for(key).presigned_url :get, expires_in: expires_in,
         response_content_disposition: "#{disposition}; filename=\"#{filename}\""
-      
+
       payload[:url] = generated_url
-      
+
       generated_url
     end
   end
@@ -60,9 +60,9 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service
     instrument :url, key do |payload|
       generated_url = object_for(key).presigned_url :put, expires_in: expires_in,
         content_type: content_type, content_length: content_length
-      
+
       payload[:url] = generated_url
-      
+
       generated_url
     end
   end
diff --git a/lib/active_storage/verified_key_with_expiration.rb b/lib/active_storage/verified_key_with_expiration.rb
index 8708106735..e429ee21ce 100644
--- a/lib/active_storage/verified_key_with_expiration.rb
+++ b/lib/active_storage/verified_key_with_expiration.rb
@@ -1,5 +1,5 @@
 class ActiveStorage::VerifiedKeyWithExpiration
-  class_attribute :verifier, default: defined?(Rails) ? Rails.application.message_verifier('ActiveStorage') : nil
+  class_attribute :verifier, default: defined?(Rails) ? Rails.application.message_verifier("ActiveStorage") : nil
 
   class << self
     def encode(key, expires_in: nil)
-- 
cgit v1.2.3


From c49c56b46986c4a1b0701f9f4e16fe60222cf0fc Mon Sep 17 00:00:00 2001
From: dixpac <dino.onex@gmail.com>
Date: Fri, 14 Jul 2017 20:46:02 +0200
Subject: Revert back to the original implementaion with varaibles

Revert `exist? and url` to the original implementation.
Since the new one doesn't provide any benefits and makes implementation
harder to follow.
---
 lib/active_storage/service/gcs_service.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
index 1addda6733..b0ad3e2fa4 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/lib/active_storage/service/gcs_service.rb
@@ -36,14 +36,20 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
 
   def exist?(key)
     instrument :exist, key do |payload|
-      payload[:exist] = file_for(key).present?
+      answer = file_for(key).present?
+      payload[:exist] = answer
+      answer
     end
   end
 
   def url(key, expires_in:, disposition:, filename:)
     instrument :url, key do |payload|
       query = { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }
-      payload[:url] = file_for(key).signed_url(expires: expires_in, query: query)
+      generated_url = file_for(key).signed_url(expires: expires_in, query: query)
+
+      payload[:url] = generated_url
+
+      generated_url
     end
   end
 
-- 
cgit v1.2.3


From 62e5562edb72f591c6af4c4da2bce3db18b5ba36 Mon Sep 17 00:00:00 2001
From: colorfulfool <t0ny.hamster@gmail.com>
Date: Sat, 15 Jul 2017 00:25:07 +0300
Subject: Don't fail on boot because of missing S3 keys when S3 is not used

---
 lib/active_storage/storage_services.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/storage_services.yml b/lib/active_storage/storage_services.yml
index a93304d88f..c80a3e8453 100644
--- a/lib/active_storage/storage_services.yml
+++ b/lib/active_storage/storage_services.yml
@@ -9,8 +9,8 @@ local:
 # Use rails secrets:edit to set the AWS secrets (as shared:aws:access_key_id|secret_access_key)
 amazon:
   service: S3
-  access_key_id: <%= Rails.application.secrets.aws[:access_key_id] %>
-  secret_access_key: <%= Rails.application.secrets.aws[:secret_access_key] %>
+  access_key_id: <%= Rails.application.secrets.dig(:aws, :access_key_id) %>
+  secret_access_key: <%= Rails.application.secrets.dig(:aws, :secret_access_key) %>
   region: us-east-1
   bucket: your_own_bucket
 
-- 
cgit v1.2.3


From ed977c32e07a7bac82f08e66162e4ce95769d263 Mon Sep 17 00:00:00 2001
From: colorfulfool <t0ny.hamster@gmail.com>
Date: Sat, 15 Jul 2017 00:25:43 +0300
Subject: Fail early if no storage service is specified

---
 lib/active_storage/engine.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/engine.rb b/lib/active_storage/engine.rb
index c251f522c6..5f0b62809e 100644
--- a/lib/active_storage/engine.rb
+++ b/lib/active_storage/engine.rb
@@ -56,6 +56,9 @@ module ActiveStorage
           rescue => e
             raise e, "Cannot load `Rails.config.active_storage.service`:\n#{e.message}", e.backtrace
           end
+      else
+        raise "No storage service specified for current env (#{Rails.env}). " \
+              "Add config.active_storage.service = :local into your config/environments/#{Rails.env}.rb."
       end
     end
   end
-- 
cgit v1.2.3


From 315bd5c4477a0f7695c924b5266adcf27a5ae3fc Mon Sep 17 00:00:00 2001
From: Stanislav Gospodinov <sani9706@gmail.com>
Date: Sat, 15 Jul 2017 05:15:12 +0300
Subject: Fixing logger to work with Rails 5.2.0.alpha

---
 lib/active_storage/log_subscriber.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/log_subscriber.rb b/lib/active_storage/log_subscriber.rb
index 5c486b9161..0d5f497403 100644
--- a/lib/active_storage/log_subscriber.rb
+++ b/lib/active_storage/log_subscriber.rb
@@ -2,9 +2,9 @@ require "active_support/log_subscriber"
 
 class ActiveStorage::LogSubscriber < ActiveSupport::LogSubscriber
   def service_upload(event)
-    message = color("Uploaded file to key: #{key_in(event)}", GREEN)
-    message << color(" (checksum: #{event.payload[:checksum]})", GREEN) if event.payload[:checksum]
-    info event, message
+    message = "Uploaded file to key: #{key_in(event)}"
+    message << " (checksum: #{event.payload[:checksum]})"
+    info event, color(message, GREEN) if event.payload[:checksum]
   end
 
   def service_download(event)
-- 
cgit v1.2.3


From a4e0e16e05fa49fc84b92a5ffd42a9f728ee1f89 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Fri, 14 Jul 2017 22:35:20 -0400
Subject: Put conditional back

---
 lib/active_storage/log_subscriber.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/log_subscriber.rb b/lib/active_storage/log_subscriber.rb
index 0d5f497403..4ac34a3b25 100644
--- a/lib/active_storage/log_subscriber.rb
+++ b/lib/active_storage/log_subscriber.rb
@@ -3,8 +3,8 @@ require "active_support/log_subscriber"
 class ActiveStorage::LogSubscriber < ActiveSupport::LogSubscriber
   def service_upload(event)
     message = "Uploaded file to key: #{key_in(event)}"
-    message << " (checksum: #{event.payload[:checksum]})"
-    info event, color(message, GREEN) if event.payload[:checksum]
+    message << " (checksum: #{event.payload[:checksum]})" if event.payload[:checksum]
+    info event, color(message, GREEN)
   end
 
   def service_download(event)
-- 
cgit v1.2.3


From 4dd44bc5e894d5a6e7f40881f318fa67e9aa1a77 Mon Sep 17 00:00:00 2001
From: Sean Handley <sean.handley@gmail.com>
Date: Fri, 14 Jul 2017 09:28:34 +0100
Subject: Allow custom endpoints for S3.

---
 lib/active_storage/service/s3_service.rb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index e75ac36c7d..f78e2d3246 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -4,8 +4,24 @@ require "active_support/core_ext/numeric/bytes"
 class ActiveStorage::Service::S3Service < ActiveStorage::Service
   attr_reader :client, :bucket
 
-  def initialize(access_key_id:, secret_access_key:, region:, bucket:)
-    @client = Aws::S3::Resource.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region)
+  def initialize(access_key_id:, secret_access_key:, region:, bucket:, endpoint: nil)
+    @client = if endpoint
+      Aws::S3::Resource.new(
+        access_key_id:     access_key_id,
+        secret_access_key: secret_access_key,
+        region:            region,
+        bucket:            bucket
+      )
+    else
+      Aws::S3::Resource.new(
+        access_key_id:     access_key_id,
+        secret_access_key: secret_access_key,
+        region:            region,
+        bucket:            bucket,
+        endpoint:          endpoint
+      )
+    end
+
     @bucket = @client.bucket(bucket)
   end
 
-- 
cgit v1.2.3


From 6074771f7926d4c93536d15d91de46fb549b329a Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Sat, 15 Jul 2017 08:42:10 -0400
Subject: Swap branches

---
 lib/active_storage/service/s3_service.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index f78e2d3246..4efc34eb80 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -10,15 +10,15 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service
         access_key_id:     access_key_id,
         secret_access_key: secret_access_key,
         region:            region,
-        bucket:            bucket
+        bucket:            bucket,
+        endpoint:          endpoint
       )
     else
       Aws::S3::Resource.new(
         access_key_id:     access_key_id,
         secret_access_key: secret_access_key,
         region:            region,
-        bucket:            bucket,
-        endpoint:          endpoint
+        bucket:            bucket
       )
     end
 
-- 
cgit v1.2.3


From 993283a1ae9e9c7f07c78c2ac8372a6e91228cc2 Mon Sep 17 00:00:00 2001
From: colorfulfool <t0ny.hamster@gmail.com>
Date: Sun, 16 Jul 2017 01:06:39 +0300
Subject: Fix a typo in S3Service

---
 lib/active_storage/service/s3_service.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index 4efc34eb80..ba8251b77e 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -10,15 +10,13 @@ class ActiveStorage::Service::S3Service < ActiveStorage::Service
         access_key_id:     access_key_id,
         secret_access_key: secret_access_key,
         region:            region,
-        bucket:            bucket,
         endpoint:          endpoint
       )
     else
       Aws::S3::Resource.new(
         access_key_id:     access_key_id,
         secret_access_key: secret_access_key,
-        region:            region,
-        bucket:            bucket
+        region:            region
       )
     end
 
-- 
cgit v1.2.3


From 94a450acbec0a33f1ad9003e6e9c5545549a3ab9 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Sun, 16 Jul 2017 19:17:47 -0400
Subject: Splat options

---
 lib/active_storage/service/s3_service.rb | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index ba8251b77e..5703cfd0ed 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -4,22 +4,8 @@ require "active_support/core_ext/numeric/bytes"
 class ActiveStorage::Service::S3Service < ActiveStorage::Service
   attr_reader :client, :bucket
 
-  def initialize(access_key_id:, secret_access_key:, region:, bucket:, endpoint: nil)
-    @client = if endpoint
-      Aws::S3::Resource.new(
-        access_key_id:     access_key_id,
-        secret_access_key: secret_access_key,
-        region:            region,
-        endpoint:          endpoint
-      )
-    else
-      Aws::S3::Resource.new(
-        access_key_id:     access_key_id,
-        secret_access_key: secret_access_key,
-        region:            region
-      )
-    end
-
+  def initialize(access_key_id:, secret_access_key:, region:, bucket:, **options)
+    @client = Aws::S3::Resource.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region, **options)
     @bucket = @client.bucket(bucket)
   end
 
-- 
cgit v1.2.3


From be526d16fe29cf2c6c75a0c10b355271a87527d7 Mon Sep 17 00:00:00 2001
From: Michael Herold <github@michaeljherold.com>
Date: Mon, 17 Jul 2017 08:17:09 -0500
Subject: Add direct upload support to GCS service

---
 lib/active_storage/service/gcs_service.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb
index b0ad3e2fa4..7053a130c0 100644
--- a/lib/active_storage/service/gcs_service.rb
+++ b/lib/active_storage/service/gcs_service.rb
@@ -53,6 +53,17 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service
     end
   end
 
+  def url_for_direct_upload(key, expires_in:, content_type:, content_length:)
+    instrument :url, key do |payload|
+      generated_url = bucket.signed_url key, method: "PUT", expires: expires_in,
+        content_type: content_type
+
+      payload[:url] = generated_url
+
+      generated_url
+    end
+  end
+
   private
     def file_for(key)
       bucket.file(key)
-- 
cgit v1.2.3


From 32331b19e1da8bdab3c9f6d1666ac2d3108e5042 Mon Sep 17 00:00:00 2001
From: James Baer <jamesfbaer@gmail.com>
Date: Thu, 20 Jul 2017 12:29:37 -0400
Subject: Accept S3 upload options (e.g. server_side_encryption)

---
 lib/active_storage/service/s3_service.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib/active_storage')

diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb
index 5703cfd0ed..efffdec157 100644
--- a/lib/active_storage/service/s3_service.rb
+++ b/lib/active_storage/service/s3_service.rb
@@ -2,17 +2,19 @@ require "aws-sdk"
 require "active_support/core_ext/numeric/bytes"
 
 class ActiveStorage::Service::S3Service < ActiveStorage::Service
-  attr_reader :client, :bucket
+  attr_reader :client, :bucket, :upload_options
 
-  def initialize(access_key_id:, secret_access_key:, region:, bucket:, **options)
+  def initialize(access_key_id:, secret_access_key:, region:, bucket:, upload: {}, **options)
     @client = Aws::S3::Resource.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region, **options)
     @bucket = @client.bucket(bucket)
+
+    @upload_options = upload
   end
 
   def upload(key, io, checksum: nil)
     instrument :upload, key, checksum: checksum do
       begin
-        object_for(key).put(body: io, content_md5: checksum)
+        object_for(key).put(upload_options.merge(body: io, content_md5: checksum))
       rescue Aws::S3::Errors::BadDigest
         raise ActiveStorage::IntegrityError
       end
-- 
cgit v1.2.3