railties 7.1.5.1 → 7.2.2.1

data/lib/rails/generators/rails/plugin/templates/github/ci.yml.tt

@@ -0,0 +1,103 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches: [ main ]
+
+jobs:
+<%- unless skip_rubocop? -%>
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: <%= ENV["RBENV_VERSION"] || ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" %>
+          bundler-cache: true
+
+      - name: Lint code for consistent style
+        run: bin/rubocop -f github
+
+<% end -%>
+<% unless options[:skip_test] -%>
+  test:
+    runs-on: ubuntu-latest
+
+    <%- if options[:database] == "sqlite3" -%>
+    # services:
+    #  redis:
+    #    image: redis
+    #    ports:
+    #      - 6379:6379
+    #    options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+    <%- else -%>
+    services:
+      <%- if options[:database] == "mysql" || options[:database] == "trilogy" -%>
+      mysql:
+        image: mysql
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      <%- elsif options[:database] == "postgresql" -%>
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
+      <%- end -%>
+
+      # redis:
+      #   image: redis
+      #   ports:
+      #     - 6379:6379
+      #   options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+
+    <%- end -%>
+    steps:
+      - name: Install packages
+        run: sudo apt-get update && sudo apt-get install --no-install-recommends -y google-chrome-stable <%= dockerfile_base_packages.join(" ") %>
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: <%= ENV["RBENV_VERSION"] || ENV["rvm_ruby_string"] || "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}" %>
+          bundler-cache: true
+      <%- if using_bun? -%>
+
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: <%= dockerfile_bun_version %>
+      <%- end -%>
+
+      - name: Run tests
+        env:
+          RAILS_ENV: test
+          <%- if options[:database] == "mysql" || options[:database] == "trilogy" -%>
+          DATABASE_URL: mysql2://127.0.0.1:3306
+          <%- elsif options[:database] == "postgresql" -%>
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432
+          <%- end -%>
+          # REDIS_URL: redis://localhost:6379/0
+        run: <%= test_command %>
+
+      - name: Keep screenshots from failed system tests
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: screenshots
+          path: ${{ github.workspace }}/tmp/screenshots
+          if-no-files-found: ignore
+<% end -%>
+

data/lib/rails/generators/rails/plugin/templates/github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/lib/rails/generators/rails/plugin/templates/rubocop.yml.tt

@@ -0,0 +1,8 @@
+# Omakase Ruby styling for Rails
+inherit_gem: { rubocop-rails-omakase: rubocop.yml }
+
+# Overwrite or add rules to create your own house style
+#
+# # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`
+# Layout/SpaceInsideArrayLiteralBrackets:
+#   Enabled: false

data/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb.tt

@@ -1,5 +1,5 @@
 require "test_helper"
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
+  driven_by :selenium, using: :headless_chrome, screen_size: [ 1400, 1400 ]
 end

data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb.tt

@@ -3,7 +3,7 @@ ENV["RAILS_ENV"] = "test"
 
 require_relative "<%= File.join("..", options[:dummy_path], "config/environment") -%>"
 <% unless options[:skip_active_record] -%>
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../<%= options[:dummy_path] -%>/db/migrate", __dir__)]
+ActiveRecord::Migrator.migrations_paths = [ File.expand_path("../<%= options[:dummy_path] -%>/db/migrate", __dir__) ]
 <% if options[:mountable] -%>
 ActiveRecord::Migrator.migrations_paths << File.expand_path("../db/migrate", __dir__)
 <% end -%>
@@ -13,7 +13,7 @@ require "rails/test_help"
 <% unless options[:skip_active_record] -%>
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_paths=)
-  ActiveSupport::TestCase.fixture_paths = [File.expand_path("fixtures", __dir__)]
+  ActiveSupport::TestCase.fixture_paths = [ File.expand_path("fixtures", __dir__) ]
   ActionDispatch::IntegrationTest.fixture_paths = ActiveSupport::TestCase.fixture_paths
   ActiveSupport::TestCase.file_fixture_path = File.expand_path("fixtures", __dir__) + "/files"
   ActiveSupport::TestCase.fixtures :all

data/lib/rails/generators/test_unit/mailer/templates/functional_test.rb.tt

