Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the ability to explicitly load the ActiveStorage routes
Fixes #31228
- Loading branch information
Showing
4 changed files
with
99 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,3 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| Rails.application.routes.draw do | ||
| scope ActiveStorage.routes_prefix do | ||
| get "/blobs/redirect/:signed_id/*filename" => "active_storage/blobs/redirect#show", as: :rails_service_blob | ||
| get "/blobs/proxy/:signed_id/*filename" => "active_storage/blobs/proxy#show", as: :rails_service_blob_proxy | ||
| get "/blobs/:signed_id/*filename" => "active_storage/blobs/redirect#show" | ||
|
|
||
| get "/representations/redirect/:signed_blob_id/:variation_key/*filename" => "active_storage/representations/redirect#show", as: :rails_blob_representation | ||
| get "/representations/proxy/:signed_blob_id/:variation_key/*filename" => "active_storage/representations/proxy#show", as: :rails_blob_representation_proxy | ||
| get "/representations/:signed_blob_id/:variation_key/*filename" => "active_storage/representations/redirect#show" | ||
|
|
||
| get "/disk/:encoded_key/*filename" => "active_storage/disk#show", as: :rails_disk_service | ||
| put "/disk/:encoded_token" => "active_storage/disk#update", as: :update_rails_disk_service | ||
| post "/direct_uploads" => "active_storage/direct_uploads#create", as: :rails_direct_uploads | ||
| end | ||
|
|
||
| direct :rails_representation do |representation, options| | ||
| route_for(ActiveStorage.resolve_model_to_route, representation, options) | ||
| end | ||
|
|
||
| resolve("ActiveStorage::Variant") { |variant, options| route_for(ActiveStorage.resolve_model_to_route, variant, options) } | ||
| resolve("ActiveStorage::VariantWithRecord") { |variant, options| route_for(ActiveStorage.resolve_model_to_route, variant, options) } | ||
| resolve("ActiveStorage::Preview") { |preview, options| route_for(ActiveStorage.resolve_model_to_route, preview, options) } | ||
|
|
||
| direct :rails_blob do |blob, options| | ||
| route_for(ActiveStorage.resolve_model_to_route, blob, options) | ||
| end | ||
|
|
||
| resolve("ActiveStorage::Blob") { |blob, options| route_for(ActiveStorage.resolve_model_to_route, blob, options) } | ||
| resolve("ActiveStorage::Attachment") { |attachment, options| route_for(ActiveStorage.resolve_model_to_route, attachment.blob, options) } | ||
|
|
||
| direct :rails_storage_proxy do |model, options| | ||
| expires_in = options.delete(:expires_in) { ActiveStorage.urls_expire_in } | ||
| expires_at = options.delete(:expires_at) | ||
|
|
||
| if model.respond_to?(:signed_id) | ||
| route_for( | ||
| :rails_service_blob_proxy, | ||
| model.signed_id(expires_in: expires_in, expires_at: expires_at), | ||
| model.filename, | ||
| options | ||
| ) | ||
| else | ||
| signed_blob_id = model.blob.signed_id(expires_in: expires_in, expires_at: expires_at) | ||
| variation_key = model.variation.key | ||
| filename = model.blob.filename | ||
|
|
||
| route_for( | ||
| :rails_blob_representation_proxy, | ||
| signed_blob_id, | ||
| variation_key, | ||
| filename, | ||
| options | ||
| ) | ||
| end | ||
| end | ||
|
|
||
| direct :rails_storage_redirect do |model, options| | ||
| expires_in = options.delete(:expires_in) { ActiveStorage.urls_expire_in } | ||
| expires_at = options.delete(:expires_at) | ||
|
|
||
| if model.respond_to?(:signed_id) | ||
| route_for( | ||
| :rails_service_blob, | ||
| model.signed_id(expires_in: expires_in, expires_at: expires_at), | ||
| model.filename, | ||
| options | ||
| ) | ||
| else | ||
| signed_blob_id = model.blob.signed_id(expires_in: expires_in, expires_at: expires_at) | ||
| variation_key = model.variation.key | ||
| filename = model.blob.filename | ||
|
|
||
| route_for( | ||
| :rails_blob_representation, | ||
| signed_blob_id, | ||
| variation_key, | ||
| filename, | ||
| options | ||
| ) | ||
| end | ||
| end | ||
| end if ActiveStorage.draw_routes | ||
| Rails.application.routes.draw { ActiveStorage::Routes.apply(self) } if ActiveStorage.draw_routes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| module ActiveStorage | ||
| module Routes | ||
| def self.apply(router) | ||
| router.scope ActiveStorage.routes_prefix do | ||
| router.get "/blobs/redirect/:signed_id/*filename" => "active_storage/blobs/redirect#show", as: :rails_service_blob | ||
| router.get "/blobs/proxy/:signed_id/*filename" => "active_storage/blobs/proxy#show", as: :rails_service_blob_proxy | ||
| router.get "/blobs/:signed_id/*filename" => "active_storage/blobs/redirect#show" | ||
|
|
||
| router.get "/representations/redirect/:signed_blob_id/:variation_key/*filename" => "active_storage/representations/redirect#show", as: :rails_blob_representation | ||
| router.get "/representations/proxy/:signed_blob_id/:variation_key/*filename" => "active_storage/representations/proxy#show", as: :rails_blob_representation_proxy | ||
| router.get "/representations/:signed_blob_id/:variation_key/*filename" => "active_storage/representations/redirect#show" | ||
|
|
||
| router.get "/disk/:encoded_key/*filename" => "active_storage/disk#show", as: :rails_disk_service | ||
| router.put "/disk/:encoded_token" => "active_storage/disk#update", as: :update_rails_disk_service | ||
| router.post "/direct_uploads" => "active_storage/direct_uploads#create", as: :rails_direct_uploads | ||
| end | ||
|
|
||
| router.direct :rails_representation do |representation, options| | ||
| route_for(ActiveStorage.resolve_model_to_route, representation, options) | ||
| end | ||
|
|
||
| router.resolve("ActiveStorage::Variant") { |variant, options| route_for(ActiveStorage.resolve_model_to_route, variant, options) } | ||
| router.resolve("ActiveStorage::VariantWithRecord") { |variant, options| route_for(ActiveStorage.resolve_model_to_route, variant, options) } | ||
| router.resolve("ActiveStorage::Preview") { |preview, options| route_for(ActiveStorage.resolve_model_to_route, preview, options) } | ||
|
|
||
| router.direct :rails_blob do |blob, options| | ||
| route_for(ActiveStorage.resolve_model_to_route, blob, options) | ||
| end | ||
|
|
||
| router.resolve("ActiveStorage::Blob") { |blob, options| route_for(ActiveStorage.resolve_model_to_route, blob, options) } | ||
| router.resolve("ActiveStorage::Attachment") { |attachment, options| route_for(ActiveStorage.resolve_model_to_route, attachment.blob, options) } | ||
|
|
||
| router.direct :rails_storage_proxy do |model, options| | ||
| expires_in = options.delete(:expires_in) { ActiveStorage.urls_expire_in } | ||
| expires_at = options.delete(:expires_at) | ||
|
|
||
| if model.respond_to?(:signed_id) | ||
| route_for( | ||
| :rails_service_blob_proxy, | ||
| model.signed_id(expires_in: expires_in, expires_at: expires_at), | ||
| model.filename, | ||
| options | ||
| ) | ||
| else | ||
| signed_blob_id = model.blob.signed_id(expires_in: expires_in, expires_at: expires_at) | ||
| variation_key = model.variation.key | ||
| filename = model.blob.filename | ||
|
|
||
| route_for( | ||
| :rails_blob_representation_proxy, | ||
| signed_blob_id, | ||
| variation_key, | ||
| filename, | ||
| options | ||
| ) | ||
| end | ||
| end | ||
|
|
||
| router.direct :rails_storage_redirect do |model, options| | ||
| expires_in = options.delete(:expires_in) { ActiveStorage.urls_expire_in } | ||
| expires_at = options.delete(:expires_at) | ||
|
|
||
| if model.respond_to?(:signed_id) | ||
| route_for( | ||
| :rails_service_blob, | ||
| model.signed_id(expires_in: expires_in, expires_at: expires_at), | ||
| model.filename, | ||
| options | ||
| ) | ||
| else | ||
| signed_blob_id = model.blob.signed_id(expires_in: expires_in, expires_at: expires_at) | ||
| variation_key = model.variation.key | ||
| filename = model.blob.filename | ||
|
|
||
| route_for( | ||
| :rails_blob_representation, | ||
| signed_blob_id, | ||
| variation_key, | ||
| filename, | ||
| options | ||
| ) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters