railties 7.2.3 → 8.0.5

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt

@@ -43,13 +43,13 @@ class <%= controller_class_name %>Controller < ApplicationController
   # DELETE <%= route_url %>/1
   def destroy
     @<%= orm_instance.destroy %>
-    redirect_to <%= index_helper %>_url, notice: <%= %("#{human_name} was successfully destroyed.") %>, status: :see_other
+    redirect_to <%= index_helper %>_path, notice: <%= %("#{human_name} was successfully destroyed.") %>, status: :see_other
   end
 
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params.expect(:id)") %>
     end
 
     # Only allow a list of trusted parameters through.
@@ -57,7 +57,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       <%- if attributes_names.empty? -%>
       params.fetch(:<%= singular_table_name %>, {})
       <%- else -%>
-      params.require(:<%= singular_table_name %>).permit(<%= permitted_params %>)
+      params.expect(<%= singular_table_name %>: [ <%= permitted_params %> ])
       <%- end -%>
     end
 end

data/lib/rails/generators/rails/script/USAGE

@@ -0,0 +1,18 @@
+Description:
+    Generate a one-off or general purpose script, such as a data migration
+    script, cleanup script, etc.
+
+Example:
+    `bin/rails generate script my_script`
+
+    This will create:
+        script/my_script.rb
+
+    You can run the script using:
+        `ruby script/my_script.rb`
+
+    You can specify a folder:
+        `bin/rails generate script cleanup/my_script`
+
+    This will create:
+        script/cleanup/my_script.rb

data/lib/rails/generators/rails/script/script_generator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "rails/generators/named_base"
+
+module Rails
+  module Generators
+    class ScriptGenerator < NamedBase
+      def generate_script
+        template("script.rb.tt", "script/#{file_path}.rb")
+      end
+
+      private
+        def depth
+          class_path.size + 1
+        end
+    end
+  end
+end

data/lib/rails/generators/rails/script/templates/script.rb.tt

@@ -0,0 +1,3 @@
+require_relative "<%= '../' * depth %>config/environment"
+
+# Your code goes here

data/lib/rails/generators/test_unit/authentication/authentication_generator.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "rails/generators/test_unit"
+
+module TestUnit # :nodoc:
+  module Generators # :nodoc:
+    class AuthenticationGenerator < Rails::Generators::Base # :nodoc:
+      def create_user_test_files
+        template "test/fixtures/users.yml"
+        template "test/models/user_test.rb"
+      end
+
+      def create_mailer_preview_files
+        template "test/mailers/previews/passwords_mailer_preview.rb" if defined?(ActionMailer::Railtie)
+      end
+    end
+  end
+end

data/lib/rails/generators/test_unit/authentication/templates/test/fixtures/users.yml.tt

@@ -0,0 +1,9 @@
+<%% password_digest = BCrypt::Password.create("password") %>
+
+one:
+  email_address: one@example.com
+  password_digest: <%%= password_digest %>
+
+two:
+  email_address: two@example.com
+  password_digest: <%%= password_digest %>

data/lib/rails/generators/test_unit/authentication/templates/test/mailers/previews/passwords_mailer_preview.rb.tt

@@ -0,0 +1,7 @@
+# Preview all emails at http://localhost:3000/rails/mailers/passwords_mailer
+class PasswordsMailerPreview < ActionMailer::Preview
+  # Preview this email at http://localhost:3000/rails/mailers/passwords_mailer/reset
+  def reset
+    PasswordsMailer.reset(User.take)
+  end
+end

data/lib/rails/generators/test_unit/authentication/templates/test/models/user_test.rb.tt

@@ -0,0 +1,7 @@
+require "test_helper"
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/lib/rails/generators.rb

@@ -272,6 +272,7 @@ module Rails
             #{error.detailed_message}
             Run `bin/rails generate --help` for more options.
           MSG
+          exit 1
         end
       end
 

data/lib/rails/health_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "action_controller"
+
 module Rails
   # Built-in Health Check Endpoint
   #

data/lib/rails/info.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require "cgi"
+require "cgi/escape"
+require "cgi/util" if RUBY_VERSION < "3.5"
 
 module Rails
   # This module helps build the runtime properties that are displayed in

data/lib/rails/info_controller.rb

@@ -7,8 +7,6 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
   prepend_view_path ActionDispatch::DebugView::RESCUES_TEMPLATE_PATHS
   layout -> { request.xhr? ? false : "application" }
 
-  RFC2396_PARSER = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::RFC2396_Parser.new
-
   before_action :require_local!
 
   def index
@@ -22,7 +20,7 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
 
   def routes
     if query = params[:query]
