activestorage 7.0.8 → 7.1.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (55) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +140 -323
  3. data/MIT-LICENSE +1 -1
  4. data/README.md +4 -4
  5. data/app/assets/javascripts/activestorage.esm.js +8 -4
  6. data/app/assets/javascripts/activestorage.js +9 -3
  7. data/app/controllers/active_storage/blobs/proxy_controller.rb +1 -0
  8. data/app/controllers/active_storage/disk_controller.rb +4 -2
  9. data/app/controllers/active_storage/representations/proxy_controller.rb +1 -0
  10. data/app/controllers/concerns/active_storage/disable_session.rb +12 -0
  11. data/app/controllers/concerns/active_storage/file_server.rb +4 -1
  12. data/app/javascript/activestorage/blob_record.js +4 -1
  13. data/app/javascript/activestorage/direct_upload.js +3 -2
  14. data/app/javascript/activestorage/index.js +3 -1
  15. data/app/jobs/active_storage/transform_job.rb +12 -0
  16. data/app/models/active_storage/attachment.rb +87 -13
  17. data/app/models/active_storage/blob/analyzable.rb +4 -3
  18. data/app/models/active_storage/blob/identifiable.rb +1 -0
  19. data/app/models/active_storage/blob/representable.rb +7 -3
  20. data/app/models/active_storage/blob.rb +25 -45
  21. data/app/models/active_storage/current.rb +0 -10
  22. data/app/models/active_storage/filename.rb +2 -0
  23. data/app/models/active_storage/named_variant.rb +21 -0
  24. data/app/models/active_storage/preview.rb +5 -3
  25. data/app/models/active_storage/variant.rb +8 -7
  26. data/app/models/active_storage/variant_with_record.rb +19 -7
  27. data/app/models/active_storage/variation.rb +5 -3
  28. data/db/migrate/20170806125915_create_active_storage_tables.rb +1 -1
  29. data/lib/active_storage/analyzer/audio_analyzer.rb +16 -4
  30. data/lib/active_storage/analyzer/image_analyzer.rb +2 -0
  31. data/lib/active_storage/analyzer/video_analyzer.rb +3 -1
  32. data/lib/active_storage/analyzer.rb +2 -0
  33. data/lib/active_storage/attached/changes/create_many.rb +8 -3
  34. data/lib/active_storage/attached/changes/create_one.rb +14 -2
  35. data/lib/active_storage/attached/many.rb +5 -4
  36. data/lib/active_storage/attached/model.rb +66 -43
  37. data/lib/active_storage/attached/one.rb +5 -4
  38. data/lib/active_storage/attached.rb +2 -0
  39. data/lib/active_storage/deprecator.rb +7 -0
  40. data/lib/active_storage/engine.rb +11 -7
  41. data/lib/active_storage/fixture_set.rb +2 -0
  42. data/lib/active_storage/gem_version.rb +4 -4
  43. data/lib/active_storage/log_subscriber.rb +12 -0
  44. data/lib/active_storage/previewer.rb +8 -1
  45. data/lib/active_storage/reflection.rb +3 -3
  46. data/lib/active_storage/service/azure_storage_service.rb +2 -0
  47. data/lib/active_storage/service/disk_service.rb +2 -0
  48. data/lib/active_storage/service/gcs_service.rb +11 -20
  49. data/lib/active_storage/service/mirror_service.rb +10 -5
  50. data/lib/active_storage/service/s3_service.rb +2 -0
  51. data/lib/active_storage/service.rb +4 -2
  52. data/lib/active_storage/transformers/transformer.rb +2 -0
  53. data/lib/active_storage/version.rb +1 -1
  54. data/lib/active_storage.rb +19 -3
  55. metadata +19 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9e342b04e0f0e10c35e4f32e52d6a0e0097e74a77982df1a6a39e9424dae4120
4
- data.tar.gz: 86b32ee44b192ec4f376096939712d43c10006e6e2272d8a0de547a69fc1e297
3
+ metadata.gz: 5dfb6f1b9694161b8a664871f19104256c481525dbcd52a738137c2fdb0e7c55
4
+ data.tar.gz: f72483c9153ef5bae19222f6ccb659d7d6ee0444d8785a00f9fa54c12f0a861b
5
5
  SHA512:
