railties 6.1.0 → 7.0.0

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

@@ -45,13 +45,13 @@ module TestUnit # :nodoc:
         def attributes_hash
           return {} if attributes_names.empty?
 
-          attributes_names.map do |name|
+          attributes_names.filter_map do |name|
             if %w(password password_confirmation).include?(name) && attributes.any?(&:password_digest?)
-              ["#{name}", "'secret'"]
+              ["#{name}", '"secret"']
             elsif !virtual?(name)
               ["#{name}", "@#{singular_table_name}.#{name}"]
             end
-          end.compact.sort.to_h
+          end.sort.to_h
         end
 
         def boolean?(name)

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

@@ -16,11 +16,11 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should create <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count') do
+    assert_difference("<%= class_name %>.count") do
       post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
     end
 
-    assert_response 201
+    assert_response :created
   end
 
   test "should show <%= singular_table_name %>" do
@@ -30,15 +30,15 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   test "should update <%= singular_table_name %>" do
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
-    assert_response 200
+    assert_response :success
   end
 
   test "should destroy <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count', -1) do
+    assert_difference("<%= class_name %>.count", -1) do
       delete <%= show_helper %>, as: :json
     end
 
-    assert_response 204
+    assert_response :no_content
   end
 end
 <% end -%>

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

@@ -11,7 +11,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should get index" do
-    get <%= index_helper %>_url
+    get <%= index_helper(type: :url) %>
     assert_response :success
   end
 
@@ -21,11 +21,11 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should create <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count') do
-      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
+    assert_difference("<%= class_name %>.count") do
+      post <%= index_helper(type: :url) %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
     end
 
-    assert_redirected_to <%= singular_table_name %>_url(<%= class_name %>.last)
+    assert_redirected_to <%= show_helper("#{class_name}.last") %>
   end
 
   test "should show <%= singular_table_name %>" do
@@ -40,15 +40,15 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   test "should update <%= singular_table_name %>" do
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
-    assert_redirected_to <%= singular_table_name %>_url(<%= "@#{singular_table_name}" %>)
+    assert_redirected_to <%= show_helper %>
   end
 
   test "should destroy <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count', -1) do
+    assert_difference("<%= class_name %>.count", -1) do
       delete <%= show_helper %>
     end
 
-    assert_redirected_to <%= index_helper %>_url
+    assert_redirected_to <%= index_helper(type: :url) %>
   end
 end
 <% end -%>

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

@@ -8,12 +8,12 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
 
   test "visiting the index" do
     visit <%= plural_table_name %>_url
-    assert_selector "h1", text: "<%= class_name.pluralize.titleize %>"
+    assert_selector "h1", text: "<%= human_name.pluralize %>"
   end
 
-  test "creating a <%= human_name %>" do
+  test "should create <%= human_name.downcase %>" do
     visit <%= plural_table_name %>_url
-    click_on "New <%= class_name.titleize %>"
+    click_on "New <%= human_name.downcase %>"
 
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -28,9 +28,9 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
     click_on "Back"
   end
 
-  test "updating a <%= human_name %>" do
-    visit <%= plural_table_name %>_url
-    click_on "Edit", match: :first
+  test "should update <%= human_name %>" do
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Edit this <%= human_name.downcase %>", match: :first
 
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -45,11 +45,9 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
     click_on "Back"
   end
 
-  test "destroying a <%= human_name %>" do
-    visit <%= plural_table_name %>_url
-    page.accept_confirm do
-      click_on "Destroy", match: :first
-    end
+  test "should destroy <%= human_name %>" do
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Destroy this <%= human_name.downcase %>", match: :first
 
     assert_text "<%= human_name %> was successfully destroyed"
   end

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

@@ -66,9 +66,8 @@ module Rails
         # printed by the generator.
         def run_generator(args = default_arguments, config = {})
           capture(:stdout) do
-            args += ["--skip-bundle"] unless args.include? "--dev"
-            args |= ["--skip-bootsnap"] unless args.include? "--no-skip-bootsnap"
-            args |= ["--skip-webpack-install"] unless args.include? "--no-skip-webpack-install"
+            args += ["--skip-bundle"] unless args.include?("--no-skip-bundle") || args.include?("--dev")
+            args |= ["--skip-bootsnap"] unless args.include?("--no-skip-bootsnap")
 
             generator_class.start(args, config.reverse_merge(destination_root: destination_root))
           end
@@ -82,7 +81,7 @@ module Rails
         # Create a Rails::Generators::GeneratedAttribute by supplying the
         # attribute type and, optionally, the attribute name:
         #
