railties 6.0.0 → 7.1.3.2

data/lib/rails/tasks/statistics.rake

@@ -3,7 +3,7 @@
 # While global constants are bad, many 3rd party tools depend on this one (e.g
 # rspec-rails & cucumber-rails). So a deprecation warning is needed if we want
 # to remove it.
-STATS_DIRECTORIES = [
+STATS_DIRECTORIES ||= [
   %w(Controllers        app/controllers),
   %w(Helpers            app/helpers),
   %w(Jobs               app/jobs),
@@ -11,25 +11,28 @@ STATS_DIRECTORIES = [
   %w(Mailers            app/mailers),
   %w(Mailboxes          app/mailboxes),
   %w(Channels           app/channels),
+  %w(Views              app/views),
   %w(JavaScripts        app/assets/javascripts),
+  %w(Stylesheets        app/assets/stylesheets),
   %w(JavaScript         app/javascript),
   %w(Libraries          lib/),
   %w(APIs               app/apis),
   %w(Controller\ tests  test/controllers),
   %w(Helper\ tests      test/helpers),
+  %w(Job\ tests         test/jobs),
   %w(Model\ tests       test/models),
   %w(Mailer\ tests      test/mailers),
   %w(Mailbox\ tests     test/mailboxes),
   %w(Channel\ tests     test/channels),
-  %w(Job\ tests         test/jobs),
   %w(Integration\ tests test/integration),
   %w(System\ tests      test/system),
-].collect do |name, dir|
-  [ name, "#{File.dirname(Rake.application.rakefile_location)}/#{dir}" ]
-end.select { |name, dir| File.directory?(dir) }
+]
 
 desc "Report code statistics (KLOCs, etc) from the application or engine"
 task :stats do
   require "rails/code_statistics"
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
+  stat_directories = STATS_DIRECTORIES.collect do |name, dir|
+    [ name, "#{File.dirname(Rake.application.rakefile_location)}/#{dir}" ]
+  end.select { |name, dir| File.directory?(dir) }
+  CodeStatistics.new(*stat_directories).to_s
 end

data/lib/rails/tasks/tmp.rake

@@ -2,7 +2,7 @@
 
 namespace :tmp do
   desc "Clear cache, socket and screenshot files from tmp/ (narrow w/ tmp:cache:clear, tmp:sockets:clear, tmp:screenshots:clear)"
-  task clear: ["tmp:cache:clear", "tmp:sockets:clear", "tmp:screenshots:clear"]
+  task clear: ["tmp:cache:clear", "tmp:sockets:clear", "tmp:screenshots:clear", "tmp:storage:clear"]
 
   tmp_dirs = [ "tmp/cache",
                "tmp/sockets",
@@ -11,34 +11,41 @@ namespace :tmp do
 
   tmp_dirs.each { |d| directory d }
 
-  desc "Creates tmp directories for cache, sockets, and pids"
+  desc "Create tmp directories for cache, sockets, and pids"
   task create: tmp_dirs
 
   namespace :cache do
-    # desc "Clears all files and directories in tmp/cache"
+    # desc "Clear all files and directories in tmp/cache"
     task :clear do
       rm_rf Dir["tmp/cache/[^.]*"], verbose: false
     end
   end
 
   namespace :sockets do
-    # desc "Clears all files in tmp/sockets"
+    # desc "Clear all files in tmp/sockets"
     task :clear do
       rm Dir["tmp/sockets/[^.]*"], verbose: false
     end
   end
 
   namespace :pids do
-    # desc "Clears all files in tmp/pids"
+    # desc "Clear all files in tmp/pids"
     task :clear do
       rm Dir["tmp/pids/[^.]*"], verbose: false
     end
   end
 
   namespace :screenshots do
-    # desc "Clears all files in tmp/screenshots"
+    # desc "Clear all files in tmp/screenshots"
     task :clear do
       rm Dir["tmp/screenshots/[^.]*"], verbose: false
     end
   end
+
+  namespace :storage do
+    # desc "Clear all files and directories in tmp/storage"
+    task :clear do
+      rm_rf Dir["tmp/storage/[^.]*"], verbose: false
+    end
+  end
 end

data/lib/rails/tasks/yarn.rake

@@ -8,11 +8,22 @@ namespace :yarn do
     node_env = ENV.fetch("NODE_ENV") do
       valid_node_envs.include?(Rails.env) ? Rails.env : "production"
     end
-    system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install --no-progress --frozen-lockfile")
-  end
-end
 
-# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
-if Rake::Task.task_defined?("assets:precompile")
-  Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
+    yarn_flags =
+      if `yarn --version`.start_with?("1")
+        "--no-progress --frozen-lockfile"
+      else
+        "--immutable"
+      end
+
+    system(
+      { "NODE_ENV" => node_env },
+      "yarn install #{yarn_flags}",
+      exception: true
+    )
+  rescue Errno::ENOENT
+    $stderr.puts "yarn install failed to execute."
+    $stderr.puts "Ensure yarn is installed and `yarn --version` runs without errors."
+    exit 1
+  end
 end

data/lib/rails/tasks/zeitwerk.rake

@@ -1,25 +1,16 @@
 # frozen_string_literal: true
 
-ensure_zeitwerk_mode = ->() do
-  unless Rails.autoloaders.zeitwerk_enabled?
-    abort "Please, enable :zeitwerk mode in config/application.rb and try again."
-  end
-end
+require "rails/zeitwerk_checker"
 
-eager_load = ->() do
-  puts "Hold on, I am eager loading the application."
-  Zeitwerk::Loader.eager_load_all
-end
-
-report_not_checked = ->(not_checked) do
+report_unchecked = ->(unchecked) do
   puts
   puts <<~EOS
-    WARNING: The files in these directories cannot be checked because they
-    are not eager loaded:
+    WARNING: The following directories will only be checked if you configure
+    them to be eager loaded:
   EOS
   puts
 
-  not_checked.each { |dir| puts "  #{dir}" }
+  unchecked.each { |dir| puts "  #{dir}" }
   puts
 
   puts <<~EOS
@@ -29,38 +20,22 @@ report_not_checked = ->(not_checked) do
   puts
 end
 
-report = ->(not_checked) do
-  if not_checked.any?
-    report_not_checked[not_checked]
-    puts "Otherwise, all is good!"
-  else
-    puts "All is good!"
-  end
-end
-
 namespace :zeitwerk do
-  desc "Checks project structure for Zeitwerk compatibility"
+  desc "Check project structure for Zeitwerk compatibility"
   task check: :environment do
-    ensure_zeitwerk_mode[]
+    puts "Hold on, I am eager loading the application."
 
     begin
-      eager_load[]
-    rescue NameError => e
-      if e.message =~ /expected file .*? to define constant \S+/
-        abort $&.sub(/#{Regexp.escape(Rails.root.to_s)}./, "")
-      else
-        raise
-      end
+      unchecked = Rails::ZeitwerkChecker.check
+    rescue Zeitwerk::NameError => e
+      abort e.message.sub(/#{Regexp.escape(Rails.root.to_s)}./, "")
     end
 
-    eager_load_paths = Rails.configuration.eager_load_namespaces.map do |eln|
-      eln.config.eager_load_paths if eln.respond_to?(:config)
-    end.compact.flatten
-
-    not_checked = ActiveSupport::Dependencies.autoload_paths - eager_load_paths
-    not_checked.select! { |dir| Dir.exist?(dir) }
-    not_checked.reject! { |dir| Dir.empty?(dir) }
-
-    report[not_checked]
+    if unchecked.empty?
+      puts "All is good!"
+    else
+      report_unchecked[unchecked]
+      puts "Otherwise, all is good!"
+    end
   end
 end

data/lib/rails/tasks.rb

@@ -4,15 +4,9 @@ require "rake"
 
 # Load Rails Rakefile extensions
 %w(
-  annotations
-  dev
   framework
-  initializers
   log
-  middleware
   misc
-  restart
-  routes
   tmp
   yarn
   zeitwerk

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

@@ -25,6 +25,21 @@
 
     h2 { padding-left: 10px; }
 
+    @media (prefers-color-scheme: dark) {
+      body {
+        background-color: #222;
+        color: #ececec;
+      }
+
+      pre {
+        background-color: #333;
+      }
+
+      a { color: #fff; }
+      a:visited { color: #999; }
+      a:hover { color: #000; background-color: #fff; }
+    }
+
     <%= yield :style %>
   </style>
 </head>

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

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html><head>
+<title><%= @page_title %></title>
 <meta name="viewport" content="width=device-width" />
 <style type="text/css">
   html, body, iframe {
@@ -43,6 +44,13 @@
     content: "\00a0"; // &nbsp;
   }
 
+  th {
+    font-weight: inherit;
+    color: #7f7f7f;
+    text-align: right;
+    white-space: nowrap;
+  }
+
   iframe {
     border: 0;
     width: 100%;
@@ -55,35 +63,40 @@
   <dl>
     <% if @email.respond_to?(:smtp_envelope_from) && Array(@email.from) != Array(@email.smtp_envelope_from) %>
       <dt>SMTP-From:</dt>
-      <dd><%= @email.smtp_envelope_from %></dd>
+      <dd id="smtp_from"><%= @email.smtp_envelope_from %></dd>
     <% end %>
 
     <% if @email.respond_to?(:smtp_envelope_to) && @email.to != @email.smtp_envelope_to %>
       <dt>SMTP-To:</dt>
-      <dd><%= @email.smtp_envelope_to %></dd>
+      <dd id="smtp_to"><%= @email.smtp_envelope_to %></dd>
     <% end %>
 
     <dt>From:</dt>
-    <dd><%= @email.header['from'] %></dd>
+    <dd id="from"><%= @email.header['from'] %></dd>
 
     <% if @email.reply_to %>
       <dt>Reply-To:</dt>
-      <dd><%= @email.header['reply-to'] %></dd>
+      <dd id="reply_to"><%= @email.header['reply-to'] %></dd>
     <% end %>
 
     <dt>To:</dt>
-    <dd><%= @email.header['to'] %></dd>
+    <dd id="to"><%= @email.header['to'] %></dd>
 
     <% if @email.cc %>
       <dt>CC:</dt>
-      <dd><%= @email.header['cc'] %></dd>
+      <dd id="cc"><%= @email.header['cc'] %></dd>
+    <% end %>
+
+    <% if @email.bcc %>
+      <dt>BCC:</dt>
+      <dd id="bcc"><%= @email.header['bcc'] %></dd>
     <% end %>
 
     <dt>Date:</dt>
-    <dd><%= Time.current.rfc2822 %></dd>
+    <dd id="date"><%= Time.current.rfc2822 %></dd>
 
     <dt>Subject:</dt>
-    <dd><strong><%= @email.subject %></strong></dd>
+    <dd><strong id="subject"><%= @email.subject %></strong></dd>
 
     <% unless @email.attachments.nil? || @email.attachments.empty? %>
       <dt>Attachments:</dt>
@@ -96,15 +109,17 @@
     <% end %>
 
     <dt>Format:</dt>
-    <% if @email.multipart? %>
+    <% if @email.html_part && @email.text_part %>
       <dd>
         <select id="part" onchange="refreshBody(false);">
           <option <%= request.format == Mime[:html] ? 'selected' : '' %> value="<%= part_query('text/html') %>">View as HTML email</option>
           <option <%= request.format == Mime[:text] ? 'selected' : '' %> value="<%= part_query('text/plain') %>">View as plain-text email</option>
         </select>
       </dd>
+    <% elsif @part %>
+      <dd id="mime_type" data-mime-type="<%= part_query(@part.mime_type) %>"><%= @part.mime_type == 'text/html' ? 'HTML email' : 'plain-text email' %></dd>
     <% else %>
-      <dd id="mime_type" data-mime-type="<%= part_query(@email.mime_type) %>"><%= @email.mime_type == 'text/html' ? 'HTML email' : 'plain-text email' %></dd>
+      <dd id="mime_type" data-mime-type=""></dd>
     <% end %>
 
     <% if I18n.available_locales.count > 1 %>
@@ -117,11 +132,31 @@
         </select>
       </dd>
     <% end %>
+
+    <% unless @email.header_fields.nil? || @email.header_fields.empty? %>
+      <dt>Headers:</dt>
+      <dd>
+        <details>
+          <summary>Show all headers</summary>
+          <table>
+          <% @email.header_fields.each do |field| %>
+            <tr>
+              <th><%= field.name %>:</th>
+              <td><%= field.value %></td>
+            </tr>
+          <% end %>
+          </table>
+        </details>
+      </dd>
+    <% end %>
+
+    <dt>EML File:</dt>
+    <dd><%= link_to "Download", action: :download %></dd>
   </dl>
 </header>
 
 <% if @part && @part.mime_type %>
-  <iframe seamless name="messageBody" src="?<%= part_query(@part.mime_type) %>"></iframe>
+  <iframe name="messageBody" src="?<%= part_query(@part.mime_type) %>"></iframe>
 <% else %>
   <p>
     You are trying to preview an email that does not have any content.

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

@@ -1,8 +1,15 @@
-<% @previews.each do |preview| %>
-<h3><%= link_to preview.preview_name.titleize, url_for(controller: "rails/mailers", action: "preview", path: preview.preview_name) %></h3>
-<ul>
-<% preview.emails.each do |email| %>
-<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{preview.preview_name}/#{email}") %></li>
-<% end %>
-</ul>
+<h1><%= @page_title %></h1>
+
+<% if @previews.any? %>
+  <% @previews.each do |preview| %>
+  <h3><%= link_to preview.preview_name.titleize, url_for(controller: "rails/mailers", action: "preview", path: preview.preview_name) %></h3>
+  <ul>
+  <% preview.emails.each do |email| %>
+  <li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{preview.preview_name}/#{email}") %></li>
+  <% end %>
+  </ul>
+  <% end %>
+<% else %>
+  <p>You have not defined any Action Mailer Previews.</p>
+  <p>Read <%= link_to "Action Mailer Basics", "https://guides.rubyonrails.org/action_mailer_basics.html#previewing-emails" %> to learn how to define your first.</p>
 <% end %>

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

@@ -1,6 +1,12 @@
-<h3><%= @preview.preview_name.titleize %></h3>
-<ul>
-<% @preview.emails.each do |email| %>
-<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{@preview.preview_name}/#{email}") %></li>
+<h1><%= @page_title %></h1>
+
+<% if @preview.emails.any? %>
+  <ul>
+  <% @preview.emails.each do |email| %>
+  <li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{@preview.preview_name}/#{email}") %></li>
+  <% end %>
+  </ul>
+<% else %>
+  <p>You have not defined any actions for <%= @preview %>.</p>
+  <p>Read <%= link_to "Action Mailer Basics", "https://guides.rubyonrails.org/action_mailer_basics.html#previewing-emails" %> to learn how to define your first.</p>
 <% end %>
-</ul>