railties 7.2.3 → 8.0.0.beta1

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -122,9 +122,12 @@ module Rails
     def generate_test_dummy(force = false)
       opts = options.transform_keys(&:to_sym).except(*DUMMY_IGNORE_OPTIONS)
       opts[:force] = force
+      opts[:skip_thruster] = true
       opts[:skip_brakeman] = true
       opts[:skip_bundle] = true
       opts[:skip_ci] = true
+      opts[:skip_kamal] = true
+      opts[:skip_solid] = true
       opts[:skip_git] = true
       opts[:skip_hotwire] = true
       opts[:skip_rubocop] = true
@@ -149,9 +152,8 @@ module Rails
       end
     end
 
-    def test_dummy_sprocket_assets
-      template "rails/stylesheets.css",   "#{dummy_path}/app/assets/stylesheets/application.css", force: true
-      template "rails/dummy_manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
+    def test_dummy_assets
+      template "rails/stylesheets.css", "#{dummy_path}/app/assets/stylesheets/application.css", force: true
     end
 
     def test_dummy_clean
@@ -159,7 +161,7 @@ module Rails
         remove_file ".ruby-version"
         remove_dir "db"
         remove_file "Gemfile"
-        remove_file "lib/tasks"
+        remove_dir "lib"
         remove_file "public/robots.txt"
         remove_file "README.md"
         remove_file "test"
@@ -167,10 +169,6 @@ module Rails
       end
     end
 
-    def assets_manifest
-      template "rails/engine_manifest.js", "app/assets/config/#{underscored_name}_manifest.js"
-    end
-
     def stylesheets
       if mountable?
         copy_file "rails/stylesheets.css",
@@ -361,7 +359,7 @@ module Rails
         mute do
           build(:generate_test_dummy)
           build(:test_dummy_config)
-          build(:test_dummy_sprocket_assets) unless skip_sprockets?
+          build(:test_dummy_assets) unless skip_asset_pipeline?
           build(:test_dummy_clean)
           # ensure that bin/rails has proper dummy_path
           build(:bin)

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

@@ -84,10 +84,8 @@ jobs:
       - name: Run tests
         env:
           RAILS_ENV: test
-          <%- if options[:database] == "mysql" -%>
+          <%- if options[:database] == "mysql" || options[:database] == "trilogy" -%>
           DATABASE_URL: mysql2://127.0.0.1:3306
-          <%- elsif options[:database] == "trilogy" -%>
-          DATABASE_URL: trilogy://127.0.0.1:3306
           <%- elsif options[:database] == "postgresql" -%>
           DATABASE_URL: postgres://postgres:postgres@localhost:5432
           <%- end -%>
@@ -102,3 +100,4 @@ jobs:
           path: ${{ github.workspace }}/tmp/screenshots
           if-no-files-found: ignore
 <% end -%>
+

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

@@ -21,7 +21,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.save %>
       render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %>
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
     end
   end
 
@@ -30,7 +30,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
       render json: <%= "@#{singular_table_name}" %>
     else
-      render json: <%= "@#{orm_instance.errors}" %>, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
     end
   end
 
@@ -42,7 +42,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   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.
@@ -50,7 +50,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/scaffold_controller/templates/controller.rb.tt

@@ -27,7 +27,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.save %>
       redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully created.") %>
     else
-      render :new, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
+      render :new, status: :unprocessable_entity
     end
   end
 
@@ -36,20 +36,20 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
       redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully updated.") %>, status: :see_other
     else
-      render :edit, status: <%= ActionDispatch::Constants::UNPROCESSABLE_CONTENT.inspect %>
+      render :edit, status: :unprocessable_entity
     end
   end
 
   # 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.rb

@@ -97,11 +97,11 @@ module Rails
       # generator group to fall back to another group in case of missing generators,
       # they can add a fallback.
       #
-      # For example, shoulda is considered a +test_framework+ and is an extension
-      # of +test_unit+. However, most part of shoulda generators are similar to
-      # +test_unit+ ones.
+      # For example, shoulda is considered a test_framework and is an extension
+      # of test_unit. However, most part of shoulda generators are similar to
+      # test_unit ones.
       #
-      # Shoulda then can tell generators to search for +test_unit+ generators when
+      # Shoulda then can tell generators to search for test_unit generators when
       # some of them are not available by adding a fallback:
       #
       #   Rails::Generators.fallbacks[:shoulda] = :test_unit
@@ -272,6 +272,7 @@ module Rails
             #{error.detailed_message}
             Run `bin/rails generate --help` for more options.
           MSG
+          exit 1
         end
       end
 
@@ -316,7 +317,7 @@ module Rails
 
         def run_after_generate_callback
           if defined?(@@generated_files) && !@@generated_files.empty?
-            after_generate_callbacks.each do |callback|
+            @after_generate_callbacks.each do |callback|
               callback.call(@@generated_files)
             end
             @@generated_files = []

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
 

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/test_unit/runner.rb

@@ -9,17 +9,13 @@ require "rails/test_unit/test_parser"
 
 module Rails
   module TestUnit
-    class InvalidTestError < ArgumentError
+    class InvalidTestError < StandardError
       def initialize(path, suggestion)
-        super(<<~MESSAGE.rstrip)
+        super(<<~MESSAGE.squish)
           Could not load test file: #{path}.
           #{suggestion}
         MESSAGE
       end
-
-      def backtrace(*args)
-        []
-      end
     end
 
     class Runner
@@ -72,7 +68,7 @@ module Rails
               if corrections.empty?
                 raise exception
               end
-              raise(InvalidTestError.new(path, DidYouMean::Formatter.message_for(corrections)), cause: nil)
+              raise InvalidTestError.new(path, DidYouMean::Formatter.message_for(corrections))
             else
               raise
             end

data/lib/rails/test_unit/test_parser.rb

@@ -13,32 +13,29 @@ if defined?(Prism)
       # Parse a test file to extract the line ranges of all tests in both
       # method-style (def test_foo) and declarative-style (test "foo" do)
       module TestParser
-        @begins_to_ends = {}
         # Helper to translate a method object into the path and line range where
         # the method was defined.
         def self.definition_for(method)
           filepath, start_line = method.source_location
-          @begins_to_ends[filepath] ||= ranges(filepath)
-          return unless end_line = @begins_to_ends[filepath][start_line]
-          [filepath, start_line..end_line]
-        end
+          queue = [Prism.parse_file(filepath).value]
 
-        private
-          def self.ranges(filepath)
-            queue = [Prism.parse_file(filepath).value]
-            begins_to_ends = {}
-            while (node = queue.shift)
-              case node.type
-              when :def_node
-                begins_to_ends[node.location.start_line] = node.location.end_line
-              when :call_node
-                begins_to_ends[node.location.start_line] = node.location.end_line
+          while (node = queue.shift)
+            case node.type
+            when :def_node
+              if node.location.start_line == start_line
+                return [filepath, start_line..node.location.end_line]
+              end
+            when :call_node
+              if node.location.start_line == start_line
+                return [filepath, start_line..node.location.end_line]
               end
-
-              queue.concat(node.compact_child_nodes)
             end
-            begins_to_ends
+
+            queue.concat(node.compact_child_nodes)
           end
+
+          nil
+        end
       end
     end
   end