activestorage 6.1.7 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4f14b62a36e4ea3aa6a39126b4ca8b9f9e1316864d769d4e69b049be47c0c37
-  data.tar.gz: 0add8a6660b7c94ba0b86845ef1fdf657856cb7c7ec64e684e1ff760c9298c45
+  metadata.gz: 3f09e751b9896e3e99bda5b07a2f946e14cc08a8b25b29b872c85d918fa906c1
+  data.tar.gz: f10ad7fbf13f79f91b690a6417a7f035038f62f2c82ee39a94070566773c2bd5
 SHA512:
-  metadata.gz: ad61f809370fb457cca4a07e4ffabe97bfd5a1a83901fb11d65da4473b748e4ba34238aca9aa0a40b658856a3e892824de709f57360d78a4c0b34295fc63836d
-  data.tar.gz: b76216dae6aa1f2844125a5a753b5ab7e008a07c4a027640766f2a03097f423267418b25ca2602027a547a107fc4107bd602ab4bdf2678e59731b4c571e309b8
+  metadata.gz: d5fc945abbfdfbe05b6aeafa393ef6b6995fa1c0e6f908006dc52e570ba9d17e982f40df652814b95e5da0db68a7bacf8f0a7820de2bec928fbaf1519fed00bd
+  data.tar.gz: 627a0bf0f41c633ce7f3c098b264ffafebe6d081b2aea39ef0c9e30985fe06fb167b192abfd5fd5d729cef9592abe2acade5760ea792089373482dce1183b867

data/CHANGELOG.md

@@ -1,376 +1,252 @@
-## Rails 6.1.7 (September 09, 2022) ##
-
-*   Respect Active Record's primary_key_type in Active Storage migrations. Backported from 7.0.
-
-    *fatkodima*
-
-## Rails 6.1.6.1 (July 12, 2022) ##
-
-*   No changes.
-
-
-## Rails 6.1.6 (May 09, 2022) ##
+## Rails 7.1.0 (October 05, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.5.1 (April 26, 2022) ##
+## Rails 7.1.0.rc2 (October 01, 2023) ##
 
 *   No changes.
 
 
-## Rails 6.1.5 (March 09, 2022) ##
-
-*   Attachments can be deleted after their association is no longer defined.
-
-    Fixes #42514
-
-    *Don Sisco*
-
-
-## Rails 6.1.4.7 (March 08, 2022) ##
-
-*   Added image transformation validation via configurable allow-list.
-    
-    Variant now offers a configurable allow-list for
-    transformation methods in addition to a configurable deny-list for arguments.
-    
-    [CVE-2022-21831]
-
-
-## Rails 6.1.4.6 (February 11, 2022) ##
-
-*   No changes.
-
-
-## Rails 6.1.4.5 (February 11, 2022) ##
-
-*   No changes.
-
-
-## Rails 6.1.4.4 (December 15, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.4.3 (December 14, 2021) ##
-
-*   No changes.
+## Rails 7.1.0.rc1 (September 27, 2023) ##
 
+*   Add `expires_at` option to `ActiveStorage::Blob#signed_id`.
 
-## Rails 6.1.4.2 (December 14, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.4.1 (August 19, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.4 (June 24, 2021) ##
-
-*   The parameters sent to `ffmpeg` for generating a video preview image are now
-    configurable under `config.active_storage.video_preview_arguments`.
-
-    *Brendon Muir*
+    ```ruby
+    rails_blob_path(user.avatar, disposition: "attachment", expires_at: 30.minutes.from_now)
+    <%= image_tag rails_blob_path(user.avatar.variant(resize: "100x100"), expires_at: 30.minutes.from_now) %>
+    ```
 
-*   Fix Active Storage update task when running in an engine.
+    *Aki*
 
-    *Justin Malčić*
+*   Allow attaching File and Pathname when assigning attributes, e.g.
 