6
- metadata.gz: 0aff23ae574910fb16b69232b28446dd72fead8385a298083dd29a1d237e2f277e6dc98b392dc2364ef20b4181c75d0652f9b5bd9af95b8dbf44a1ebf891d05f
7
- data.tar.gz: 1186e01c13dc861941a1a350dab1bbf1983b71fafeca7f359fcdf84d27ed2fd7a4edf020918be5363550fb67e24628d45e631c3e743b95e8c9b87f9551c388d3
6
+ metadata.gz: c7fb7bd0ff896ca2f063a71cbc2187659b14b819d6899c23c48ad43ce54f4a48a4039c027e7802a551986b9f0cbde296e4acf9f633aacaf886a3608a3902a07d
7
+ data.tar.gz: 438c8ad07e00b2bdcee84b781bf764fb4c209999e3ccb757b41c5c7c4b9d32f26ea5c36b8f820bd7f1c3b1901ae088448e92b09ff340528636eef841a62df7f4
data/CHANGELOG.md CHANGED
@@ -1,404 +1,221 @@
1
- ## Rails 7.0.8 (September 09, 2023) ##
1
+ ## Rails 7.1.0.beta1 (September 13, 2023) ##
2
2
 
3
- * No changes.
3
+ * Disables the session in `ActiveStorage::Blobs::ProxyController`
4
+ and `ActiveStorage::Representations::ProxyController`
5
+ in order to allow caching by default in some CDNs as CloudFlare
4
6
 
7
+ Fixes #44136
5
8
 
6
- ## Rails 7.0.7.2 (August 22, 2023) ##
9
+ *Bruno Prieto*
7
10
 
8
- * No changes.
11
+ * Add `tags` to `ActiveStorage::Analyzer::AudioAnalyzer` output
9
12
 
13
+ *Keaton Roux*
10
14
 
11
- ## Rails 7.0.7.1 (August 22, 2023) ##
15
+ * Add an option to preprocess variants
12
16
 
13
- * No changes.
17
+ ActiveStorage variants are processed on the fly when they are needed but
18
+ sometimes we're sure that they are accessed and want to processed them
19
+ upfront.
14
20
 
21
+ `preprocessed` option is added when declaring variants.
15
22
 