@@ -2,15 +2,17 @@ require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>MailerTest < ActionMailer::TestCase
-<% actions.each do |action| -%>
+<% actions.each_with_index do |action, index| -%>
+<% if index != 0 -%>
+
+<% end -%>
   test "<%= action %>" do
     mail = <%= class_name %>Mailer.<%= action %>
     assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
-    assert_equal ["to@example.org"], mail.to
-    assert_equal ["from@example.com"], mail.from
+    assert_equal [ "to@example.org" ], mail.to
+    assert_equal [ "from@example.com" ], mail.from
     assert_match "Hi", mail.body.encoded
   end
-
 <% end -%>
 <% if actions.blank? -%>
   # test "the truth" do

data/lib/rails/generators/test_unit/mailer/templates/preview.rb.tt

@@ -1,13 +1,14 @@
 <% module_namespacing do -%>
 # Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>_mailer
 class <%= class_name %>MailerPreview < ActionMailer::Preview
-<% actions.each do |action| -%>
+<% actions.each_with_index do |action, index| -%>
+<% if index != 0 -%>
 
+<% end -%>
   # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>_mailer/<%= action %>
   def <%= action %>
     <%= class_name %>Mailer.<%= action %>
   end
 <% end -%>
-
 end
 <% end -%>

data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

@@ -39,7 +39,11 @@ module TestUnit # :nodoc:
 
       private
         def attributes_string
-          attributes_hash.map { |k, v| "#{k}: #{v}" }.join(", ")
+          if attributes_hash.empty?
+            "{}"
+          else
+            "{ #{attributes_hash.map { |k, v| "#{k}: #{v}" }.join(", ")} }"
+          end
         end
 
         def attributes_hash
@@ -63,6 +67,16 @@ module TestUnit # :nodoc:
           attribute = attributes.find { |attr| attr.name == name }
           attribute&.virtual?
         end
+
+        def datetime?(name)
+          attribute = attributes.find { |attr| attr.name == name }
+          attribute&.type == :datetime
+        end
+
+        def time?(name)
+          attribute = attributes.find { |attr| attr.name == name }
+          attribute&.type == :time
+        end
     end
   end
 end

data/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb.tt

@@ -17,7 +17,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   test "should create <%= singular_table_name %>" do
     assert_difference("<%= class_name %>.count") do
-      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
+      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: #{attributes_string}" %> }, as: :json
     end
 
     assert_response :created
@@ -29,7 +29,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should update <%= singular_table_name %>" do
-    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: #{attributes_string}" %> }, as: :json
     assert_response :success
   end
 

data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb.tt

@@ -22,7 +22,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   test "should create <%= singular_table_name %>" do
     assert_difference("<%= class_name %>.count") do
-      post <%= index_helper(type: :url) %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
+      post <%= index_helper(type: :url) %>, params: { <%= "#{singular_table_name}: #{attributes_string}" %> }
     end
 
     assert_redirected_to <%= show_helper("#{class_name}.last") %>
@@ -39,7 +39,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should update <%= singular_table_name %>" do
-    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
+    patch <%= show_helper %>, params: { <%= "#{singular_table_name}: #{attributes_string}" %> }
     assert_redirected_to <%= show_helper %>
   end
 

data/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt

@@ -35,6 +35,8 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
     check "<%= attr.humanize %>" if <%= value %>
+    <%- elsif datetime?(attr) || time?(attr) -%>
+    fill_in "<%= attr.humanize %>", with: <%= value %>.to_s
     <%- else -%>
     fill_in "<%= attr.humanize %>", with: <%= value %>
     <%- end -%>

data/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb.tt

@@ -1,5 +1,5 @@
 require "test_helper"
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
+  driven_by :selenium, using: :headless_chrome, screen_size: [ 1400, 1400 ]
 end

data/lib/rails/generators/testing/assertions.rb

@@ -121,6 +121,26 @@ module Rails
             assert_equal(value, create_generated_attribute(attribute_type).default)
           end
         end
