activestorage 6.0.3 → 6.1.0.rc1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activestorage might be problematic. Click here for more details.

Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +144 -143
  3. data/MIT-LICENSE +1 -1
  4. data/README.md +35 -3
  5. data/app/controllers/active_storage/base_controller.rb +11 -0
  6. data/app/controllers/active_storage/blobs/proxy_controller.rb +14 -0
  7. data/app/controllers/active_storage/{blobs_controller.rb → blobs/redirect_controller.rb} +2 -2
  8. data/app/controllers/active_storage/disk_controller.rb +8 -20
  9. data/app/controllers/active_storage/representations/proxy_controller.rb +19 -0
  10. data/app/controllers/active_storage/{representations_controller.rb → representations/redirect_controller.rb} +2 -2
  11. data/app/controllers/concerns/active_storage/file_server.rb +18 -0
  12. data/app/controllers/concerns/active_storage/set_blob.rb +1 -1
  13. data/app/controllers/concerns/active_storage/set_current.rb +2 -2
  14. data/app/controllers/concerns/active_storage/set_headers.rb +12 -0
  15. data/app/jobs/active_storage/mirror_job.rb +15 -0
  16. data/app/models/active_storage/attachment.rb +18 -10
  17. data/app/models/active_storage/blob.rb +114 -59
  18. data/app/models/active_storage/blob/analyzable.rb +6 -2
  19. data/app/models/active_storage/blob/identifiable.rb +7 -6
  20. data/app/models/active_storage/blob/representable.rb +34 -4
  21. data/app/models/active_storage/preview.rb +31 -10
  22. data/app/models/active_storage/record.rb +7 -0
  23. data/app/models/active_storage/variant.rb +28 -41
  24. data/app/models/active_storage/variant_record.rb +8 -0
  25. data/app/models/active_storage/variant_with_record.rb +54 -0
  26. data/app/models/active_storage/variation.rb +25 -20
  27. data/config/routes.rb +58 -8
  28. data/db/migrate/20170806125915_create_active_storage_tables.rb +14 -5
  29. data/db/update_migrate/20190112182829_add_service_name_to_active_storage_blobs.rb +17 -0
  30. data/db/update_migrate/20191206030411_create_active_storage_variant_records.rb +11 -0
  31. data/lib/active_storage.rb +5 -2
  32. data/lib/active_storage/analyzer.rb +6 -0
  33. data/lib/active_storage/analyzer/image_analyzer.rb +3 -0
  34. data/lib/active_storage/analyzer/null_analyzer.rb +4 -0
  35. data/lib/active_storage/analyzer/video_analyzer.rb +14 -3
  36. data/lib/active_storage/attached/changes/create_many.rb +1 -0
  37. data/lib/active_storage/attached/changes/create_one.rb +17 -4
  38. data/lib/active_storage/attached/many.rb +4 -3
  39. data/lib/active_storage/attached/model.rb +59 -12
  40. data/lib/active_storage/attached/one.rb +4 -3
  41. data/lib/active_storage/engine.rb +25 -27
  42. data/lib/active_storage/gem_version.rb +3 -3
  43. data/lib/active_storage/log_subscriber.rb +6 -0
  44. data/lib/active_storage/previewer.rb +3 -2
  45. data/lib/active_storage/previewer/mupdf_previewer.rb +3 -3
  46. data/lib/active_storage/previewer/poppler_pdf_previewer.rb +3 -3
  47. data/lib/active_storage/previewer/video_previewer.rb +2 -2
  48. data/lib/active_storage/service.rb +36 -7
  49. data/lib/active_storage/service/azure_storage_service.rb +40 -35
  50. data/lib/active_storage/service/configurator.rb +3 -1
  51. data/lib/active_storage/service/disk_service.rb +36 -31
  52. data/lib/active_storage/service/gcs_service.rb +18 -16
  53. data/lib/active_storage/service/mirror_service.rb +31 -7
  54. data/lib/active_storage/service/registry.rb +32 -0
  55. data/lib/active_storage/service/s3_service.rb +54 -23
  56. data/lib/active_storage/transformers/image_processing_transformer.rb +13 -7
  57. data/lib/active_storage/transformers/transformer.rb +0 -3
  58. metadata +55 -19
  59. data/db/update_migrate/20180723000244_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.rb +0 -9
  60. data/lib/active_storage/downloading.rb +0 -47
  61. data/lib/active_storage/transformers/mini_magick_transformer.rb +0 -38
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c54d488524ff14e5e64c9a156c5dfc3e8d8fcd222e79670a0956e575df923d96
4
- data.tar.gz: a1d1fce409ac38c31376e9b593a5bfa14421da7aa9ffe0356c00b6be0285ba07
3
+ metadata.gz: 2b5828c669886bb3073bc9a325644f70785b9e7432fe34bf609369ae854472d1
4
+ data.tar.gz: c20c99725925af7c67f86c4ad99fcc5add79a4c373db3c1d5ae6fe4c2b1a893b
5
5
  SHA512:
6
- metadata.gz: 1af927b5c7e64075d6414e4bed635478045b7822af61656bfa5fbc797ac72599e6d7d7a2403b15b02d7ba19e6b48140eedd3880aef3becd38200a711368316f0
7
- data.tar.gz: 18bc73abc848405cbe7edb3e90536b152137888e124d7df34fc8210019c1f90d19a36e1151f586bde369c65e61c2d4f39ae60ff84a04a2b64dabc18980ecd506
6
+ metadata.gz: 7d0adc41784932bd392d92f120fadea916633ccf659a2b2d5d3b6a305eee2ca093a6d82045e322b40a5d6349cfeae880db08c87f1972bb40e954f52dd1457c45
7
+ data.tar.gz: adf193c0617237b63aaf251b0e0fe8ec0e48da5b3dc47d8a6e60a5b91ea976d3a205dd990a0a2b20d65bd21b70dc5eccbaed0a512a86c03445be84811fa5deda
@@ -1,231 +1,232 @@
1
- ## Rails 6.0.3 (May 06, 2020) ##
1
+ ## Rails 6.1.0.rc1 (November 02, 2020) ##
2
2
 
3
- * No changes.
3
+ * Remove deprecated support to pass `:combine_options` operations to `ActiveStorage::Transformers::ImageProcessing`.
4
4
 
5
+ *Rafael Mendonça França*
5
6
 
6
- ## Rails 6.0.2.2 (March 19, 2020) ##
7
+ * Remove deprecated `ActiveStorage::Transformers::MiniMagickTransformer`.
7
8
 
8
- * No changes.
9
+ *Rafael Mendonça França*
9
10
 
11
+ * Remove deprecated `config.active_storage.queue`.
10
12
 
11
- ## Rails 6.0.2.1 (December 18, 2019) ##
13
+ *Rafael Mendonça França*
12
14
 
13
- * No changes.
15
+ * Remove deprecated `ActiveStorage::Downloading`.
14
16
 
17
+ *Rafael Mendonça França*
15
18
 
16
- ## Rails 6.0.2 (December 13, 2019) ##
19
+ * Add per-environment configuration support
17
20
 
18
- * No changes.
21
+ *Pietro Moro*
19
22
 
23
+ * The Poppler PDF previewer renders a preview image using the original
24
+ document's crop box rather than its media box, hiding print margins. This
25
+ matches the behavior of the MuPDF previewer.
20
26
 
21
- ## Rails 6.0.1 (November 5, 2019) ##
27
+ *Vincent Robert*
22
28
 
23
- * `ActiveStorage::AnalyzeJob`s are discarded on `ActiveRecord::RecordNotFound` errors.
29
+ * Touch parent model when an attachment is purged.
24
30
 
25
- *George Claghorn*
31
+ *Víctor Pérez Rodríguez*
26
32
 
27
- * Blobs are recorded in the database before being uploaded to the service.
28
- This fixes that generated blob keys could silently collide, leading to
29
- data loss.
33
+ * Files can now be served by proxying them from the underlying storage service
34
+ instead of redirecting to a signed service URL. Use the
35
+ `rails_storage_proxy_path` and `_url` helpers to proxy an attached file:
30
36
 
31
- *Julik Tarkhanov*
37
+ ```erb
38
+ <%= image_tag rails_storage_proxy_path(@user.avatar) %>
39
+ ```
32
40
 
41
+ To proxy by default, set `config.active_storage.resolve_model_to_route`:
33
42
 
34
- ## Rails 6.0.0 (August 16, 2019) ##
43
+ ```ruby
44
+ # Proxy attached files instead.
45
+ config.active_storage.resolve_model_to_route = :rails_storage_proxy
46
+ ```
35
47
 
36
- * No changes.
48
+ ```erb
49
+ <%= image_tag @user.avatar %>
50
+ ```
37
51
 
52
+ To redirect to a signed service URL when the default file serving strategy
53
+ is set to proxying, use the `rails_storage_redirect_path` and `_url` helpers:
38
54
 
39
- ## Rails 6.0.0.rc2 (July 22, 2019) ##
55
+ ```erb
56
+ <%= image_tag rails_storage_redirect_path(@user.avatar) %>
57
+ ```
40
58
 
41
- * No changes.
59
+ *Jonathan Fleckenstein*
42
60
 
61
+ * Add `config.active_storage.web_image_content_types` to allow applications
62
+ to add content types (like `image/webp`) in which variants can be processed,
63
+ instead of letting those images be converted to the fallback PNG format.
43
64
 
44
- ## Rails 6.0.0.rc1 (April 24, 2019) ##
65
+ *Jeroen van Haperen*
45
66
 
46
- * Don't raise when analyzing an image whose type is unsupported by ImageMagick.
67
+ * Add support for creating variants of `WebP` images out of the box.
47
68
 
48
- Fixes #36065.
69
+ *Dino Maric*
49
70
 
50
- *Guilherme Mansur*
71
+ * Only enqueue analysis jobs for blobs with non-null analyzer classes.
51
72
 
52
- * Permit generating variants of BMP images.
73
+ *Gannon McGibbon*
53
74
 
54
- *Younes Serraj*
75
+ * Previews are created on the same service as the original blob.
55
76
 
77
+ *Peter Zhu*
56
78
 
57
- ## Rails 6.0.0.beta3 (March 11, 2019) ##
79
+ * Remove unused `disposition` and `content_type` query parameters for `DiskService`.
58
80
 
59
- * No changes.
81
+ *Peter Zhu*
60
82
 
83
+ * Use `DiskController` for both public and private files.
61
84
 
62
- ## Rails 6.0.0.beta2 (February 25, 2019) ##
85
+ `DiskController` is able to handle multiple services by adding a
86
+ `service_name` field in the generated URL in `DiskService`.
63
87
 
64
- * No changes.
88
+ *Peter Zhu*
65
89
 
90
+ * Variants are tracked in the database to avoid existence checks in the storage service.
66
91
 
67
- ## Rails 6.0.0.beta1 (January 18, 2019) ##
92
+ *George Claghorn*
68
93
 