-*   Don't raise an error if the mime type is not recognized.
+    ```ruby
+    User.create!(avatar: File.open("image.jpg"))
+    User.create!(avatar: file_fixture("image.jpg"))
+    ```
 
-    Fixes #41777.
+    *Dorian Marié*
 
-    *Alex Ghiculescu*
 
-*   `ActiveStorage::PreviewError` is raised when a previewer is unable to generate a preview image.
+## Rails 7.1.0.beta1 (September 13, 2023) ##
 
-    *Alex Robbin*
+*   Disables the session in `ActiveStorage::Blobs::ProxyController`
+    and `ActiveStorage::Representations::ProxyController`
+    in order to allow caching by default in some CDNs as CloudFlare
 
-*   respond with 404 given invalid variation key when asking for representations.
+    Fixes #44136
 
-    *George Claghorn*
+    *Bruno Prieto*
 
-*   `Blob` creation shouldn't crash if no service selected.
+*   Add `tags` to `ActiveStorage::Analyzer::AudioAnalyzer` output
 
-    *Alex Ghiculescu*
+    *Keaton Roux*
 
+*   Add an option to preprocess variants
 
-## Rails 6.1.3.2 (May 05, 2021) ##
+    ActiveStorage variants are processed on the fly when they are needed but
+    sometimes we're sure that they are accessed and want to processed them
+    upfront.
 
-*   No changes.
+    `preprocessed` option is added when declaring variants.
 
+    ```
+    class User < ApplicationRecord
+      has_one_attached :avatar do |attachable|
+        attachable.variant :thumb, resize_to_limit: [100, 100], preprocessed: true
+      end
+    end
+    ```
 
-## Rails 6.1.3.1 (March 26, 2021) ##
+    *Shouichi Kamiya*
 
-*  Marcel is upgraded to version 1.0.0 to avoid a dependency on GPL-licensed
-   mime types data.
+*   Fix variants not included when eager loading multiple records containing a single attachment
 
-   *George Claghorn*
+    When using the `with_attached_#{name}` scope for a `has_one_attached` relation,
+    attachment variants were not eagerly loaded.
 
+    *Russell Porter*
 
-## Rails 6.1.3 (February 17, 2021) ##
+*   Allow an ActiveStorage attachment to be removed via a form post
 
-*   No changes.
+    Attachments can already be removed by updating the attachment to be nil such as:
+    ```ruby
+    User.find(params[:id]).update!(avatar: nil)
+    ```
 
+    However, a form cannot post a nil param, it can only post an empty string. But, posting an
+    empty string would result in an `ActiveSupport::MessageVerifier::InvalidSignature: mismatched digest`
+    error being raised, because it's being treated as a signed blob id.
 
-## Rails 6.1.2.1 (February 10, 2021) ##
+    Now, nil and an empty string are treated as a delete, which allows attachments to be removed via:
+    ```ruby
+    User.find(params[:id]).update!(params.require(:user).permit(:avatar))
 
-*   No changes.
+    ```
 
+    *Nate Matykiewicz*
 
-## Rails 6.1.2 (February 09, 2021) ##
+*   Remove mini_mime usage in favour of marcel.
 
-*   No changes.
+    We have two libraries that are have similar usage. This change removes
+    dependency on mini_mime and makes use of similar methods from marcel.
 
+    *Vipul A M*
 
-## Rails 6.1.1 (January 07, 2021) ##
+*   Allow destroying active storage variants
 
-*   Fix S3 multipart uploads when threshold is larger than file.
+    ```ruby
+    User.first.avatar.variant(resize_to_limit: [100, 100]).destroy
+    ```
 
-    *Matt Muller*
+    *Shouichi Kamiya*, *Yuichiro NAKAGAWA*, *Ryohei UEDA*
 
+*   Add `sample_rate` to `ActiveStorage::Analyzer::AudioAnalyzer` output
 
-## Rails 6.1.0 (December 09, 2020) ##
+    *Matija Čupić*
 