+
+        # Asserts a given initializer exists. You need to supply a path relative
+        # to the `config/initializers/` directory.
+        #
+        #   assert_initializer "mail_interceptors.rb"
+        #
+        # You can also give extra arguments. If the argument is a regexp, it will check if the
+        # regular expression matches the given file content. If it's a string, it compares the
+        # file with the given string:
+        #
+        #   assert_initializer "mail_interceptors.rb", /SandboxEmailInterceptor/
+        #
+        # Finally, when a block is given, it yields the file content:
+        #
+        #   assert_initializer "mail_interceptors.rb" do |initializer|
+        #     assert_match(/SandboxEmailInterceptor/, initializer)
+        #   end
+        def assert_initializer(name, *contents, &block)
+          assert_file("config/initializers/#{name}", *contents, &block)
+        end
       end
     end
   end

data/lib/rails/generators/testing/behavior.rb

@@ -65,11 +65,15 @@ module Rails
         # You can provide a configuration hash as second argument. This method returns the output
         # printed by the generator.
         def run_generator(args = default_arguments, config = {})
-          capture(:stdout) do
-            args += ["--skip-bundle"] unless args.include?("--no-skip-bundle") || args.include?("--dev")
-            args += ["--skip-bootsnap"] unless args.include?("--no-skip-bootsnap") || args.include?("--skip-bootsnap")
+          args += ["--skip-bundle"] unless args.include?("--no-skip-bundle") || args.include?("--dev")
+          args += ["--skip-bootsnap"] unless args.include?("--no-skip-bootsnap") || args.include?("--skip-bootsnap")
 
+          if ENV["RAILS_LOG_TO_STDOUT"] == "true"
             generator_class.start(args, config.reverse_merge(destination_root: destination_root))
+          else
+            capture(:stdout) do
+              generator_class.start(args, config.reverse_merge(destination_root: destination_root))
+            end
           end
         end
 
@@ -107,9 +111,6 @@ module Rails
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
       end
-
-      include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-      deprecate_constant "Behaviour", "Rails::Generators::Testing::Behavior", deprecator: Rails.deprecator
     end
   end
 end

data/lib/rails/generators.rb

@@ -60,6 +60,10 @@ module Rails
       }
     }
 
+    # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
+    # can change when we FileUtils.cd.
+    RAILS_DEV_PATH = File.expand_path("../../..", __dir__) # :nodoc:
+
     class << self
       def configure!(config) # :nodoc:
         api_only! if config.api_only
@@ -151,7 +155,8 @@ module Rails
             "#{template}:scaffold",
             "#{template}:mailer",
             "action_text:install",
-            "action_mailbox:install"
+            "action_mailbox:install",
+            "devcontainer"
           ]
         end
       end
@@ -202,7 +207,6 @@ module Rails
         rails.map! { |n| n.delete_prefix("rails:") }
         rails.delete("app")
         rails.delete("plugin")
-        rails.delete("encrypted_secrets")
         rails.delete("encrypted_file")
         rails.delete("encryption_key_file")
         rails.delete("master_key")

data/lib/rails/health_controller.rb

@@ -24,7 +24,7 @@ module Rails
   # The health check will now be accessible via the +/healthz+ path.
   #
   # NOTE: This endpoint does not reflect the status of all of your application's
-  # dependencies, such as the database or redis cluster. Replace
+  # dependencies, such as the database or Redis cluster. Replace
   # <tt>"rails/health#show"</tt> with your own controller action if you have
   # application specific needs.
   #

data/lib/rails/info.rb

@@ -95,11 +95,11 @@ module Rails
 
     # The name of the database adapter for the current environment.
     property "Database adapter" do
-      ActiveRecord::Base.connection.pool.db_config.adapter
+      ActiveRecord::Base.connection_pool.db_config.adapter
     end
 
     property "Database schema version" do
-      ActiveRecord::Base.connection.migration_context.current_version rescue nil
+      ActiveRecord::Base.connection_pool.migration_context.current_version rescue nil
     end
   end
 end

data/lib/rails/mailers_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rails/application_controller"
+require "active_support/core_ext/enumerable"
 
 class Rails::MailersController < Rails::ApplicationController # :nodoc:
   prepend_view_path ActionDispatch::DebugView::RESCUES_TEMPLATE_PATHS
@@ -9,7 +10,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
   before_action :find_preview, only: [:preview, :download]
   before_action :require_local!, unless: :show_previews?
 
-  helper_method :part_query, :locale_query
+  helper_method :attachment_url, :part_query, :locale_query
 
   content_security_policy(false)
 
