From e33c3cd8ccbecaca6c6af0438956431b02cb3fb2 Mon Sep 17 00:00:00 2001
From: George Claghorn <george.claghorn@gmail.com>
Date: Thu, 16 Aug 2018 01:41:15 -0400
Subject: [PATCH] Extract ActiveStorage::SetCurrent

Provide a handy concern for custom Active Storage controllers that can't inherit from ActiveStorage::BaseController.
---
 activestorage/CHANGELOG.md                        |  5 +++++
 .../controllers/active_storage/base_controller.rb |  8 +++-----
 .../concerns/active_storage/set_current.rb        | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 activestorage/app/controllers/concerns/active_storage/set_current.rb

diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
index f6f195770c..8bfda4799e 100644
--- a/activestorage/CHANGELOG.md
+++ b/activestorage/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Added the `ActiveStorage::SetCurrent` concern for custom Active Storage
+    controllers that can't inherit from `ActiveStorage::BaseController`.
+
+    *George Claghorn*
+
 *   Active Storage error classes like `ActiveStorage::IntegrityError` and
     `ActiveStorage::UnrepresentableError` now inherit from `ActiveStorage::Error`
     instead of `StandardError`. This permits rescuing `ActiveStorage::Error` to
diff --git a/activestorage/app/controllers/active_storage/base_controller.rb b/activestorage/app/controllers/active_storage/base_controller.rb
index 59312ac8df..b27d2bd8aa 100644
--- a/activestorage/app/controllers/active_storage/base_controller.rb
+++ b/activestorage/app/controllers/active_storage/base_controller.rb
@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-# The base controller for all ActiveStorage controllers.
+# The base class for all Active Storage controllers.
 class ActiveStorage::BaseController < ActionController::Base
-  protect_from_forgery with: :exception
+  include ActiveStorage::SetCurrent
 
-  before_action do
-    ActiveStorage::Current.host = request.base_url
-  end
+  protect_from_forgery with: :exception
 end
diff --git a/activestorage/app/controllers/concerns/active_storage/set_current.rb b/activestorage/app/controllers/concerns/active_storage/set_current.rb
new file mode 100644
index 0000000000..597afe7064
--- /dev/null
+++ b/activestorage/app/controllers/concerns/active_storage/set_current.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Sets the <tt>ActiveStorage::Current.host</tt> attribute, which the disk service uses to generate URLs.
+# Include this concern in custom controllers that call ActiveStorage::Blob#service_url,
+# ActiveStorage::Variant#service_url, or ActiveStorage::Preview#service_url so the disk service can
+# generate URLs using the same host, protocol, and base path as the current request.
+module ActiveStorage::SetCurrent
+  extend ActiveSupport::Concern
+
+  included do
+    before_action do
+      ActiveStorage::Current.host = request.base_url
+    end
+  end
+end