-*   Change default queue name of the analysis (`:active_storage_analysis`) and
-    purge (`:active_storage_purge`) jobs to be the job adapter's default (`:default`).
+*   Remove deprecated `purge` and `purge_later` methods from the attachments association.
 
     *Rafael Mendonça França*
 
-*   Implement `strict_loading` on ActiveStorage associations.
+*   Remove deprecated behavior when assigning to a collection of attachments.
 
-    *David Angulo*
-
-*   Remove deprecated support to pass `:combine_options` operations to `ActiveStorage::Transformers::ImageProcessing`.
+    Instead of appending to the collection, the collection is now replaced.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated `ActiveStorage::Transformers::MiniMagickTransformer`.
+*   Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated `config.active_storage.queue`.
+*   Remove deprecated invalid default content types in Active Storage configurations.
 
     *Rafael Mendonça França*
 
-*   Remove deprecated `ActiveStorage::Downloading`.
+*   Add missing preview event to `ActiveStorage::LogSubscriber`
 
-    *Rafael Mendonça França*
+    A `preview` event is being instrumented in `ActiveStorage::Previewer`.
+    However it was not added inside ActiveStorage's LogSubscriber class.
 
-*   Add per-environment configuration support
+    This will allow to have logs for when a preview happens
+    in the same fashion as all other ActiveStorage events such as
+    `upload` and `download` inside `Rails.logger`.
 
-    *Pietro Moro*
+    *Chedli Bourguiba*
 
-*   The Poppler PDF previewer renders a preview image using the original
-    document's crop box rather than its media box, hiding print margins. This
-    matches the behavior of the MuPDF previewer.
+*   Fix retrieving rotation value from FFmpeg on version 5.0+.
 
-    *Vincent Robert*
+    In FFmpeg version 5.0+ the rotation value has been removed from tags.
+    Instead the value can be found in side_data_list. Along with
+    this update it's possible to have values of -90, -270 to denote the video
+    has been rotated.
 
-*   Touch parent model when an attachment is purged.
+    *Haroon Ahmed*
 
-    *Víctor Pérez Rodríguez*
+*   Touch all corresponding model records after ActiveStorage::Blob is analyzed
 
-*   Files can now be served by proxying them from the underlying storage service
-    instead of redirecting to a signed service URL. Use the
-    `rails_storage_proxy_path` and `_url` helpers to proxy an attached file:
+    This fixes a race condition where a record can be requested and have a cache entry built, before
+    the initial `analyze_later` completes, which will not be invalidated until something else
+    updates the record. This also invalidates cache entries when a blob is re-analyzed, which
+    is helpful if a bug is fixed in an analyzer or a new analyzer is added.
 
-    ```erb
-    <%= image_tag rails_storage_proxy_path(@user.avatar) %>
-    ```
+    *Nate Matykiewicz*
 
-    To proxy by default, set `config.active_storage.resolve_model_to_route`:
+*   Add ability to use pre-defined variants when calling `preview` or
+    `representation` on an attachment.
 
     ```ruby
-    # Proxy attached files instead.
-    config.active_storage.resolve_model_to_route = :rails_storage_proxy
-    ```
-
-    ```erb
-    <%= image_tag @user.avatar %>
-    ```
-
-    To redirect to a signed service URL when the default file serving strategy
-    is set to proxying, use the `rails_storage_redirect_path` and `_url` helpers:
+    class User < ActiveRecord::Base
+      has_one_attached :file do |attachable|
+        attachable.variant :thumb, resize_to_limit: [100, 100]
+      end
+    end
 
-    ```erb
-    <%= image_tag rails_storage_redirect_path(@user.avatar) %>
+    <%= image_tag user.file.representation(:thumb) %>
     ```
 