16
- ## Rails 7.0.7 (August 09, 2023) ##
17
-
18
- * No changes.
19
-
20
-
21
- ## Rails 7.0.6 (June 29, 2023) ##
22
-
23
- * Fix retrieving rotation value from FFmpeg on version 5.0+.
24
-
25
- In FFmpeg version 5.0+ the rotation value has been removed from tags.
26
- Instead the value can be found in side_data_list. Along with
27
- this update it's possible to have values of -90, -270 to denote the video
28
- has been rotated.
29
-
30
- *Haroon Ahmed*
31
-
32
-
33
- ## Rails 7.0.5.1 (June 26, 2023) ##
34
-
35
- * No changes.
36
-
37
-
38
- ## Rails 7.0.5 (May 24, 2023) ##
39
-
40
- * No changes.
41
-
42
-
43
- ## Rails 7.0.4.3 (March 13, 2023) ##
44
-
45
- * No changes.
46
-
47
-
48
- ## Rails 7.0.4.2 (January 24, 2023) ##
49
-
50
- * No changes.
51
-
52
-
53
- ## Rails 7.0.4.1 (January 17, 2023) ##
54
-
55
- * No changes.
56
-
57
-
58
- ## Rails 7.0.4 (September 09, 2022) ##
59
-
60
- * Fixes proxy downloads of files over 5MiB
61
-
62
- Previously, trying to view and/or download files larger than 5mb stored in
63
- services like S3 via proxy mode could return corrupted files at around
64
- 5.2mb or cause random halts in the download. Now,
65
- `ActiveStorage::Blobs::ProxyController` correctly handles streaming these
66
- larger files from the service to the client without any issues.
67
-
68
- Fixes #44679
69
-
70
- *Felipe Raul*
71
-
72
- ## Rails 7.0.3.1 (July 12, 2022) ##
73
-
74
- * No changes.
75
-
76
-
77
- ## Rails 7.0.3 (May 09, 2022) ##
78
-
79
- * Don't stream responses in redirect mode
80
-
81
- Previously, both redirect mode and proxy mode streamed their
82
- responses which caused a new thread to be created, and could end
83
- up leaking connections in the connection pool. But since redirect
84
- mode doesn't actually send any data, it doesn't need to be
85
- streamed.
86
-
87
- *Luke Lau*
88
-
89
- ## Rails 7.0.2.4 (April 26, 2022) ##
90
-
91
- * No changes.
92
-
93
-
94
- ## Rails 7.0.2.3 (March 08, 2022) ##
95
-
96
- * Added image transformation validation via configurable allow-list.
97
-
98
- Variant now offers a configurable allow-list for
99
- transformation methods in addition to a configurable deny-list for arguments.
100
-
101
- [CVE-2022-21831]
102
-
103
-
104
- ## Rails 7.0.2.2 (February 11, 2022) ##
105
-
106
- * No changes.
107
-
108
- ## Rails 7.0.2.1 (February 11, 2022) ##
109
-
110
- * No changes.
111
-
112
-
113
- ## Rails 7.0.2 (February 08, 2022) ##
114
-
115
- * Revert the ability to pass `service_name` param to `DirectUploadsController` which was introduced
116
- in 7.0.0.
117
-
118
- That change caused a lot of problems to upgrade Rails applications so we decided to remove it
119
- while in work in a more backwards compatible implementation.
120
-
121
- *Gannon McGibbon*
122
-
123
- * Allow applications to opt out of precompiling Active Storage JavaScript assets.
124
-
125
- *jlestavel*
126
-
23
+ ```
24
+ class User < ApplicationRecord
25
+ has_one_attached :avatar do |attachable|
26
+ attachable.variant :thumb, resize_to_limit: [100, 100], preprocessed: true
27
+ end
28
+ end
29
+ ```
127
30
 
128
- ## Rails 7.0.1 (January 06, 2022) ##
31
+ *Shouichi Kamiya*
129
32
 
130
- * No changes.
33
+ * Fix variants not included when eager loading multiple records containing a single attachment
131
34
 
35
+ When using the `with_attached_#{name}` scope for a `has_one_attached` relation,
36
+ attachment variants were not eagerly loaded.
132
37
 
133
- ## Rails 7.0.0 (December 15, 2021) ##
38
+ *Russell Porter*
134
39
 
135
- * Support transforming empty-ish `has_many_attached` value into `[]` (e.g. `[""]`).
40
+ * Allow an ActiveStorage attachment to be removed via a form post
136
41
 
42
+ Attachments can already be removed by updating the attachment to be nil such as:
137
43
  ```ruby
138
- @user.highlights = [""]
139
- @user.highlights # => []
44
+ User.find(params[:id]).update!(avatar: nil)
140
45
  ```
141
46
 
142
- *Sean Doyle*
143
-
144
-
145
- ## Rails 7.0.0.rc3 (December 14, 2021) ##
146
-
147
- * No changes.
148
-
149
-
150
- ## Rails 7.0.0.rc2 (December 14, 2021) ##
151
-
152
- * No changes.
153
-
154
- ## Rails 7.0.0.rc1 (December 06, 2021) ##
47
+ However, a form cannot post a nil param, it can only post an empty string. But, posting an
48
+ empty string would result in an `ActiveSupport::MessageVerifier::InvalidSignature: mismatched digest`
49
+ error being raised, because it's being treated as a signed blob id.
155
50
 
