activestorage 7.0.4 → 7.1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d8fadbd6953b6f7df95ba3dd293c0f720d5be32938a81c1395f460f43265d7
-  data.tar.gz: 432a78ced992c5717986d2a9bdb08ca21216a73e18246dfd86ce22b3c1c250cc
+  metadata.gz: 206c165931991ed4701825d28d46e636a5a9aa38ff25d196f14906246d95c557
+  data.tar.gz: de61985ef1a441eeb98646f9f0231693ee3142f3d9c9793fd7e38678e08686c7
 SHA512:
-  metadata.gz: de7317b086cf3d36aaf9a256ebac4cb7ebeb49e5087edbe665c49c17bc28544878d3bb4edc7cff271a4428ca4a57ea7ec66ca454e08aabebed137709c2e0a7ae
-  data.tar.gz: 0c8c8623a5c4e071938ae50add7e199274dc874964d1cf64f8ffff1f863f905392e54bb1dca24d0e1cd44f87c099d367080b144da265094bad861c58bb9b709b
+  metadata.gz: fed89deed587674a3ea944cc1a02f8bb09c698409cc724cc1e127cf704b7ec777f45682eb88b6f455b251ceb576be00f0504c65086b0727af65cd70f1648bf0e
+  data.tar.gz: 678cfe23e61e1a46039cbfedb20777103203e1fdba5455a47f49ba8e21a18d2887882d1eb85d7151af4424e04da4334eee3b0b7de198dedbde73597f378899ad

data/CHANGELOG.md

@@ -1,347 +1,358 @@
-## Rails 7.0.4 (September 09, 2022) ##
+## Rails 7.1.5.1 (December 10, 2024) ##
 
-*   Fixes proxy downloads of files over 5MiB
+*   No changes.
 
-    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.
 
-    Fixes #44679
+## Rails 7.1.5 (October 30, 2024) ##
 
-    *Felipe Raul*
+*   No changes.
 
-## Rails 7.0.3.1 (July 12, 2022) ##
+
+## Rails 7.1.4.2 (October 23, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.0.3 (May 09, 2022) ##
+## Rails 7.1.4.1 (October 15, 2024) ##
 
-*   Don't stream responses in redirect mode
+*   No changes.
 
-    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.
 
-    *Luke Lau*
+## Rails 7.1.4 (August 22, 2024) ##
 
-## Rails 7.0.2.4 (April 26, 2022) ##
+*   Fixes race condition for multiple preprocessed video variants.
 
-*   No changes.
+    *Justin Searls*
 
 
-## Rails 7.0.2.3 (March 08, 2022) ##
+## Rails 7.1.3.4 (June 04, 2024) ##
 
-*   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]
+*   No changes.
 
 
-## Rails 7.0.2.2 (February 11, 2022) ##
+## Rails 7.1.3.3 (May 16, 2024) ##
 
 *   No changes.
 
-## Rails 7.0.2.1 (February 11, 2022) ##
+
+## Rails 7.1.3.2 (February 21, 2024) ##
 
 *   No changes.
 
 
-## Rails 7.0.2 (February 08, 2022) ##
+## Rails 7.1.3.1 (February 21, 2024) ##
 
-*   Revert the ability to pass `service_name` param to `DirectUploadsController` which was introduced
-    in 7.0.0.
+*   No changes.
 
-    That change caused a lot of problems to upgrade Rails applications so we decided to remove it
-    while in work in a more backwards compatible implementation.
 
-    *Gannon McGibbon*
+## Rails 7.1.3 (January 16, 2024) ##
 
-*   Allow applications to opt out of precompiling Active Storage JavaScript assets.
+*   Fix N+1 query when fetching preview images for non-image assets.
 
-    *jlestavel*
+    *Aaron Patterson & Justin Searls*
 
+*   Fix all Active Storage database related models to respect
+    `ActiveRecord::Base.table_name_prefix` configuration.
 