-        #   create_generated_attribute(:string, 'name')
+        #   create_generated_attribute(:string, "name")
         def create_generated_attribute(attribute_type, name = "test", index = nil)
           Rails::Generators::GeneratedAttribute.parse([name, attribute_type, index].compact.join(":"))
         end

data/lib/rails/generators.rb

@@ -34,12 +34,9 @@ module Rails
         actions: "-a",
         orm: "-o",
         javascripts: "-j",
-        javascript_engine: "-je",
         resource_controller: "-c",
         scaffold_controller: "-c",
         stylesheets: "-y",
-        stylesheet_engine: "-se",
-        scaffold_stylesheet: "-ss",
         template_engine: "-e",
         test_framework: "-t"
       },
@@ -60,9 +57,6 @@ module Rails
         resource_controller: :controller,
         resource_route: true,
         scaffold_controller: :scaffold_controller,
-        stylesheets: true,
-        stylesheet_engine: :css,
-        scaffold_stylesheet: true,
         system_tests: nil,
         test_framework: nil,
         template_engine: :erb
@@ -70,7 +64,7 @@ module Rails
     }
 
     class << self
-      def configure!(config) #:nodoc:
+      def configure!(config) # :nodoc:
         api_only! if config.api_only
         no_color! unless config.colorize_logging
         aliases.deep_merge! config.aliases
@@ -82,15 +76,15 @@ module Rails
         after_generate_callbacks.replace config.after_generate_callbacks
       end
 
-      def templates_path #:nodoc:
+      def templates_path # :nodoc:
         @templates_path ||= []
       end
 
-      def aliases #:nodoc:
+      def aliases # :nodoc:
         @aliases ||= DEFAULT_ALIASES.dup
       end
 
-      def options #:nodoc:
+      def options # :nodoc:
         @options ||= DEFAULT_OPTIONS.dup
       end
 
@@ -135,14 +129,12 @@ module Rails
       # Returns an array of generator namespaces that are hidden.
       # Generator namespaces may be hidden for a variety of reasons.
       # Some are aliased such as "rails:migration" and can be
-      # invoked with the shorter "migration", others are private to other generators
-      # such as "css:scaffold".
+      # invoked with the shorter "migration".
       def hidden_namespaces
         @hidden_namespaces ||= begin
           orm      = options[:rails][:orm]
           test     = options[:rails][:test_framework]
           template = options[:rails][:template_engine]
-          css      = options[:rails][:stylesheet_engine]
 
           [
             "rails",
@@ -161,10 +153,6 @@ module Rails
             "#{template}:controller",
             "#{template}:scaffold",
             "#{template}:mailer",
-            "#{css}:scaffold",
-            "#{css}:assets",
-            "css:assets",
-            "css:scaffold",
             "action_text:install",
             "action_mailbox:install"
           ]
@@ -241,7 +229,7 @@ module Rails
       #
       # Notice that "rails:generators:webrat" could be loaded as well, what
       # Rails looks for is the first and last parts of the namespace.
-      def find_by_namespace(name, base = nil, context = nil) #:nodoc:
+      def find_by_namespace(name, base = nil, context = nil) # :nodoc:
         lookups = []
         lookups << "#{base}:#{name}"    if base
         lookups << "#{name}:#{context}" if context
@@ -275,12 +263,11 @@ module Rails
           klass.start(args, config)
           run_after_generate_callback if config[:behavior] == :invoke
         else
-          options     = sorted_groups.flat_map(&:last)
-          suggestion  = Rails::Command::Spellchecker.suggest(namespace.to_s, from: options)
-          suggestion_msg = "Maybe you meant #{suggestion.inspect}?" if suggestion
+          options = sorted_groups.flat_map(&:last)
+          error   = Command::Base::CorrectableError.new("Could not find generator '#{namespace}'.", namespace, options)
 
           puts <<~MSG
-            Could not find generator '#{namespace}'. #{suggestion_msg}
+            #{error.message}
             Run `bin/rails generate --help` for more options.
           MSG
         end

data/lib/rails/info.rb

@@ -21,7 +21,7 @@ module Rails
       end
     end
 
-    class << self #:nodoc:
+    class << self # :nodoc:
       def property(name, value = nil)
         value ||= yield
         properties << [name, value] if value

data/lib/rails/info_controller.rb

@@ -34,9 +34,7 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
 
   private
     def match_route
-      _routes.routes.select { |route|
-        yield route.path
-      }.map { |route| route.path.spec.to_s }
+      _routes.routes.filter_map { |route| route.path.spec.to_s if yield route.path }
     end
 
     def with_leading_slash(path)

data/lib/rails/initializable.rb