156
- * `Add ActiveStorage::Blob.compose` to concatenate multiple blobs.
157
-
158
- *Gannon McGibbon*
159
-
160
- * Setting custom metadata on blobs are now persisted to remote storage.
161
-
162
- *joshuamsager*
163
-
164
- * Support direct uploads to multiple services.
165
-
166
- *Dmitry Tsepelev*
167
-
168
- * Invalid default content types are deprecated
169
-
170
- Blobs created with content_type `image/jpg`, `image/pjpeg`, `image/bmp`, `text/javascript` will now produce
171
- a deprecation warning, since these are not valid content types.
172
-
173
- These content types will be removed from the defaults in Rails 7.1.
174
-
175
- You can set `config.active_storage.silence_invalid_content_types_warning = true` to dismiss the warning.
176
-
177
- *Alex Ghiculescu*
178
-
179
- ## Rails 7.0.0.alpha2 (September 15, 2021) ##
180
-
181
- * No changes.
182
-
183
-
184
- ## Rails 7.0.0.alpha1 (September 15, 2021) ##
185
-
186
- * Emit Active Support instrumentation events from Active Storage analyzers.
187
-
188
- Fixes #42930
189
-
190
- *Shouichi Kamiya*
191
-
192
- * Add support for byte range requests
193
-
194
- *Tom Prats*
195
-
196
- * Attachments can be deleted after their association is no longer defined.
197
-
198
- Fixes #42514
199
-
200
- *Don Sisco*
51
+ Now, nil and an empty string are treated as a delete, which allows attachments to be removed via:
52
+ ```ruby
53
+ User.find(params[:id]).update!(params.require(:user).permit(:avatar))
201
54
 
202
- * Make `vips` the default variant processor for new apps.
55
+ ```
203
56
 
204
- See the upgrade guide for instructions on converting from `mini_magick` to `vips`. `mini_magick` is
205
- not deprecated, existing apps can keep using it.
57
+ *Nate Matykiewicz*
206
58
 
207
- *Breno Gazzola*
59
+ * Remove mini_mime usage in favour of marcel.
208
60
 
209
- * Deprecate `ActiveStorage::Current.host` in favor of `ActiveStorage::Current.url_options` which accepts
210
- a host, protocol and port.
61
+ We have two libraries that are have similar usage. This change removes
62
+ dependency on mini_mime and makes use of similar methods from marcel.
211
63
 
212
- *Santiago Bartesaghi*
64
+ *Vipul A M*
213
65
 