-## Rails 7.0.1 (January 06, 2022) ##
+    *Chedli Bourguiba*
 
-*   No changes.
+*   Fix `ActiveStorage::Representations::ProxyController` not returning the proper
+    preview image variant for previewable files.
 
+    *Chedli Bourguiba*
 
-## Rails 7.0.0 (December 15, 2021) ##
+*   Fix `ActiveStorage::Representations::ProxyController` to proxy untracked
+    variants.
 
-*   Support transforming empty-ish `has_many_attached` value into `[]` (e.g. `[""]`).
+    *Chedli Bourguiba*
 
-    ```ruby
-    @user.highlights = [""]
-    @user.highlights # => []
-    ```
+*   Fix direct upload forms when submit button contains nested elements.
 
-    *Sean Doyle*
+    *Marc Köhlbrugge*
 
+*   When using the `preprocessed: true` option, avoid enqueuing transform jobs
+    for blobs that are not representable.
 
-## Rails 7.0.0.rc3 (December 14, 2021) ##
+    *Chedli Bourguiba*
 
-*   No changes.
+*   Process preview image variant when calling `ActiveStorage::Preview#processed`.
+    For example, `attached_pdf.preview(:thumb).processed` will now immediately
+    generate the full-sized preview image and the `:thumb` variant of it.
+    Previously, the `:thumb` variant would not be generated until a further call
+    to e.g. `processed.url`.
 
+    *Chedli Bourguiba* and *Jonathan Hefner*
 
-## Rails 7.0.0.rc2 (December 14, 2021) ##
+*   Prevent `ActiveRecord::StrictLoadingViolationError` when strict loading is
+    enabled and the variant of an Active Storage preview has already been
+    processed (for example, by calling `ActiveStorage::Preview#url`).
 
-*   No changes.
+    *Jonathan Hefner*
 
-## Rails 7.0.0.rc1 (December 06, 2021) ##
+*   Fix `preprocessed: true` option for named variants of previewable files.
 
-*   `Add ActiveStorage::Blob.compose` to concatenate multiple blobs.
+    *Nico Wenterodt*
 
-    *Gannon McGibbon*
 
-*   Setting custom metadata on blobs are now persisted to remote storage.
+## Rails 7.1.2 (November 10, 2023) ##
 
-    *joshuamsager*
+*   No changes.
 
-*   Support direct uploads to multiple services.
 
-    *Dmitry Tsepelev*
+## Rails 7.1.1 (October 11, 2023) ##
 
-*   Invalid default content types are deprecated
+*   No changes.
 
-    Blobs created with content_type `image/jpg`, `image/pjpeg`, `image/bmp`, `text/javascript` will now produce
-    a deprecation warning, since these are not valid content types.
 
-    These content types will be removed from the defaults in Rails 7.1.
+## Rails 7.1.0 (October 05, 2023) ##
 
-    You can set `config.active_storage.silence_invalid_content_types_warning = true` to dismiss the warning.
+*   No changes.
 
-    *Alex Ghiculescu*
 
-## Rails 7.0.0.alpha2 (September 15, 2021) ##
+## Rails 7.1.0.rc2 (October 01, 2023) ##
 
 *   No changes.
 
 
-## Rails 7.0.0.alpha1 (September 15, 2021) ##
-
-*   Emit Active Support instrumentation events from Active Storage analyzers.
+## Rails 7.1.0.rc1 (September 27, 2023) ##
 
-    Fixes #42930
+*   Add `expires_at` option to `ActiveStorage::Blob#signed_id`.
 
-    *Shouichi Kamiya*
+    ```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) %>
+    ```
 
-*   Add support for byte range requests
+    *Aki*
 
-    *Tom Prats*
+*   Allow attaching File and Pathname when assigning attributes, e.g.
 
-*   Attachments can be deleted after their association is no longer defined.
+    ```ruby
+    User.create!(avatar: File.open("image.jpg"))
+    User.create!(avatar: file_fixture("image.jpg"))
+    ```
 