-    *Jonathan Fleckenstein*
-
-*   Add `config.active_storage.web_image_content_types` to allow applications
-    to add content types (like `image/webp`) in which variants can be processed,
-    instead of letting those images be converted to the fallback PNG format.
-
-    *Jeroen van Haperen*
-
-*   Add support for creating variants of `WebP` images out of the box.
-
-    *Dino Maric*
-
-*   Only enqueue analysis jobs for blobs with non-null analyzer classes.
-
-    *Gannon McGibbon*
-
-*   Previews are created on the same service as the original blob.
-
-    *Peter Zhu*
-
-*   Remove unused `disposition` and `content_type` query parameters for `DiskService`.
-
-    *Peter Zhu*
-
-*   Use `DiskController` for both public and private files.
-
-    `DiskController` is able to handle multiple services by adding a
-    `service_name` field in the generated URL in `DiskService`.
-
-    *Peter Zhu*
-
-*   Variants are tracked in the database to avoid existence checks in the storage service.
-
-    *George Claghorn*
-
-*   Deprecate `service_url` methods in favour of `url`.
-
-    Deprecate `Variant#service_url` and `Preview#service_url` to instead use
-    `#url` method to be consistent with `Blob`.
-
-    *Peter Zhu*
-
-*   Permanent URLs for public storage blobs.
-
-    Services can be configured in `config/storage.yml` with a new key
-    `public: true | false` to indicate whether a service holds public
-    blobs or private blobs. Public services will always return a permanent URL.
+    *Richard Böhme*
 
-    Deprecates `Blob#service_url` in favor of `Blob#url`.
+*   Method `attach` always returns the attachments except when the record
+    is persisted, unchanged, and saving it fails, in which case it returns `nil`.
 
-    *Peter Zhu*
+    *Santiago Bartesaghi*
 
-*   Make services aware of configuration names.
-
-    *Gannon McGibbon*
-
-*   The `Content-Type` header is set on image variants when they're uploaded to third-party storage services.
-
-    *Kyle Ribordy*
-
-*   Allow storage services to be configured per attachment.
+*   Fixes multiple `attach` calls within transaction not uploading files correctly.
 
+    In the following example, the code failed to upload all but the last file to the configured service.
     ```ruby
-    class User < ActiveRecord::Base
-      has_one_attached :avatar, service: :s3
-    end
-
-    class Gallery < ActiveRecord::Base
-      has_many_attached :photos, service: :s3
+    ActiveRecord::Base.transaction do
+      user.attachments.attach({
+        content_type: "text/plain",
+        filename: "dummy.txt",
+        io: ::StringIO.new("dummy"),
+      })
+      user.attachments.attach({
+        content_type: "text/plain",
+        filename: "dummy2.txt",
+        io: ::StringIO.new("dummy2"),
+      })
     end
-    ```
-
-    *Dmitry Tsepelev*
 
-*   You can optionally provide a custom blob key when attaching a new file:
-
-    ```ruby
-    user.avatar.attach key: "avatars/#{user.id}.jpg",
-      io: io, content_type: "image/jpeg", filename: "avatar.jpg"
+    assert_equal 2, user.attachments.count
+    assert user.attachments.first.service.exist?(user.attachments.first.key)  # Fails
     ```
 
-    Active Storage will store the blob's data on the configured service at the provided key.
-
-    *George Claghorn*
-
-*   Replace `Blob.create_after_upload!` with `Blob.create_and_upload!` and deprecate the former.
-
-    `create_after_upload!` has been removed since it could lead to data
-    corruption by uploading to a key on the storage service which happened to
-    be already taken. Creating the record would then correctly raise a
-    database uniqueness exception but the stored object would already have
-    overwritten another. `create_and_upload!` swaps the order of operations
-    so that the key gets reserved up-front or the uniqueness error gets raised,
-    before the upload to a key takes place.
+    This was addressed by keeping track of the subchanges pending upload, and uploading them
+    once the transaction is committed.
 
-    *Julik Tarkhanov*
+    Fixes #41661
 
-*   Set content disposition in direct upload using `filename` and `disposition` parameters to `ActiveStorage::Service#headers_for_direct_upload`.
+    *Santiago Bartesaghi*, *Bruno Vezoli*, *Juan Roig*, *Abhay Nikam*
 