-      query = RFC2396_PARSER.escape query
+      query = URI::RFC2396_PARSER.escape query
 
       render json: {
         exact: matching_routes(query: query, exact_match: true),
@@ -34,6 +32,14 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
     end
   end
 
+  def notes
+    @annotations = Rails::SourceAnnotationExtractor.new(
+      Rails::SourceAnnotationExtractor::Annotation.tags.join("|")
+    ).find(
+      Rails::SourceAnnotationExtractor::Annotation.directories
+    )
+  end
+
   private
     def matching_routes(query:, exact_match:)
       return [] if query.blank?
@@ -55,7 +61,7 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
         match ||= (query === route_wrapper.verb)
 
         unless match
-          controller_action = RFC2396_PARSER.escape(route_wrapper.reqs)
+          controller_action = URI::RFC2396_PARSER.escape(route_wrapper.reqs)
           match = exact_match ? (query === controller_action) : controller_action.include?(query)
         end
 

data/lib/rails/rack/silence_request.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# :markup: markdown
+
+require "active_support/logger_silence"
+
+module Rails
+  module Rack
+    # Allows you to silence requests made to a specific path.
+    # This is useful for preventing recurring requests like health checks from clogging the logging.
+    # This middleware is used to do just that against the path /up in production by default.
+    #
+    # Example:
+    #
+    #   config.middleware.insert_before \
+    #     Rails::Rack::Logger, Rails::Rack::SilenceRequest, path: "/up"
+    #
+    # This middleware can also be configured using `config.silence_healthcheck_path = "/up"` in Rails.
+    class SilenceRequest
+      def initialize(app, path:)
+        @app, @path = app, path
+      end
+
+      def call(env)
+        if env["PATH_INFO"] == @path
+          Rails.logger.silence { @app.call(env) }
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/rails/rack.rb

@@ -3,5 +3,6 @@
 module Rails
   module Rack
     autoload :Logger, "rails/rack/logger"
+    autoload :SilenceRequest, "rails/rack/silence_request"
   end
 end

data/lib/rails/source_annotation_extractor.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
-require "ripper"
+begin
+  require "prism"
+rescue LoadError
+  # If Prism isn't available (because of using an older Ruby version) then we'll
+  # define a fallback for the ParserExtractor using ripper.
+  require "ripper"
+end
 
 module Rails
   # Implements the logic behind +Rails::Command::NotesCommand+. See <tt>rails notes --help</tt> for usage information.
@@ -16,24 +22,35 @@ module Rails
     # Wraps a regular expression that will be tested against each of the source
     # file's comments.
     class ParserExtractor < Struct.new(:pattern)
-      class Parser < Ripper
-        attr_reader :comments, :pattern
+      if defined?(Prism)
+        def annotations(file)
+          result = Prism.parse_file(file)
+          return [] unless result.success?
 
-        def initialize(source, pattern:)
-          super(source)
-          @pattern = pattern
-          @comments = []
+          result.comments.filter_map do |comment|
+            Annotation.new(comment.location.start_line, $1, $2) if comment.location.slice =~ pattern
+          end
         end
+      else
+        class Parser < Ripper
+          attr_reader :comments, :pattern
+
+          def initialize(source, pattern:)
+            super(source)
+            @pattern = pattern
+            @comments = []
+          end
 
-        def on_comment(value)
-          @comments << Annotation.new(lineno, $1, $2) if value =~ pattern
+          def on_comment(value)
+            @comments << Annotation.new(lineno, $1, $2) if value =~ pattern
+          end
         end
-      end
 
-      def annotations(file)
-        contents = File.read(file, encoding: Encoding::BINARY)
-        parser = Parser.new(contents, pattern: pattern).tap(&:parse)
-        parser.error? ? [] : parser.comments
+        def annotations(file)
+          contents = File.read(file, encoding: Encoding::BINARY)
+          parser = Parser.new(contents, pattern: pattern).tap(&:parse)
+          parser.error? ? [] : parser.comments
+        end
       end
     end
 
@@ -90,10 +107,14 @@ module Rails
         PatternExtractor.new(/#\s*(#{tag}):?\s*(.*)$/)
       end
 
-      register_extensions("css", "js") do |tag|
+      register_extensions("js") do |tag|
         PatternExtractor.new(/\/\/\s*(#{tag}):?\s*(.*)$/)
       end
 
+      register_extensions("css") do |tag|
+        PatternExtractor.new(/\/\*\s*(#{tag}):?\s*(.*?)(?:\*\/)?$/)
+      end
+
       register_extensions("erb") do |tag|
         PatternExtractor.new(/<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/)
       end
@@ -188,7 +209,7 @@ module Rails
       results.keys.sort.each do |file|
         puts "#{file}:"
         results[file].each do |note|
-          puts "  * #{note.to_s(options)}"
+          puts "  * #{note.to_s(options).strip}"
         end
         puts
       end

data/lib/rails/tasks/statistics.rake

@@ -1,32 +1,11 @@
 # frozen_string_literal: true
 
-# 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 ||= [
-  %w(Controllers        app/controllers),
-  %w(Helpers            app/helpers),
-  %w(Jobs               app/jobs),
-  %w(Models             app/models),
-  %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(Integration\ tests test/integration),
-  %w(System\ tests      test/system),
-]
+require "rails/code_statistics"
+STATS_DIRECTORIES = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
+  Rails::CodeStatistics::DIRECTORIES,
+  "`STATS_DIRECTORIES` is deprecated and will be removed in Rails 8.1! Use `Rails::CodeStatistics.register_directory('My Directory', 'path/to/dir)` instead.",
+  Rails.deprecator
+)
 
 desc "Report code statistics (KLOCs, etc) from the application or engine"
 task :stats do
@@ -34,5 +13,11 @@ task :stats do
   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
+
+  $stderr.puts Rails.deprecator.warn(<<~MSG, caller_locations(0..1))
+  `bin/rake stats` has been deprecated and will be removed in Rails 8.1.
+  Please use `bin/rails stats` as Rails command instead.\n
+  MSG
+
+  Rails::CodeStatistics.new(*stat_directories).to_s
 end

data/lib/rails/templates/rails/info/notes.html.erb

@@ -0,0 +1,65 @@
+<style>
+  h2, p {
+    padding-left: 30px;
+  }
+  table {
+    margin: 0;
+    border-collapse: collapse;
+    word-wrap:break-word;
+    table-layout: fixed;
+    width:100%;
+  }
+  table thead tr {
+    border-bottom: 2px solid #ddd;
+  }
+  table th {
+    padding-left: 30px;
+    text-align: left;
+  }
+  table thead th.tag, table thead th.line-no {
+    width: 10%;
+  }
+  table tbody tr {
+    border-bottom: 1px solid #ddd;
+  }
+  table tbody tr:nth-child(odd) {
+    background: #f2f2f2;
+  }
+  table td {
+    padding: 4px 30px;
+  }
+  @media (prefers-color-scheme: dark) {
+    table tbody tr:nth-child(odd) {
+      background: #282828;
+    }
+  }
+</style>
+
+<h2>
+  Notes
+</h2>
+
+<table id="route_table" class="table">
+  <thead>
+    <th>File Name</th>
+    <th class="line-no">Line No.</th>
+    <th class="tag">Tag</th>
+    <th>Description</th>
+  </thead>
+  <tbody>
+    <% @annotations.each do |file, annotations| %>
+      <% annotations.each.with_index do |annotation, index| %>
+        <tr>
+          <% if index == 0 %>
+            <th rowspan="<%= annotations.size %>">
+              <%= file %>
+            </th>
+          <% end %>
+          <td class="line-no"><%= annotation.line %></td>
+          <td class="tag"><%= annotation.tag %></td>
+          <td><%= annotation.text %></td>
+        </tr>
+      <% end %>
+    <% end %>
+  </tbody>
+</table>

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

@@ -155,7 +155,7 @@
     <% end %>
 
     <dt>EML File:</dt>
-    <dd><%= link_to "Download", action: :download %></dd>
+    <dd><%= link_to "Download", action: :download, locale: params[:locale] %></dd>
   </dl>
 </header>
 

data/lib/rails/test_unit/line_filtering.rb

@@ -4,10 +4,31 @@ require "rails/test_unit/runner"
 
 module Rails
   module LineFiltering # :nodoc:
-    def run(reporter, options = {})
-      options = options.merge(filter: Rails::TestUnit::Runner.compose_filter(self, options[:filter]))
+    def self.extended(obj)
+      require "minitest"
 
-      super
+      case Minitest::VERSION
+      when /^5/ then
+        obj.extend MT5
+      when /^6/ then
+        obj.extend MT6
+      end
+    end
+
+    module MT5
+      def run(reporter, options = {})
+        options = options.merge(filter: Rails::TestUnit::Runner.compose_filter(self, options[:filter]))
+
+        super
+      end
+    end
+
+    module MT6
+      def run_suite(reporter, options = {})
+        options = options.merge(include: Rails::TestUnit::Runner.compose_filter(self, options[:include]))
+
+        super
+      end
     end
   end
 end

data/lib/rails/test_unit/reporter.rb

@@ -5,8 +5,8 @@ require "minitest"
 
 module Rails
   class TestUnitReporter < Minitest::StatisticsReporter
-    class_attribute :app_root
-    class_attribute :executable, default: "bin/rails test"
+    class_attribute :app_root, default: ENV["RAILS_TEST_PWD"]
+    class_attribute :executable, default: ENV.fetch("RAILS_TEST_EXECUTABLE", "bin/rails test")
 
     def prerecord(test_class, test_name)
       super
@@ -60,7 +60,7 @@ module Rails
 
     def relative_path_for(file)
       if app_root
-        file.sub(/^#{app_root}\/?/, "")
+        File.expand_path(file).sub(/^#{app_root}\/?/, "")
       else
         file
       end
@@ -91,10 +91,14 @@ module Rails
 
       def app_root
         @app_root ||= self.class.app_root ||
-          if defined?(ENGINE_ROOT)
+          if ENV["RAILS_TEST_PWD"]
+            ENV["RAILS_TEST_PWD"]
+          elsif defined?(ENGINE_ROOT)
             ENGINE_ROOT
           elsif Rails.respond_to?(:root)
             Rails.root
+          else
+            Dir.pwd
           end
       end
 

data/lib/rails/test_unit/runner.rb

@@ -129,6 +129,7 @@ module Rails
           def list_tests(patterns)
             tests = Rake::FileList[patterns.any? ? patterns : default_test_glob]
             tests.exclude(default_test_exclude_glob) if patterns.empty?
+            tests.exclude(%r{test/isolation/assets/node_modules})
             tests
           end