-    Fixes #42514
+    *Dorian Marié*
 
-    *Don Sisco*
 
-*   Make `vips` the default variant processor for new apps.
+## Rails 7.1.0.beta1 (September 13, 2023) ##
 
-    See the upgrade guide for instructions on converting from `mini_magick` to `vips`. `mini_magick` is
-    not deprecated, existing apps can keep using it.
+*   Disables the session in `ActiveStorage::Blobs::ProxyController`
+    and `ActiveStorage::Representations::ProxyController`
+    in order to allow caching by default in some CDNs as CloudFlare
 
-    *Breno Gazzola*
+    Fixes #44136
 
-*   Deprecate `ActiveStorage::Current.host` in favor of `ActiveStorage::Current.url_options` which accepts
-    a host, protocol and port.
+    *Bruno Prieto*
 
-    *Santiago Bartesaghi*
+*   Add `tags` to `ActiveStorage::Analyzer::AudioAnalyzer` output
 
-*   Allow using [IAM](https://cloud.google.com/storage/docs/access-control/signed-urls) when signing URLs with GCS.
+    *Keaton Roux*
 
-    ```yaml
-    gcs:
-      service: GCS
-      ...
-      iam: true
-    ```
+*   Add an option to preprocess variants
 
-    *RRethy*
+    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.
 
-*   OpenSSL constants are now used for Digest computations.
+    `preprocessed` option is added when declaring variants.
 
-    *Dirkjan Bussink*
+    ```
+    class User < ApplicationRecord
+      has_one_attached :avatar do |attachable|
+        attachable.variant :thumb, resize_to_limit: [100, 100], preprocessed: true
+      end
+    end
+    ```
 
-*   Deprecate `config.active_storage.replace_on_assign_to_many`. Future versions of Rails
-    will behave the same way as when the config is set to `true`.
+    *Shouichi Kamiya*
 
-    *Santiago Bartesaghi*
+*   Fix variants not included when eager loading multiple records containing a single attachment
 
-*   Remove deprecated methods: `build_after_upload`, `create_after_upload!` in favor of `create_and_upload!`,
-    and `service_url` in favor of `url`.
+    When using the `with_attached_#{name}` scope for a `has_one_attached` relation,
+    attachment variants were not eagerly loaded.
 
-    *Santiago Bartesaghi*
+    *Russell Porter*
 
-*   Add support of `strict_loading_by_default` to `ActiveStorage::Representations` controllers.
+*   Allow an ActiveStorage attachment to be removed via a form post
 
-    *Anton Topchii*, *Andrew White*
+    Attachments can already be removed by updating the attachment to be nil such as:
+    ```ruby
+    User.find(params[:id]).update!(avatar: nil)
+    ```
 
-*   Allow to detach an attachment when record is not persisted.
+    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.
 
-    *Jacopo Beschi*
+    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))
 
-*   Use libvips instead of ImageMagick to analyze images when `active_storage.variant_processor = vips`.
+    ```
 
-    *Breno Gazzola*
+    *Nate Matykiewicz*
 
-*   Add metadata value for presence of video channel in video blobs.
+*   Remove mini_mime usage in favour of marcel.
 
-    The `metadata` attribute of video blobs has a new boolean key named `video` that is set to
-    `true` if the file has an video channel and `false` if it doesn't.
+    We have two libraries that are have similar usage. This change removes
+    dependency on mini_mime and makes use of similar methods from marcel.
 
-    *Breno Gazzola*
+    *Vipul A M*
 
-*   Deprecate usage of `purge` and `purge_later` from the association extension.
+*   Allow destroying active storage variants
 
-    *Jacopo Beschi*
+    ```ruby
+    User.first.avatar.variant(resize_to_limit: [100, 100]).destroy
+    ```
 
-*   Passing extra parameters in `ActiveStorage::Blob#url` to S3 Client.
+    *Shouichi Kamiya*, *Yuichiro NAKAGAWA*, *Ryohei UEDA*
 