@@ -38,6 +39,8 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       if @preview.email_exists?(@email_action)
         @page_title = "Mailer Preview for #{@preview.preview_name}##{@email_action}"
         @email = @preview.call(@email_action, params)
+        @attachments = attachments_for(@email).reject { |filename, attachment| attachment.inline? }
+        @inline_attachments = attachments_for(@email).select { |filename, attachment| attachment.inline? }
 
         if params[:part]
           part_type = Mime::Type.lookup(params[:part])
@@ -95,6 +98,16 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       end
     end
 
+    def attachments_for(email)
+      email.all_parts.to_a.select(&:attachment?).index_by do |attachment|
+        attachment.respond_to?(:original_filename) ? attachment.original_filename : attachment.filename
+      end
+    end
+
+    def attachment_url(attachment)
+      "data:application/octet-stream;charset=utf-8;base64,#{Base64.encode64(attachment.body.to_s)}"
+    end
+
     def part_query(mime_type)
       request.query_parameters.merge(part: mime_type).to_query
     end

data/lib/rails/paths.rb

@@ -105,8 +105,8 @@ module Rails
     private
       def filter_by(&block)
         all_paths.find_all(&block).flat_map { |path|
-          paths = path.existent
-          paths - path.children.flat_map { |p| yield(p) ? [] : p.existent }
+          paths = path.existent_directories
+          paths - path.children.flat_map { |p| yield(p) ? [] : p.existent_directories }
         }.uniq
       end
     end

data/lib/rails/pwa_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "rails/application_controller"
+
+class Rails::PwaController < Rails::ApplicationController # :nodoc:
+  skip_forgery_protection
+
+  def service_worker
+    render template: "pwa/service-worker", layout: false
+  end
+
+  def manifest
+    render template: "pwa/manifest", layout: false
+  end
+end

data/lib/rails/rack/logger.rb

@@ -20,22 +20,26 @@ module Rails
       def call(env)
         request = ActionDispatch::Request.new(env)
 
-        if logger.respond_to?(:tagged)
-          logger.tagged(*compute_tags(request)) { call_app(request, env) }
+        env["rails.rack_logger_tag_count"] = if logger.respond_to?(:push_tags)
+          logger.push_tags(*compute_tags(request)).size
         else
-          call_app(request, env)
+          0
         end
+
+        call_app(request, env)
       end
 
       private
         def call_app(request, env) # :doc:
+          logger_tag_pop_count = env["rails.rack_logger_tag_count"]
+
           instrumenter = ActiveSupport::Notifications.instrumenter
           handle = instrumenter.build_handle("request.action_dispatch", { request: request })
           handle.start
 
           logger.info { started_request_message(request) }
           status, headers, body = response = @app.call(env)
-          body = ::Rack::BodyProxy.new(body, &handle.method(:finish))
+          body = ::Rack::BodyProxy.new(body) { finish_request_instrumentation(handle, logger_tag_pop_count) }
 
           if response.frozen?
             [status, headers, body]
@@ -44,10 +48,8 @@ module Rails
             response
           end
         rescue Exception
-          handle.finish
+          finish_request_instrumentation(handle, logger_tag_pop_count)
           raise
-        ensure
-          ActiveSupport::LogSubscriber.flush_all!
         end
 
         # Started GET "/session/new" for 127.0.0.1 at 2012-09-26 14:51:42 -0700
@@ -75,6 +77,12 @@ module Rails
         def logger
           Rails.logger
         end
+
+        def finish_request_instrumentation(handle, logger_tag_pop_count)
+          handle.finish
+          logger.pop_tags(logger_tag_pop_count) if logger.respond_to?(:pop_tags) && logger_tag_pop_count > 0
+          ActiveSupport::LogSubscriber.flush_all!
+        end
     end
   end
 end

data/lib/rails/railtie/configurable.rb

@@ -27,8 +27,8 @@ module Rails
         end
 
         private
-          def method_missing(*args, &block)
-            instance.send(*args, &block)
+          def method_missing(...)
+            instance.send(...)
           end
       end
     end

data/lib/rails/railtie.rb

@@ -221,14 +221,13 @@ module Rails
 
         # If the class method does not have a method, then send the method call
         # to the Railtie instance.
-        def method_missing(name, *args, &block)
+        def method_missing(name, ...)
           if !abstract_railtie? && instance.respond_to?(name)