214
- * Allow using [IAM](https://cloud.google.com/storage/docs/access-control/signed-urls) when signing URLs with GCS.
66
+ * Allow destroying active storage variants
215
67
 
216
- ```yaml
217
- gcs:
218
- service: GCS
219
- ...
220
- iam: true
68
+ ```ruby
69
+ User.first.avatar.variant(resize_to_limit: [100, 100]).destroy
221
70
  ```
222
71
 
223
- *RRethy*
72
+ *Shouichi Kamiya*, *Yuichiro NAKAGAWA*, *Ryohei UEDA*
224
73
 
225
- * OpenSSL constants are now used for Digest computations.
74
+ * Add `sample_rate` to `ActiveStorage::Analyzer::AudioAnalyzer` output
226
75
 
227
- *Dirkjan Bussink*
76
+ *Matija Čupić*
228
77
 
229
- * Deprecate `config.active_storage.replace_on_assign_to_many`. Future versions of Rails
230
- will behave the same way as when the config is set to `true`.
78
+ * Remove deprecated `purge` and `purge_later` methods from the attachments association.
231
79
 
232
- *Santiago Bartesaghi*
80
+ *Rafael Mendonça França*
233
81
 
234
- * Remove deprecated methods: `build_after_upload`, `create_after_upload!` in favor of `create_and_upload!`,
235
- and `service_url` in favor of `url`.
82
+ * Remove deprecated behavior when assigning to a collection of attachments.
236
83
 
237
- *Santiago Bartesaghi*
84
+ Instead of appending to the collection, the collection is now replaced.
238
85
 
239
- * Add support of `strict_loading_by_default` to `ActiveStorage::Representations` controllers.
86
+ *Rafael Mendonça França*
240
87
 
241
- *Anton Topchii*, *Andrew White*
88
+ * Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
242
89
 
243
- * Allow to detach an attachment when record is not persisted.
90
+ *Rafael Mendonça França*
244
91
 
245
- *Jacopo Beschi*
92
+ * Remove deprecated invalid default content types in Active Storage configurations.
246
93
 
247
- * Use libvips instead of ImageMagick to analyze images when `active_storage.variant_processor = vips`.
94
+ *Rafael Mendonça França*
248
95
 
249
- *Breno Gazzola*
96
+ * Add missing preview event to `ActiveStorage::LogSubscriber`
250
97
 
251
- * Add metadata value for presence of video channel in video blobs.
98
+ A `preview` event is being instrumented in `ActiveStorage::Previewer`.
99
+ However it was not added inside ActiveStorage's LogSubscriber class.
252
100
 
253
- The `metadata` attribute of video blobs has a new boolean key named `video` that is set to
254
- `true` if the file has an video channel and `false` if it doesn't.
101
+ This will allow to have logs for when a preview happens
102
+ in the same fashion as all other ActiveStorage events such as
103
+ `upload` and `download` inside `Rails.logger`.
255
104
 
256
- *Breno Gazzola*
105
+ *Chedli Bourguiba*
257
106
 
258
- * Deprecate usage of `purge` and `purge_later` from the association extension.
107
+ * Fix retrieving rotation value from FFmpeg on version 5.0+.
259
108
 
260
- *Jacopo Beschi*
109
+ In FFmpeg version 5.0+ the rotation value has been removed from tags.
110
+ Instead the value can be found in side_data_list. Along with
111
+ this update it's possible to have values of -90, -270 to denote the video
112
+ has been rotated.
261
113
 
262
- * Passing extra parameters in `ActiveStorage::Blob#url` to S3 Client.
114
+ *Haroon Ahmed*
263
115
 
264
- This allows calls of `ActiveStorage::Blob#url` to have more interaction with
265
- the S3 Presigner, enabling, amongst other options, custom S3 domain URL
266
- Generation.
116
+ * Touch all corresponding model records after ActiveStorage::Blob is analyzed
267
117
 
268
- ```ruby
269
- blob = ActiveStorage::Blob.last
118
+ This fixes a race condition where a record can be requested and have a cache entry built, before
119
+ the initial `analyze_later` completes, which will not be invalidated until something else
120
+ updates the record. This also invalidates cache entries when a blob is re-analyzed, which
121
+ is helpful if a bug is fixed in an analyzer or a new analyzer is added.
270
122
 
271
- blob.url # => https://<bucket-name>.s3.<region>.amazonaws.com/<key>
272
- blob.url(virtual_host: true) # => # => https://<bucket-name>/<key>
273
- ```
123
+ *Nate Matykiewicz*
274
124
 
275
- *josegomezr*
125
+ * Add ability to use pre-defined variants when calling `preview` or
126
+ `representation` on an attachment.
276
127
 
277
- * Allow setting a `Cache-Control` on files uploaded to GCS.
128
+ ```ruby
129
+ class User < ActiveRecord::Base
130
+ has_one_attached :file do |attachable|
131
+ attachable.variant :thumb, resize_to_limit: [100, 100]
132
+ end
133
+ end
278
134
 
279
- ```yaml
280
- gcs:
281
- service: GCS
282
- ...
283
- cache_control: "public, max-age=3600"
135
+ <%= image_tag user.file.representation(:thumb) %>
284
136
  ```
285
137
 
286
- *maleblond*
287
-
288
- * The parameters sent to `ffmpeg` for generating a video preview image are now
289
- configurable under `config.active_storage.video_preview_arguments`.
138
+ *Richard Böhme*
290
139
 
291
- *Brendon Muir*
140
+ * Method `attach` always returns the attachments except when the record
141
+ is persisted, unchanged, and saving it fails, in which case it returns `nil`.
292
142
 
293
- * The ActiveStorage video previewer will now use scene change detection to generate
294
- better preview images (rather than the previous default of using the first frame
295
- of the video). This change requires FFmpeg v3.4+.
296
-
297
- *Jonathan Hefner*
143
+ *Santiago Bartesaghi*
298
144
 
299
- * Add support for ActiveStorage expiring URLs.
145
+ * Fixes multiple `attach` calls within transaction not uploading files correctly.
300
146
 
147
+ In the following example, the code failed to upload all but the last file to the configured service.
301
148
  ```ruby
302
- rails_blob_path(user.avatar, disposition: "attachment", expires_in: 30.minutes)
149
+ ActiveRecord::Base.transaction do
150
+ user.attachments.attach({
151
+ content_type: "text/plain",
152
+ filename: "dummy.txt",
153
+ io: ::StringIO.new("dummy"),
154
+ })
155
+ user.attachments.attach({
156
+ content_type: "text/plain",
157
+ filename: "dummy2.txt",
158
+ io: ::StringIO.new("dummy2"),
159
+ })
160
+ end
303
161
 
304
- <%= image_tag rails_blob_path(user.avatar.variant(resize: "100x100"), expires_in: 30.minutes) %>
162
+ assert_equal 2, user.attachments.count
163
+ assert user.attachments.first.service.exist?(user.attachments.first.key) # Fails
305
164
  ```
306
165
 
307
- If you want to set default expiration time for ActiveStorage URLs throughout your application, set `config.active_storage.urls_expire_in`.
308
-
309
- *aki77*
310
-
311
- * Allow to purge an attachment when record is not persisted for `has_many_attached`.
312
-
313
- *Jacopo Beschi*
314
-
315
- * Add `with_all_variant_records` method to eager load all variant records on an attachment at once.
316
- `with_attached_image` scope now eager loads variant records if using variant tracking.
317
-
318
- *Alex Ghiculescu*
319
-
320
- * Add metadata value for presence of audio channel in video blobs.
321
-
322
- The `metadata` attribute of video blobs has a new boolean key named `audio` that is set to
323
- `true` if the file has an audio channel and `false` if it doesn't.
324
-
325
- *Breno Gazzola*
326
-
327
- * Adds analyzer for audio files.
328
-
329
- *Breno Gazzola*
166
+ This was addressed by keeping track of the subchanges pending upload, and uploading them
167
+ once the transaction is committed.
330
168
 
331
- * Respect Active Record's primary_key_type in Active Storage migrations.
169
+ Fixes #41661
332
170
 
333
- *fatkodima*
171
+ *Santiago Bartesaghi*, *Bruno Vezoli*, *Juan Roig*, *Abhay Nikam*
334
172
 
335
- * Allow `expires_in` for ActiveStorage signed ids.
173
+ * Raise an exception if `config.active_storage.service` is not set.
336
174
 
337
- *aki77*
175
+ If Active Storage is configured and `config.active_storage.service` is not
176
+ set in the respective environment's configuration file, then an exception
177
+ is raised with a meaningful message when attempting to use Active Storage.
338
178
 
339
- * Allow to purge an attachment when record is not persisted for `has_one_attached`.
179
+ *Ghouse Mohamed*
340
180
 
341
- *Jacopo Beschi*
181
+ * Fixes proxy downloads of files over 5mb
342
182
 
343
- * Add a load hook called `active_storage_variant_record` (providing `ActiveStorage::VariantRecord`)
344
- to allow for overriding aspects of the `ActiveStorage::VariantRecord` class. This makes
345
- `ActiveStorage::VariantRecord` consistent with `ActiveStorage::Blob` and `ActiveStorage::Attachment`
346
- that already have load hooks.
347
-
348
- *Brendon Muir*
349
-
350
- * `ActiveStorage::PreviewError` is raised when a previewer is unable to generate a preview image.
351
-
352
- *Alex Robbin*
353
-
354
- * Add `ActiveStorage::Streaming` module that can be included in a controller to get access to `#send_blob_stream`,
355
- which wraps the new `ActionController::Base#send_stream` method to stream a blob from cloud storage:
356
-
357
- ```ruby
358
- class MyPublicBlobsController < ApplicationController
359
- include ActiveStorage::SetBlob, ActiveStorage::Streaming
360
-
361
- def show
362
- http_cache_forever(public: true) do
363
- send_blob_stream @blob, disposition: params[:disposition]
364
- end
365
- end
366
- end
367
- ```
183
+ Previously, trying to view and/or download files larger than 5mb stored in
184
+ services like S3 via proxy mode could return corrupted files at around
185
+ 5.2mb or cause random halts in the download. Now,
186
+ `ActiveStorage::Blobs::ProxyController` correctly handles streaming these
187
+ larger files from the service to the client without any issues.
368
188
 
369
- *DHH*
189
+ Fixes #44679
370
190
 
371
- * Add ability to use pre-defined variants.
191
+ *Felipe Raul*
372
192
 
373
- ```ruby
374
- class User < ActiveRecord::Base
375
- has_one_attached :avatar do |attachable|
376
- attachable.variant :thumb, resize: "100x100"
377
- attachable.variant :medium, resize: "300x300", monochrome: true
378
- end
379
- end
193
+ * Saving attachment(s) to a record returns the blob/blobs object
380
194
 
381
- class Gallery < ActiveRecord::Base
382
- has_many_attached :photos do |attachable|
383
- attachable.variant :thumb, resize: "100x100"
384
- attachable.variant :medium, resize: "300x300", monochrome: true
385
- end
386
- end
195
+ Previously, saving attachments did not return the blob/blobs that
196
+ were attached. Now, saving attachments to a record with `#attach`
197
+ method returns the blob or array of blobs that were attached to
198
+ the record. If it fails to save the attachment(s), then it returns
199
+ `false`.
387
200
 
388
- <%= image_tag user.avatar.variant(:thumb) %>
389
- ```
201
+ *Ghouse Mohamed*
390
202
 
391
- *fatkodima*
203
+ * Don't stream responses in redirect mode
392
204
 
393
- * After setting `config.active_storage.resolve_model_to_route = :rails_storage_proxy`
394
- `rails_blob_path` and `rails_representation_path` will generate proxy URLs by default.
205
+ Previously, both redirect mode and proxy mode streamed their
206
+ responses which caused a new thread to be created, and could end
207
+ up leaking connections in the connection pool. But since redirect
208
+ mode doesn't actually send any data, it doesn't need to be
209
+ streamed.
395
210
 
396
- *Ali Ismayilov*
211
+ *Luke Lau*
397
212
 
398
- * Declare `ActiveStorage::FixtureSet` and `ActiveStorage::FixtureSet.blob` to
399
- improve fixture integration.
213
+ * Safe for direct upload on Libraries or Frameworks
400
214
 
401
- *Sean Doyle*
215
+ Enable the use of custom headers during direct uploads, which allows for
216
+ the inclusion of Authorization bearer tokens or other forms of authorization
217
+ tokens through headers.
402
218
 
219
+ *Radamés Roriz*
403
220
 
404
- Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/activestorage/CHANGELOG.md) for previous changes.
221
+ Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-stable/activestorage/CHANGELOG.md) for previous changes.
data/MIT-LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2017-2022 David Heinemeier Hansson, Basecamp
1
+ Copyright (c) David Heinemeier Hansson, 37signals LLC
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
@@ -6,11 +6,11 @@ Files can be uploaded from the server to the cloud or directly from the client t
6
6
 
7
7
  Image files can furthermore be transformed using on-demand variants for quality, aspect ratio, size, or any other [MiniMagick](https://github.com/minimagick/minimagick) or [Vips](https://www.rubydoc.info/gems/ruby-vips/Vips/Image) supported transformation.
8
8
 
9
- You can read more about Active Storage in the [Active Storage Overview](https://edgeguides.rubyonrails.org/active_storage_overview.html) guide.
9
+ You can read more about Active Storage in the [Active Storage Overview](https://guides.rubyonrails.org/active_storage_overview.html) guide.
10
10
 
11
11
  ## Compared to other storage solutions
12
12
 
13
- A key difference to how Active Storage works compared to other attachment solutions in Rails is through the use of built-in [Blob](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/blob.rb) and [Attachment](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/attachment.rb) models (backed by Active Record). This means existing application models do not need to be modified with additional columns to associate with files. Active Storage uses polymorphic associations via the `Attachment` join model, which then connects to the actual `Blob`.
13
+ A key difference to how Active Storage works compared to other attachment solutions in \Rails is through the use of built-in [Blob](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/blob.rb) and [Attachment](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/attachment.rb) models (backed by Active Record). This means existing application models do not need to be modified with additional columns to associate with files. Active Storage uses polymorphic associations via the `Attachment` join model, which then connects to the actual `Blob`.
14
14
 
15
15
  `Blob` models store attachment metadata (filename, content-type, etc.), and their identifier key in the storage service. Blob models do not store the actual binary data. They are intended to be immutable in spirit. One file, one blob. You can associate the same blob with multiple application models as well. And if you want to do transformations of a given `Blob`, the idea is that you'll simply create a new one, rather than attempt to mutate the existing one (though of course you can delete the previous version later if you don't need it).
16
16
 
@@ -144,11 +144,11 @@ Active Storage, with its included JavaScript library, supports uploading directl
144
144
 
145
145
  1. Include the Active Storage JavaScript in your application's JavaScript bundle or reference it directly.
146
146
 
147
- Requiring directly without bundling through the asset pipeline in the application html with autostart:
147
+ Requiring directly without bundling through the asset pipeline in the application HTML with autostart:
148
148
  ```html
149
149
  <%= javascript_include_tag "activestorage" %>
150
150
  ```
151
- Requiring via importmap-rails without bundling through the asset pipeline in the application html without autostart as ESM:
151
+ Requiring via importmap-rails without bundling through the asset pipeline in the application HTML without autostart as ESM:
152
152
  ```ruby
153
153
  # config/importmap.rb
154
154
  pin "@rails/activestorage", to: "activestorage.esm.js"
@@ -508,7 +508,7 @@ function toArray(value) {
508
508
  }
509
509
 
510
510
  class BlobRecord {
511
- constructor(file, checksum, url) {
511
+ constructor(file, checksum, url, customHeaders = {}) {
512
512
  this.file = file;
513
513
  this.attributes = {
514
514
  filename: file.name,
@@ -522,6 +522,9 @@ class BlobRecord {
522
522
  this.xhr.setRequestHeader("Content-Type", "application/json");
523
523
  this.xhr.setRequestHeader("Accept", "application/json");
524
524
  this.xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
525
+ Object.keys(customHeaders).forEach((headerKey => {
526
+ this.xhr.setRequestHeader(headerKey, customHeaders[headerKey]);
527
+ }));
525
528
  const csrfToken = getMetaValue("csrf-token");
526
529
  if (csrfToken != undefined) {
527
530
  this.xhr.setRequestHeader("X-CSRF-Token", csrfToken);
@@ -604,11 +607,12 @@ class BlobUpload {
604
607
  let id = 0;
605
608
 
606
609
  class DirectUpload {
607
- constructor(file, url, delegate) {
610
+ constructor(file, url, delegate, customHeaders = {}) {
608
611
  this.id = ++id;
609
612
  this.file = file;
610
613
  this.url = url;
611
614
  this.delegate = delegate;
615
+ this.customHeaders = customHeaders;
612
616
  }
613
617
  create(callback) {
614
618
  FileChecksum.create(this.file, ((error, checksum) => {
@@ -616,7 +620,7 @@ class DirectUpload {
616
620
  callback(error);
617
621
  return;
618
622
  }
619
- const blob = new BlobRecord(this.file, checksum, this.url);
623
+ const blob = new BlobRecord(this.file, checksum, this.url, this.customHeaders);
620
624
  notify(this.delegate, "directUploadWillCreateBlobWithXHR", blob.xhr);
621
625
  blob.create((error => {
622
626
  if (error) {
@@ -841,4 +845,4 @@ function autostart() {
841
845
 
842
846
  setTimeout(autostart, 1);
843
847
 
844
- export { DirectUpload, start };
848
+ export { DirectUpload, DirectUploadController, DirectUploadsController, start };