-    *Peter Zhu*
+*   Raise an exception if `config.active_storage.service` is not set.
 
-*   Allow record to be optionally passed to blob finders to make sharding
-    easier.
+    If Active Storage is configured and `config.active_storage.service` is not
+    set in the respective environment's configuration file, then an exception
+    is raised with a meaningful message when attempting to use Active Storage.
 
-    *Gannon McGibbon*
+    *Ghouse Mohamed*
 
-*   Switch from `azure-storage` gem to `azure-storage-blob` gem for Azure service.
+*   Fixes proxy downloads of files over 5mb
 
-    *Peter Zhu*
+    Previously, trying to view and/or download files larger than 5mb stored in
+    services like S3 via proxy mode could return corrupted files at around
+    5.2mb or cause random halts in the download. Now,
+    `ActiveStorage::Blobs::ProxyController` correctly handles streaming these
+    larger files from the service to the client without any issues.
 
-*   Add `config.active_storage.draw_routes` to disable Active Storage routes.
+    Fixes #44679
 
-    *Gannon McGibbon*
+    *Felipe Raul*
 
-*   Image analysis is skipped if ImageMagick returns an error.
+*   Saving attachment(s) to a record returns the blob/blobs object
 
-    `ActiveStorage::Analyzer::ImageAnalyzer#metadata` would previously raise a
-    `MiniMagick::Error`, which caused persistent `ActiveStorage::AnalyzeJob`
-    failures. It now logs the error and returns `{}`, resulting in no metadata
-    being added to the offending image blob.
+    Previously, saving attachments did not return the blob/blobs that
+    were attached. Now, saving attachments to a record with `#attach`
+    method returns the blob or array of blobs that were attached to
+    the record. If it fails to save the attachment(s), then it returns
+    `false`.
 
-    *George Claghorn*
+    *Ghouse Mohamed*
 
-*   Method calls on singular attachments return `nil` when no file is attached.
+*   Don't stream responses in redirect mode
 
-    Previously, assuming the following User model, `user.avatar.filename` would
-    raise a `Module::DelegationError` if no avatar was attached:
+    Previously, both redirect mode and proxy mode streamed their
+    responses which caused a new thread to be created, and could end
+    up leaking connections in the connection pool. But since redirect
+    mode doesn't actually send any data, it doesn't need to be
+    streamed.
 
-    ```ruby
-    class User < ApplicationRecord
-      has_one_attached :avatar
-    end
-    ```
-
-    They now return `nil`.
-
-    *Matthew Tanous*
-
-*   The mirror service supports direct uploads.
+    *Luke Lau*
 
-    New files are directly uploaded to the primary service. When a
-    directly-uploaded file is attached to a record, a background job is enqueued
-    to copy it to each secondary service.
-
-    Configure the queue used to process mirroring jobs by setting
-    `config.active_storage.queues.mirror`. The default is `:active_storage_mirror`.
-
-    *George Claghorn*
-
-*   The S3 service now permits uploading files larger than 5 gigabytes.
-
-    When uploading a file greater than 100 megabytes in size, the service
-    transparently switches to [multipart uploads](https://docs.aws.amazon.com/AmazonS3/latest/dev/mpuoverview.html)
-    using a part size computed from the file's total size and S3's part count limit.
-
-    No application changes are necessary to take advantage of this feature. You
-    can customize the default 100 MB multipart upload threshold in your S3
-    service's configuration:
-
-    ```yaml
-    production:
-      service: s3
-      access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
-      secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
-      region: us-east-1
-      bucket: my-bucket
-      upload:
-        multipart_threshold: <%= 250.megabytes %>
-    ```
+*   Safe for direct upload on Libraries or Frameworks
 
-    *George Claghorn*
+    Enable the use of custom headers during direct uploads, which allows for
+    the inclusion of Authorization bearer tokens or other forms of authorization
+    tokens through headers.
 
+    *Radamés Roriz*
 
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/activestorage/CHANGELOG.md) for previous changes.
+Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-stable/activestorage/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2022 David Heinemeier Hansson, Basecamp
+Copyright (c) David Heinemeier Hansson, 37signals LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -6,11 +6,11 @@ Files can be uploaded from the server to the cloud or directly from the client t
 
 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.
 