@@ -4,7 +4,7 @@ require "tsort"
 
 module Rails
   module Initializable
-    def self.included(base) #:nodoc:
+    def self.included(base) # :nodoc:
       base.extend ClassMethods
     end
 

data/lib/rails/mailers_controller.rb

@@ -93,9 +93,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       request.query_parameters.merge(locale: locale).to_query
     end
 
-    def set_locale
-      I18n.with_locale(params[:locale] || I18n.default_locale) do
-        yield
-      end
+    def set_locale(&block)
+      I18n.with_locale(params[:locale] || I18n.default_locale, &block)
     end
 end

data/lib/rails/rack/logger.rb

@@ -3,7 +3,6 @@
 require "active_support/core_ext/time/conversions"
 require "active_support/core_ext/object/blank"
 require "active_support/log_subscriber"
-require "action_dispatch/http/request"
 require "rack/body_proxy"
 
 module Rails

data/lib/rails/railtie/configuration.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rails/configuration"
-require "active_support/core_ext/symbol/starts_ends_with"
 
 module Rails
   class Railtie
@@ -11,7 +10,7 @@ module Rails
       end
 
       # Expose the eager_load_namespaces at "module" level for convenience.
-      def self.eager_load_namespaces #:nodoc:
+      def self.eager_load_namespaces # :nodoc:
         @@eager_load_namespaces ||= []
       end
 

data/lib/rails/railtie.rb

@@ -120,11 +120,11 @@ module Rails
   # this less confusing for everyone.
   # It can be used like this:
   #
-  # class MyRailtie < Rails::Railtie
-  #   server do
-  #     WebpackServer.start
+  #   class MyRailtie < Rails::Railtie
+  #     server do
+  #       WebpackServer.start
+  #     end
   #   end
-  # end
   #
   # == Application and Engine
   #
@@ -146,7 +146,7 @@ module Rails
       delegate :config, to: :instance
 
       def subclasses
-        super.reject(&:abstract_railtie?)
+        super.reject(&:abstract_railtie?).sort
       end
 
       def rake_tasks(&blk)
@@ -191,6 +191,23 @@ module Rails
         instance.configure(&block)
       end
 
+      def <=>(other) # :nodoc:
+        load_index <=> other.load_index
+      end
+
+      def inherited(subclass)
+        subclass.increment_load_index
+        super
+      end
+
+      protected
+        attr_reader :load_index
+
+        def increment_load_index
+          @@load_counter ||= 0
+          @load_index = (@@load_counter += 1)
+        end
+
       private
         def generate_railtie_name(string)
           ActiveSupport::Inflector.underscore(string).tr("/", "_")
@@ -209,7 +226,7 @@ module Rails
             super
           end
         end
-        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+        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
@@ -224,13 +241,13 @@ module Rails
 
     delegate :railtie_name, to: :class
 
-    def initialize #:nodoc:
+    def initialize # :nodoc:
       if self.class.abstract_railtie?
         raise "#{self.class.name} is abstract, you cannot instantiate it directly."
       end
     end
 
-    def configure(&block) #:nodoc:
+    def configure(&block) # :nodoc:
       instance_eval(&block)
     end
 
@@ -241,29 +258,29 @@ module Rails
       @config ||= Railtie::Configuration.new
     end
 
-    def railtie_namespace #:nodoc:
+    def railtie_namespace # :nodoc:
       @railtie_namespace ||= self.class.module_parents.detect { |n| n.respond_to?(:railtie_namespace) }
     end
 
     protected
-      def run_console_blocks(app) #:nodoc:
+      def run_console_blocks(app) # :nodoc:
         each_registered_block(:console) { |block| block.call(app) }
       end
 
-      def run_generators_blocks(app) #:nodoc:
+      def run_generators_blocks(app) # :nodoc:
         each_registered_block(:generators) { |block| block.call(app) }
       end
 
-      def run_runner_blocks(app) #:nodoc:
+      def run_runner_blocks(app) # :nodoc:
         each_registered_block(:runner) { |block| block.call(app) }
       end
 
-      def run_tasks_blocks(app) #:nodoc:
+      def run_tasks_blocks(app) # :nodoc:
         extend Rake::DSL
         each_registered_block(:rake_tasks) { |block| instance_exec(app, &block) }
       end
 
-      def run_server_blocks(app) #:nodoc:
+      def run_server_blocks(app) # :nodoc:
         each_registered_block(:server) { |block| block.call(app) }
       end
 

data/lib/rails/ruby_version_check.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5.0") && RUBY_ENGINE == "ruby"
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7.0") && RUBY_ENGINE == "ruby"
   desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
