diff options
author | George Claghorn <george.claghorn@gmail.com> | 2018-09-14 13:53:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-14 13:53:16 -0400 |
commit | 65bf046fd1c05405591b940e3b3cd718ca1edba1 (patch) | |
tree | 7fe01750df956b3262f3ac5164f4f9e13210d650 /activestorage/config | |
parent | 9cafaadc0cce68143bb7390f9b147ed23da38737 (diff) | |
parent | 7dd9916c0d5e5d149bdde8cbeec42ca49cf3f6ca (diff) | |
download | rails-65bf046fd1c05405591b940e3b3cd718ca1edba1.tar.gz rails-65bf046fd1c05405591b940e3b3cd718ca1edba1.tar.bz2 rails-65bf046fd1c05405591b940e3b3cd718ca1edba1.zip |
Merge pull request #33883 from cbisnett/active_storage_route_prefix_configuration
Configure Active Storage route prefix
Diffstat (limited to 'activestorage/config')
-rw-r--r-- | activestorage/config/routes.rb | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/activestorage/config/routes.rb b/activestorage/config/routes.rb index 20d19f334a..3af7361cff 100644 --- a/activestorage/config/routes.rb +++ b/activestorage/config/routes.rb @@ -1,17 +1,15 @@ # frozen_string_literal: true Rails.application.routes.draw do - get "/rails/active_storage/blobs/:signed_id/*filename" => "active_storage/blobs#show", as: :rails_service_blob - - direct :rails_blob do |blob, options| - route_for(:rails_service_blob, blob.signed_id, blob.filename, options) - end - - resolve("ActiveStorage::Blob") { |blob, options| route_for(:rails_blob, blob, options) } - resolve("ActiveStorage::Attachment") { |attachment, options| route_for(:rails_blob, attachment.blob, options) } + scope ActiveStorage.routes_prefix do + get "/blobs/:signed_id/*filename" => "active_storage/blobs#show", as: :rails_service_blob + get "/representations/:signed_blob_id/:variation_key/*filename" => "active_storage/representations#show", as: :rails_blob_representation - get "/rails/active_storage/representations/:signed_blob_id/:variation_key/*filename" => "active_storage/representations#show", as: :rails_blob_representation + 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| signed_blob_id = representation.blob.signed_id @@ -25,7 +23,10 @@ Rails.application.routes.draw do resolve("ActiveStorage::Preview") { |preview, options| route_for(:rails_representation, preview, options) } - get "/rails/active_storage/disk/:encoded_key/*filename" => "active_storage/disk#show", as: :rails_disk_service - put "/rails/active_storage/disk/:encoded_token" => "active_storage/disk#update", as: :update_rails_disk_service - post "/rails/active_storage/direct_uploads" => "active_storage/direct_uploads#create", as: :rails_direct_uploads + direct :rails_blob do |blob, options| + route_for(:rails_service_blob, blob.signed_id, blob.filename, options) + end + + resolve("ActiveStorage::Blob") { |blob, options| route_for(:rails_blob, blob, options) } + resolve("ActiveStorage::Attachment") { |attachment, options| route_for(:rails_blob, attachment.blob, options) } end |