-You can read more about Active Storage in the [Active Storage Overview](https://edgeguides.rubyonrails.org/active_storage_overview.html) guide.
+You can read more about Active Storage in the [Active Storage Overview](https://guides.rubyonrails.org/active_storage_overview.html) guide.
 
 ## Compared to other storage solutions
 
-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`.
+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`.
 
 `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).
 
@@ -32,7 +32,7 @@ class User < ApplicationRecord
 end
 
 # Attach an avatar to the user.
-user.avatar.attach(io: File.open("/path/to/face.jpg"), filename: "face.jpg", content_type: "image/jpg")
+user.avatar.attach(io: File.open("/path/to/face.jpg"), filename: "face.jpg", content_type: "image/jpeg")
 
 # Does the user have an avatar?
 user.avatar.attached? # => true
@@ -88,8 +88,7 @@ class MessagesController < ApplicationController
   end
 
   def create
-    message = Message.create! params.require(:message).permit(:title, :content)
-    message.images.attach(params[:message][:images])
+    message = Message.create! params.require(:message).permit(:title, :content, images: [])
     redirect_to message
   end
 
@@ -124,27 +123,42 @@ When the application is configured to proxy files by default, use the `rails_sto
 
 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.
 
-Explicitly proxy attachments using the `rails_storage_proxy_path` and `_url` route helpers:
-
-```erb
-<%= image_tag rails_storage_proxy_path(@user.avatar) %>
-```
-
-Or configure Active Storage to use proxying by default:
+You can configure Active Storage to use proxying by default:
 
 ```ruby
 # config/initializers/active_storage.rb
 Rails.application.config.active_storage.resolve_model_to_route = :rails_storage_proxy
 ```
 
+Or if you want to explicitly proxy specific attachments there are URL helpers you can use in the form of `rails_storage_proxy_path` and `rails_storage_proxy_url`.
+
+```erb
+<%= image_tag rails_storage_proxy_path(@user.avatar) %>
+```
+
 ## Direct uploads
 
 Active Storage, with its included JavaScript library, supports uploading directly from the client to the cloud.
 
 ### Direct upload installation
 
-1. Include `activestorage.js` in your application's JavaScript bundle.
+1. Include the Active Storage JavaScript in your application's JavaScript bundle or reference it directly.
 
+    Requiring directly without bundling through the asset pipeline in the application HTML with autostart:
+    ```erb
+    <%= javascript_include_tag "activestorage" %>
+    ```
+    Requiring via importmap-rails without bundling through the asset pipeline in the application HTML without autostart as ESM:
+    ```ruby
+    # config/importmap.rb
+    pin "@rails/activestorage", to: "activestorage.esm.js"
+    ```
+    ```html
+    <script type="module-shim">
+      import * as ActiveStorage from "@rails/activestorage"
+      ActiveStorage.start()
+    </script>
+    ```
     Using the asset pipeline:
     ```js
     //= require activestorage
@@ -156,7 +170,7 @@ Active Storage, with its included JavaScript library, supports uploading directl
     ```
 2. Annotate file inputs with the direct upload URL.
 
-    ```ruby
+    ```erb
     <%= form.file_field :attachments, multiple: true, direct_upload: true %>
     ```
 3. That's it! Uploads begin upon form submission.
@@ -185,7 +199,7 @@ API documentation is at:
 
 * https://api.rubyonrails.org
 
-Bug reports for the Ruby on Rails project can be filed here:
+Bug reports for the Ruby on \Rails project can be filed here:
 
 * https://github.com/rails/rails/issues