-            instance.public_send(name, *args, &block)
+            instance.public_send(name, ...)
           else
             super
           end
         end
-        ruby2_keywords(:method_missing)
 
         # receives an instance variable identifier, set the variable value if is
         # blank and append given block to value, which will be used later in

data/lib/rails/tasks/framework.rake

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 namespace :app do
-  desc "Update configs and some other initially generated files (or use just update:configs or update:bin)"
-  task update: [ "update:configs", "update:bin", "update:active_storage", "update:upgrade_guide_info" ]
-
   desc "Apply the template supplied by LOCATION=(/path/to/template) or URL"
   task template: :environment do
     template = ENV["LOCATION"]
@@ -34,27 +31,4 @@ namespace :app do
       end
     end
   end
-
-  namespace :update do
-    require "rails/app_updater"
-
-    # desc "Update config files from your current rails install"
-    task :configs do
-      Rails::AppUpdater.invoke_from_app_generator :create_boot_file
-      Rails::AppUpdater.invoke_from_app_generator :update_config_files
-    end
-
-    # desc "Add new executables to the application bin/ directory"
-    task :bin do
-      Rails::AppUpdater.invoke_from_app_generator :update_bin_files
-    end
-
-    task :active_storage do
-      Rails::AppUpdater.invoke_from_app_generator :update_active_storage
-    end
-
-    task :upgrade_guide_info do
-      Rails::AppUpdater.invoke_from_app_generator :display_upgrade_guide_info
-    end
-  end
 end

data/lib/rails/tasks/tmp.rake

@@ -7,7 +7,7 @@ namespace :tmp do
   tmp_dirs = [ "tmp/cache",
                "tmp/sockets",
                "tmp/pids",
-               "tmp/cache/assets" ]
+             ]
 
   tmp_dirs.each { |d| directory d }
 

data/lib/rails/templates/layouts/application.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
   <meta charset="utf-8" />
   <title><%= @page_title %></title>

data/lib/rails/templates/rails/mailers/email.html.erb

@@ -61,14 +61,14 @@
 <body>
 <header>
   <dl>
-    <% if @email.respond_to?(:smtp_envelope_from) && Array(@email.from) != Array(@email.smtp_envelope_from) %>
+    <% if Array(@email.from) != Array(@email.smtp_envelope_from) %>
       <dt>SMTP-From:</dt>
       <dd id="smtp_from"><%= @email.smtp_envelope_from %></dd>
     <% end %>
 
-    <% if @email.respond_to?(:smtp_envelope_to) && @email.to != @email.smtp_envelope_to %>
+    <% if Set[*@email.to, *@email.cc, *@email.bcc] != Set[*@email.smtp_envelope_to] %>
       <dt>SMTP-To:</dt>
-      <dd id="smtp_to"><%= @email.smtp_envelope_to %></dd>
+      <dd id="smtp_to"><%= @email.smtp_envelope_to.join(", ") %></dd>
     <% end %>
 
     <dt>From:</dt>
@@ -93,17 +93,21 @@
     <% end %>
 
     <dt>Date:</dt>
-    <dd id="date"><%= Time.current.rfc2822 %></dd>
+    <dd id="date"><%= @email.header['date'] || Time.current.rfc2822 %></dd>
 
     <dt>Subject:</dt>
     <dd><strong id="subject"><%= @email.subject %></strong></dd>
 
-    <% unless @email.attachments.nil? || @email.attachments.empty? %>
+    <% if @attachments.any? || @inline_attachments.any? %>
       <dt>Attachments:</dt>
       <dd>
-        <% @email.attachments.each do |a| %>
-          <% filename = a.respond_to?(:original_filename) ? a.original_filename : a.filename %>
-          <%= link_to filename, "data:application/octet-stream;charset=utf-8;base64,#{Base64.encode64(a.body.to_s)}", download: filename %>
+        <% @attachments.each do |filename, attachment| %>
+          <%= link_to filename, attachment_url(attachment), download: filename %>
+        <% end %>
+
+        <% if @inline_attachments.any? %>
+          (Inline: <% @inline_attachments.each do |filename, attachment| %>
+            <%= link_to filename, attachment_url(attachment), download: filename %><% end %>)
         <% end %>
       </dd>
     <% end %>