-    This allows calls of `ActiveStorage::Blob#url` to have more interaction with
-    the S3 Presigner, enabling, amongst other options, custom S3 domain URL
-    Generation.
+*   Add `sample_rate` to `ActiveStorage::Analyzer::AudioAnalyzer` output
 
-    ```ruby
-    blob = ActiveStorage::Blob.last
+    *Matija Čupić*
 
-    blob.url # => https://<bucket-name>.s3.<region>.amazonaws.com/<key>
-    blob.url(virtual_host: true) # => # => https://<bucket-name>/<key>
-    ```
+*   Remove deprecated `purge` and `purge_later` methods from the attachments association.
 
-    *josegomezr*
+    *Rafael Mendonça França*
 
-*   Allow setting a `Cache-Control` on files uploaded to GCS.
+*   Remove deprecated behavior when assigning to a collection of attachments.
 
-    ```yaml
-    gcs:
-      service: GCS
-      ...
-      cache_control: "public, max-age=3600"
-    ```
+    Instead of appending to the collection, the collection is now replaced.
 
-    *maleblond*
+    *Rafael Mendonça França*
 
-*   The parameters sent to `ffmpeg` for generating a video preview image are now
-    configurable under `config.active_storage.video_preview_arguments`.
+*   Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
 
-    *Brendon Muir*
+    *Rafael Mendonça França*
 
-*   The ActiveStorage video previewer will now use scene change detection to generate
-    better preview images (rather than the previous default of using the first frame
-    of the video). This change requires FFmpeg v3.4+.
+*   Remove deprecated invalid default content types in Active Storage configurations.
 
-    *Jonathan Hefner*
+    *Rafael Mendonça França*
 
-*   Add support for ActiveStorage expiring URLs.
+*   Add missing preview event to `ActiveStorage::LogSubscriber`
 
-    ```ruby
-    rails_blob_path(user.avatar, disposition: "attachment", expires_in: 30.minutes)
+    A `preview` event is being instrumented in `ActiveStorage::Previewer`.
+    However it was not added inside ActiveStorage's LogSubscriber class.
 
-    <%= image_tag rails_blob_path(user.avatar.variant(resize: "100x100"), expires_in: 30.minutes) %>
-    ```
+    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`.
 
-    If you want to set default expiration time for ActiveStorage URLs throughout your application, set `config.active_storage.urls_expire_in`.
+    *Chedli Bourguiba*
 
-    *aki77*
+*   Fix retrieving rotation value from FFmpeg on version 5.0+.
 
-*   Allow to purge an attachment when record is not persisted for `has_many_attached`.
+    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.
 
-    *Jacopo Beschi*
+    *Haroon Ahmed*
 
-*   Add `with_all_variant_records` method to eager load all variant records on an attachment at once.
-    `with_attached_image` scope now eager loads variant records if using variant tracking.
+*   Touch all corresponding model records after ActiveStorage::Blob is analyzed
 
-    *Alex Ghiculescu*
+    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.
 
-*   Add metadata value for presence of audio channel in video blobs.
+    *Nate Matykiewicz*
 
-    The `metadata` attribute of video blobs has a new boolean key named `audio` that is set to
-    `true` if the file has an audio channel and `false` if it doesn't.
+*   Add ability to use pre-defined variants when calling `preview` or
+    `representation` on an attachment.
 
-    *Breno Gazzola*
+    ```ruby
+    class User < ActiveRecord::Base
+      has_one_attached :file do |attachable|
+        attachable.variant :thumb, resize_to_limit: [100, 100]
+      end
+    end
 