-    Rails 6 requires Ruby 2.5.0 or newer.
+    Rails 7 requires Ruby 2.7.0 or newer.
 
     You're running
       #{desc}
 
-    Please upgrade to Ruby 2.5.0 or newer to continue.
+    Please upgrade to Ruby 2.7.0 or newer to continue.
 
   end_message
 end

data/lib/rails/secrets.rb

@@ -25,7 +25,10 @@ module Rails
         paths.each_with_object(Hash.new) do |path, all_secrets|
           require "erb"
 
-          secrets = YAML.load(ERB.new(preprocess(path)).result) || {}
+          source = ERB.new(preprocess(path)).result
+          secrets = YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(source) : YAML.load(source)
+          secrets ||= {}
+
           all_secrets.merge!(secrets["shared"].deep_symbolize_keys) if secrets["shared"]
           all_secrets.merge!(secrets[env].deep_symbolize_keys) if secrets[env]
         end

data/lib/rails/source_annotation_extractor.rb

@@ -72,7 +72,7 @@ module Rails
     #
     # See <tt>#find_in</tt> for a list of file extensions that will be taken into account.
     #
-    # This class method is the single entry point for the `rails notes` command.
+    # This class method is the single entry point for the <tt>rails notes</tt> command.
     def self.enumerate(tag = nil, options = {})
       tag ||= Annotation.tags.join("|")
       extractor = new(tag)

data/lib/rails/tasks/framework.rake

@@ -8,7 +8,7 @@ namespace :app do
   task template: :environment do
     template = ENV["LOCATION"]
     raise "No LOCATION value given. Please set LOCATION either as path to a file or a URL" if template.blank?
-    template = File.expand_path(template) unless %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}.match?(template)
+    template = File.expand_path(template) unless %r{\A[A-Za-z][A-Za-z0-9+\-.]*://}.match?(template)
     require "rails/generators"
     require "rails/generators/rails/app/app_generator"
     generator = Rails::Generators::AppGenerator.new [Rails.root], {}, { destination_root: Rails.root }
@@ -22,7 +22,7 @@ namespace :app do
       project_templates = "#{Rails.root}/lib/templates"
 
       default_templates = { "erb"   => %w{controller mailer scaffold},
-                            "rails" => %w{controller helper scaffold_controller assets} }
+                            "rails" => %w{controller helper scaffold_controller} }
 
       default_templates.each do |type, names|
         local_template_type_dir = File.join(project_templates, type)
@@ -59,10 +59,4 @@ namespace :app do
       Rails::AppUpdater.invoke_from_app_generator :display_upgrade_guide_info
     end
   end
-
-  namespace :binstub do
-    task :yarn do
-      Rails::AppUpdater.invoke_from_app_generator :update_bin_yarn
-    end
-  end
 end

data/lib/rails/tasks/statistics.rake

@@ -11,17 +11,19 @@ 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|

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",
@@ -41,4 +41,11 @@ namespace :tmp 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

@@ -10,17 +10,20 @@ namespace :yarn do
     end
 
     yarn_flags =
-      if `#{Rails.root}/bin/yarn --version`.start_with?("1")
+      if `yarn --version`.start_with?("1")
         "--no-progress --frozen-lockfile"
       else
         "--immutable"
       end
 
-    system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install #{yarn_flags}")
+    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
-
-# 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" ]
-end

data/lib/rails/tasks/zeitwerk.rake

@@ -1,11 +1,5 @@
 # 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
-
 eager_load = ->() do
   puts "Hold on, I am eager loading the application."
   Zeitwerk::Loader.eager_load_all
@@ -41,8 +35,6 @@ end
 namespace :zeitwerk do
   desc "Checks project structure for Zeitwerk compatibility"
   task check: :environment do
-    ensure_zeitwerk_mode[]
-
     begin
       eager_load[]
     rescue NameError => e
@@ -54,11 +46,11 @@ namespace :zeitwerk do
     end
 
     require "active_support/core_ext/object/try"
-    eager_load_paths = Rails.configuration.eager_load_namespaces.map do |eln|
+    eager_load_paths = Rails.configuration.eager_load_namespaces.filter_map do |eln|
       # Quick regression fix for 6.0.3 to support namespaces that do not have
       # eager load paths, like the recently added i18n. I'll rewrite this task.
       eln.try(:config).try(:eager_load_paths)
-    end.compact.flatten
+    end.flatten
 
     not_checked = ActiveSupport::Dependencies.autoload_paths - eager_load_paths
     not_checked.select! { |dir| Dir.exist?(dir) }

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>