69
- * [Rename npm package](https://github.com/rails/rails/pull/34905) from
70
- [`activestorage`](https://www.npmjs.com/package/activestorage) to
71
- [`@rails/activestorage`](https://www.npmjs.com/package/@rails/activestorage).
94
+ * Deprecate `service_url` methods in favour of `url`.
72
95
 
73
- *Javan Makhmali*
96
+ Deprecate `Variant#service_url` and `Preview#service_url` to instead use
97
+ `#url` method to be consistent with `Blob`.
74
98
 
75
- * Replace `config.active_storage.queue` with two options that indicate which
76
- queues analysis and purge jobs should use, respectively:
99
+ *Peter Zhu*
77
100
 
78
- * `config.active_storage.queues.analysis`
79
- * `config.active_storage.queues.purge`
101
+ * Permanent URLs for public storage blobs.
80
102
 
81
- `config.active_storage.queue` is preferred over the new options when it's
82
- set, but it is deprecated and will be removed in Rails 6.1.
103
+ Services can be configured in `config/storage.yml` with a new key
104
+ `public: true | false` to indicate whether a service holds public
105
+ blobs or private blobs. Public services will always return a permanent URL.
83
106
 
84
- *George Claghorn*
107
+ Deprecates `Blob#service_url` in favor of `Blob#url`.
85
108
 
86
- * Permit generating variants of TIFF images.
109
+ *Peter Zhu*
87
110
 
88
- *Luciano Sousa*
111
+ * Make services aware of configuration names.
89
112
 
90
- * Use base36 (all lowercase) for all new Blob keys to prevent
91
- collisions and undefined behavior with case-insensitive filesystems and
92
- database indices.
113
+ *Gannon McGibbon*
93
114
 
94
- *Julik Tarkhanov*
115
+ * The `Content-Type` header is set on image variants when they're uploaded to third-party storage services.
95
116
 
96
- * It doesn’t include an `X-CSRF-Token` header if a meta tag is not found on
97
- the page. It previously included one with a value of `undefined`.
117
+ *Kyle Ribordy*
98
118
 
99
- *Cameron Bothner*
119
+ * Allow storage services to be configured per attachment.
100
120
 
101
- * Fix `ArgumentError` when uploading to amazon s3
121
+ ```ruby
122
+ class User < ActiveRecord::Base
123
+ has_one_attached :avatar, service: :s3
124
+ end
102
125
 
103
- *Hiroki Sanpei*
126
+ class Gallery < ActiveRecord::Base
127
+ has_many_attached :photos, service: :s3
128
+ end
129
+ ```
104
130
 
105
- * Add progressive JPG to default list of variable content types
131
+ *Dmitry Tsepelev*
106
132
 
107
- *Maurice Kühlborn*
133
+ * You can optionally provide a custom blob key when attaching a new file:
108
134
 
109
- * Add `ActiveStorage.routes_prefix` for configuring generated routes.
135
+ ```ruby
136
+ user.avatar.attach key: "avatars/#{user.id}.jpg",
137
+ io: io, content_type: "image/jpeg", filename: "avatar.jpg"
138
+ ```
110
139
 
111
- *Chris Bisnett*
140
+ Active Storage will store the blob's data on the configured service at the provided key.
112
141
 
113
- * `ActiveStorage::Service::AzureStorageService` only handles specifically
114
- relevant types of `Azure::Core::Http::HTTPError`. It previously obscured
115
- other types of `HTTPError`, which is the azure-storage gem’s catch-all
116
- exception class.
142
+ *George Claghorn*
117
143
 
118
- *Cameron Bothner*
144
+ * Replace `Blob.create_after_upload!` with `Blob.create_and_upload!` and deprecate the former.
119
145
 
120
- * `ActiveStorage::DiskController#show` generates a 404 Not Found response when
121
- the requested file is missing from the disk service. It previously raised
122
- `Errno::ENOENT`.
146
+ `create_after_upload!` has been removed since it could lead to data
147
+ corruption by uploading to a key on the storage service which happened to
148
+ be already taken. Creating the record would then correctly raise a
149
+ database uniqueness exception but the stored object would already have
150
+ overwritten another. `create_and_upload!` swaps the order of operations
151
+ so that the key gets reserved up-front or the uniqueness error gets raised,
152
+ before the upload to a key takes place.
123
153
 
124
- *Cameron Bothner*
154
+ *Julik Tarkhanov*
125
155
 
126
- * `ActiveStorage::Blob#download` and `ActiveStorage::Blob#open` raise
127
- `ActiveStorage::FileNotFoundError` when the corresponding file is missing
128
- from the storage service. Services translate service-specific missing object
129
- exceptions (e.g. `Google::Cloud::NotFoundError` for the GCS service and
130
- `Errno::ENOENT` for the disk service) into
131
- `ActiveStorage::FileNotFoundError`.
156
+ * Set content disposition in direct upload using `filename` and `disposition` parameters to `ActiveStorage::Service#headers_for_direct_upload`.
132
157
 
133
- *Cameron Bothner*
158
+ *Peter Zhu*
134
159
 
135
- * Added the `ActiveStorage::SetCurrent` concern for custom Active Storage
136
- controllers that can't inherit from `ActiveStorage::BaseController`.
160
+ * Allow record to be optionally passed to blob finders to make sharding
161
+ easier.
137
162
 
138
- *George Claghorn*
163
+ *Gannon McGibbon*
139
164
 
140
- * Active Storage error classes like `ActiveStorage::IntegrityError` and
141
- `ActiveStorage::UnrepresentableError` now inherit from `ActiveStorage::Error`
142
- instead of `StandardError`. This permits rescuing `ActiveStorage::Error` to
143
- handle all Active Storage errors.
165
+ * Switch from `azure-storage` gem to `azure-storage-blob` gem for Azure service.
144
166
 
145
- *Andrei Makarov*, *George Claghorn*
167
+ *Peter Zhu*
146
168
 
147
- * Uploaded files assigned to a record are persisted to storage when the record
148
- is saved instead of immediately.
169
+ * Add `config.active_storage.draw_routes` to disable Active Storage routes.
149
170
 
150
- In Rails 5.2, the following causes an uploaded file in `params[:avatar]` to
151
- be stored:
171
+ *Gannon McGibbon*
152
172
 
153
- ```ruby
154
- @user.avatar = params[:avatar]
155
- ```
173
+ * Image analysis is skipped if ImageMagick returns an error.
156
174
 
157
- In Rails 6, the uploaded file is stored when `@user` is successfully saved.
175
+ `ActiveStorage::Analyzer::ImageAnalyzer#metadata` would previously raise a
176
+ `MiniMagick::Error`, which caused persistent `ActiveStorage::AnalyzeJob`
177
+ failures. It now logs the error and returns `{}`, resulting in no metadata
178
+ being added to the offending image blob.
158
179
 
159
180
  *George Claghorn*
160
181
 
161
- * Add the ability to reflect on defined attachments using the existing
162
- ActiveRecord reflection mechanism.
182
+ * Method calls on singular attachments return `nil` when no file is attached.
163
183
 
164
- *Kevin Deisz*
165
-
166
- * Variant arguments of `false` or `nil` will no longer be passed to the
167
- processor. For example, the following will not have the monochrome
168
- variation applied:
184
+ Previously, assuming the following User model, `user.avatar.filename` would
185
+ raise a `Module::DelegationError` if no avatar was attached:
169
186
 
170
187
  ```ruby
171
- avatar.variant(monochrome: false)
188
+ class User < ApplicationRecord
189
+ has_one_attached :avatar
190
+ end
172
191
  ```
173
192
 
174
- *Jacob Smith*
193
+ They now return `nil`.
175
194
 
176
- * Generated attachment getter and setter methods are created
177
- within the model's `GeneratedAssociationMethods` module to
178
- allow overriding and composition using `super`.
195
+ *Matthew Tanous*
179
196
 
180
- *Josh Susser*, *Jamon Douglas*
197
+ * The mirror service supports direct uploads.
181
198
 
182
- * Add `ActiveStorage::Blob#open`, which downloads a blob to a tempfile on disk
183
- and yields the tempfile. Deprecate `ActiveStorage::Downloading`.
199
+ New files are directly uploaded to the primary service. When a
200
+ directly-uploaded file is attached to a record, a background job is enqueued
201
+ to copy it to each secondary service.
184
202
 
185
- *David Robertson*, *George Claghorn*
203
+ Configure the queue used to process mirroring jobs by setting
204
+ `config.active_storage.queues.mirror`. The default is `:active_storage_mirror`.
186
205
 
187
- * Pass in `identify: false` as an argument when providing a `content_type` for
188
- `ActiveStorage::Attached::{One,Many}#attach` to bypass automatic content
189
- type inference. For example:
206
+ *George Claghorn*
190
207
 
191
- ```ruby
192
- @message.image.attach(
193
- io: File.open('/path/to/file'),
194
- filename: 'file.pdf',
195
- content_type: 'application/pdf',
196
- identify: false
197
- )
208
+ * The S3 service now permits uploading files larger than 5 gigabytes.
209
+
210
+ When uploading a file greater than 100 megabytes in size, the service
211
+ transparently switches to [multipart uploads](https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html)
212
+ using a part size computed from the file's total size and S3's part count limit.
213
+
214
+ No application changes are necessary to take advantage of this feature. You
215
+ can customize the default 100 MB multipart upload threshold in your S3
216
+ service's configuration:
217
+
218
+ ```yaml
219
+ production:
220
+ service: s3
221
+ access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
222
+ secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
223
+ region: us-east-1
224
+ bucket: my-bucket
225
+ upload:
226
+ multipart_threshold: <%= 250.megabytes %>
198
227
  ```
199
228
 
200
- *Ryan Davidson*
201
-
202
- * The Google Cloud Storage service properly supports streaming downloads.
203
- It now requires version 1.11 or newer of the google-cloud-storage gem.
204
-
205
229
  *George Claghorn*
206
230
 
207
- * Use the [ImageProcessing](https://github.com/janko-m/image_processing) gem
208
- for Active Storage variants, and deprecate the MiniMagick backend.
209
-
210
- This means that variants are now automatically oriented if the original
211
- image was rotated. Also, in addition to the existing ImageMagick
212
- operations, variants can now use `:resize_to_fit`, `:resize_to_fill`, and
213
- other ImageProcessing macros. These are now recommended over raw `:resize`,
214
- as they also sharpen the thumbnail after resizing.
215
-
216
- The ImageProcessing gem also comes with a backend implemented on
217
- [libvips](http://jcupitt.github.io/libvips/), an alternative to
218
- ImageMagick which has significantly better performance than
219
- ImageMagick in most cases, both in terms of speed and memory usage. In
220
- Active Storage it's now possible to switch to the libvips backend by
221
- changing `Rails.application.config.active_storage.variant_processor` to
222
- `:vips`.
223
-
224
- *Janko Marohnić*
225
-
226
- * Rails 6 requires Ruby 2.5.0 or newer.
227
-
228
- *Jeremy Daer*, *Kasper Timm Hansen*
229
-
230
231
 
231
- Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activestorage/CHANGELOG.md) for previous changes.
232
+ Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/activestorage/CHANGELOG.md) for previous changes.
@@ -1,4 +1,4 @@
1
- Copyright (c) 2017-2019 David Heinemeier Hansson, Basecamp
1
+ Copyright (c) 2017-2020 David Heinemeier Hansson, Basecamp
2
2
 
3
3
  Permission is hereby granted, free of charge, to any person obtaining
4
4
  a copy of this software and associated documentation files (the
data/README.md CHANGED
@@ -16,7 +16,7 @@ A key difference to how Active Storage works compared to other attachment soluti
16
16
 
17
17
  ## Installation
18
18
 
19
- Run `rails active_storage:install` to copy over active_storage migrations.
19
+ Run `bin/rails active_storage:install` to copy over active_storage migrations.
20
20
 
21
21
  NOTE: If the task cannot be found, verify that `require "active_storage/engine"` is present in `config/application.rb`.
22
22
 
@@ -55,7 +55,7 @@ url_for(user.avatar)
55
55
 
56
56
  class AvatarsController < ApplicationController
57
57
  def update
58
- # params[:avatar] contains a ActionDispatch::Http::UploadedFile object
58
+ # params[:avatar] contains an ActionDispatch::Http::UploadedFile object
59
59
  Current.user.avatar.attach(params.require(:avatar))
60
60
  redirect_to Current.user
61
61
  end
@@ -106,6 +106,37 @@ Variation of image attachment:
106
106
  <%= image_tag user.avatar.variant(resize_to_limit: [100, 100]) %>
107
107
  ```
108
108
 
109
+ ## File serving strategies
110
+
111
+ Active Storage supports two ways to serve files: redirecting and proxying.
112
+
113
+ ### Redirecting
114
+
115
+ Active Storage generates stable application URLs for files which, when accessed, redirect to signed, short-lived service URLs. This relieves application servers of the burden of serving file data. It is the default file serving strategy.
116
+
117
+ When the application is configured to proxy files by default, use the `rails_storage_redirect_path` and `_url` route helpers to redirect instead:
118
+
119
+ ```erb
120
+ <%= image_tag rails_storage_redirect_path(@user.avatar) %>
121
+ ```
122
+
123
+ ### Proxying
124
+
125
+ Optionally, files can be proxied instead. This means that your application servers will download file data from the storage service in response to requests. This can be useful for serving files from a CDN.
126
+
127
+ Explicitly proxy attachments using the `rails_storage_proxy_path` and `_url` route helpers:
128
+
129
+ ```erb
130
+ <%= image_tag rails_storage_proxy_path(@user.avatar) %>
131
+ ```
132
+
133
+ Or configure Active Storage to use proxying by default:
134
+
135
+ ```ruby
136
+ # config/initializers/active_storage.rb
137
+ Rails.application.config.active_storage.resolve_model_to_route = :rails_storage_proxy
138
+ ```
139
+
109
140
  ## Direct uploads
110
141
 
111
142
  Active Storage, with its included JavaScript library, supports uploading directly from the client to the cloud.
@@ -120,7 +151,8 @@ Active Storage, with its included JavaScript library, supports uploading directl
120
151
  ```
121
152
  Using the npm package:
122
153
  ```js
123
- require("@rails/activestorage").start()
154
+ import * as ActiveStorage from "@rails/activestorage"
155
+ ActiveStorage.start()
124
156
  ```
125
157
  2. Annotate file inputs with the direct upload URL.
126
158