-*   Adds analyzer for audio files.
+    <%= image_tag user.file.representation(:thumb) %>
+    ```
 
-    *Breno Gazzola*
+    *Richard Böhme*
 
-*   Respect Active Record's primary_key_type in Active Storage migrations.
+*   Method `attach` always returns the attachments except when the record
+    is persisted, unchanged, and saving it fails, in which case it returns `nil`.
 
-    *fatkodima*
+    *Santiago Bartesaghi*
 
-*   Allow `expires_in` for ActiveStorage signed ids.
+*   Fixes multiple `attach` calls within transaction not uploading files correctly.
 
-    *aki77*
+    In the following example, the code failed to upload all but the last file to the configured service.
+    ```ruby
+    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
 
-*   Allow to purge an attachment when record is not persisted for `has_one_attached`.
+    assert_equal 2, user.attachments.count
+    assert user.attachments.first.service.exist?(user.attachments.first.key)  # Fails
+    ```
 
-    *Jacopo Beschi*
+    This was addressed by keeping track of the subchanges pending upload, and uploading them
+    once the transaction is committed.
 
-*   Add a load hook called `active_storage_variant_record` (providing `ActiveStorage::VariantRecord`)
-    to allow for overriding aspects of the `ActiveStorage::VariantRecord` class. This makes
-    `ActiveStorage::VariantRecord` consistent with `ActiveStorage::Blob` and `ActiveStorage::Attachment`
-    that already have load hooks.
+    Fixes #41661
 
-    *Brendon Muir*
+    *Santiago Bartesaghi*, *Bruno Vezoli*, *Juan Roig*, *Abhay Nikam*
 
-*   `ActiveStorage::PreviewError` is raised when a previewer is unable to generate a preview image.
+*   Raise an exception if `config.active_storage.service` is not set.
 
-    *Alex Robbin*
+    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.
 
-*   Add `ActiveStorage::Streaming` module that can be included in a controller to get access to `#send_blob_stream`,
-    which wraps the new `ActionController::Base#send_stream` method to stream a blob from cloud storage:
+    *Ghouse Mohamed*
 
-    ```ruby
-    class MyPublicBlobsController < ApplicationController
-      include ActiveStorage::SetBlob, ActiveStorage::Streaming
+*   Fixes proxy downloads of files over 5mb
 
-      def show
-        http_cache_forever(public: true) do
-          send_blob_stream @blob, disposition: params[:disposition]
-        end
-      end
-    end
-    ```
+    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.
 
-    *DHH*
+    Fixes #44679
 
-*   Add ability to use pre-defined variants.
+    *Felipe Raul*
 
-    ```ruby
-    class User < ActiveRecord::Base
-      has_one_attached :avatar do |attachable|
-        attachable.variant :thumb, resize: "100x100"
-        attachable.variant :medium, resize: "300x300", monochrome: true
-      end
-    end
+*   Saving attachment(s) to a record returns the blob/blobs object
 
-    class Gallery < ActiveRecord::Base
-      has_many_attached :photos do |attachable|
-        attachable.variant :thumb, resize: "100x100"
-        attachable.variant :medium, resize: "300x300", monochrome: true
-      end
-    end
+    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`.
 
-    <%= image_tag user.avatar.variant(:thumb) %>
-    ```
+    *Ghouse Mohamed*
 
-    *fatkodima*
+*   Don't stream responses in redirect mode
 
-*   After setting `config.active_storage.resolve_model_to_route = :rails_storage_proxy`
-    `rails_blob_path` and `rails_representation_path` will generate proxy URLs by default.
+    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.
 
-    *Ali Ismayilov*
+    *Luke Lau*
 
-*   Declare `ActiveStorage::FixtureSet` and `ActiveStorage::FixtureSet.blob` to
-    improve fixture integration.
+*   Safe for direct upload on Libraries or Frameworks
 
-    *Sean Doyle*
+    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-1-stable](https://github.com/rails/rails/blob/6-1-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).
 
@@ -144,11 +144,11 @@ Active Storage, with its included JavaScript library, supports uploading directl
 
 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:
-    ```html
+    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:
+    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"
@@ -170,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.
@@ -199,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