railties 7.2.3 → 8.0.5

data/lib/rails/commands/app/update_command.rb

@@ -12,6 +12,9 @@ module Rails
 
         desc "update", "Update configs and some other initially generated files (or use just update:configs or update:bin)"
         def perform
+          require_application!
+          Rails.application.deprecators.silenced = true
+
           configs
           bin
           public_directory
@@ -71,23 +74,16 @@ module Rails
               skip_action_cable:   !defined?(ActionCable::Engine),
               skip_brakeman:       skip_gem?("brakeman"),
               skip_rubocop:        skip_gem?("rubocop"),
+              skip_thruster:       skip_gem?("thruster"),
               skip_test:           !defined?(Rails::TestUnitRailtie),
               skip_system_test:    Rails.application.config.generators.system_tests.nil?,
-              asset_pipeline:      asset_pipeline,
               skip_asset_pipeline: asset_pipeline.nil?,
               skip_bootsnap:       !defined?(Bootsnap),
             }.merge(options)
           end
 
           def asset_pipeline
-            case
-            when defined?(Sprockets::Railtie)
-              "sprockets"
-            when defined?(Propshaft::Railtie)
-              "propshaft"
-            else
-              nil
-            end
+            "propshaft" if defined?(Propshaft::Railtie)
           end
 
           def skip_gem?(gem_name)

data/lib/rails/commands/console/irb_console.rb

@@ -6,7 +6,6 @@ require "irb/command"
 module Rails
   class Console
     class RailsHelperBase < IRB::HelperMethod::Base
-      include ConsoleMethods
     end
 
     class ControllerHelper < RailsHelperBase
@@ -32,6 +31,7 @@ module Rails
 
       def execute(*)
         app = Rails.application
+        app.reload_routes_unless_loaded
         session = ActionDispatch::Integration::Session.new(app)
 
         # This makes app.url_for and app.foo_path available in the console
@@ -87,7 +87,8 @@ module Rails
 
         env = colorized_env
         prompt_prefix = "%N(#{env})"
-        IRB.conf[:IRB_NAME] = @app.name
+        # Respect user's configured irb name.
+        IRB.conf[:IRB_NAME] = @app.name if IRB.conf[:IRB_NAME] == "irb"
 
         IRB.conf[:PROMPT][:RAILS_PROMPT] = {
           PROMPT_I: "#{prompt_prefix}> ",
@@ -107,10 +108,6 @@ module Rails
           end
         end
 
-        # Because some users/libs use Rails::ConsoleMethods to extend Rails console,
-        # we still include it for backward compatibility.
-        IRB::ExtendCommandBundle.include ConsoleMethods
-
         # Respect user's choice of prompt mode.
         IRB.conf[:PROMPT_MODE] = :RAILS_PROMPT if IRB.conf[:PROMPT_MODE] == :DEFAULT
         IRB::Irb.new.run(IRB.conf)

data/lib/rails/commands/credentials/USAGE

@@ -38,8 +38,8 @@ Set up Git to Diff Credentials:
     Running the command enrolls the project such that all credentials files use the
     "rails_credentials" diff driver in .gitattributes.
 
-    Additionally since Git requires the driver itself to be set up in a config file
-    that isn't tracked Rails automatically ensures it's configured when running
+    Additionally, since Git requires the driver itself to be set up in a config file
+    that isn't tracked, Rails automatically ensures it's configured when running
     `<%= executable(:edit) %>`.
 
     Otherwise each co-worker would have to run enable manually, including on each new
@@ -48,8 +48,8 @@ Set up Git to Diff Credentials:
     To disenroll from this feature, run `<%= executable(:diff) %> --disenroll`.
 
 Editing Credentials:
-    This will open a temporary file in `$VISUAL` or `$EDITOR` with the decrypted
-    contents to edit the encrypted credentials.
+    `<%= executable(:edit) %>` will open a temporary file in `$VISUAL` or `$EDITOR`
+    with the decrypted contents to edit the encrypted credentials.
 
     When the temporary file is next saved the contents are encrypted and written to
     `config/credentials.yml.enc` while the file itself is destroyed to prevent credentials

data/lib/rails/commands/credentials/credentials_command.rb

@@ -128,7 +128,11 @@ module Rails
         end
 
         def extract_environment_from_path(path)
-          available_environments.find { |env| path.end_with?("#{env}.yml.enc") }
+          available_environments.find { |env| path.end_with?("#{env}.yml.enc") } || extract_custom_environment(path)
+        end
+
+        def extract_custom_environment(path)
+          path =~ %r{config/credentials/(.+)\.yml\.enc} && $1
         end
     end
   end

data/lib/rails/commands/dev/dev_command.rb

@@ -5,7 +5,7 @@ require "rails/dev_caching"
 module Rails
   module Command
     class DevCommand < Base # :nodoc:
-      desc "cache", "Toggle development mode caching on/off"
+      desc "cache", "Toggle Action Controller development mode caching on/off"
       def cache
         Rails::DevCaching.enable_by_file
       end

data/lib/rails/commands/devcontainer/devcontainer_command.rb

@@ -24,9 +24,10 @@ module Rails
             app_name: Rails.application.railtie_name.chomp("_application"),
             database: !!defined?(ActiveRecord) && database,
             active_storage: !!defined?(ActiveStorage),
-            redis: !!(defined?(ActionCable) || defined?(ActiveJob)),
+            redis: !!((defined?(ActionCable) && !defined?(SolidCable)) || (defined?(ActiveJob) && !defined?(SolidQueue))),
             system_test: File.exist?("test/application_system_test_case.rb"),
             node: File.exist?(".node-version"),
+            kamal: File.exist?("config/deploy.yml"),
           }
         end
 

data/lib/rails/commands/stats/stats_command.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Rails
+  module Command
+    class StatsCommand < Base # :nodoc:
+      desc "stats", "Report code statistics (KLOCs, etc) from the application or engine"
+      def perform
+        require "rails/code_statistics"
+        boot_application!
+
+        stat_directories = Rails::CodeStatistics.directories.map do |name, dir|
+          [name, Rails::Command.application_root.join(dir)]
+        end.select { |name, dir| File.directory?(dir) }
+
+        Rails::CodeStatistics.new(*stat_directories).to_s
+      end
+    end
+  end
+end

data/lib/rails/console/methods.rb

@@ -1,23 +1,7 @@
 # frozen_string_literal: true
 
-module Rails
-  module ConsoleMethods
-    def self.include(_mod, ...)
-      raise_deprecation_warning
-      super
-    end
-
-    def self.method_added(_method_name)
-      raise_deprecation_warning
-      super
-    end
-
-    def self.raise_deprecation_warning
-      Rails.deprecator.warn(<<~MSG, caller_locations(2..2))
-        Extending Rails console through `Rails::ConsoleMethods` is deprecated and will be removed in Rails 8.0.
-        Please directly use IRB's extension API to add new commands or helpers to the console.
-        For more details, please visit: https://github.com/ruby/irb/blob/master/EXTEND_IRB.md
-      MSG
-    end
-  end
-end
+Rails.deprecator.warn(<<~MSG, caller_locations(0..1))
+`rails/console/methods` has been deprecated and will be removed in Rails 8.1.
+Please directly use IRB's extension API to add new commands or helpers to the console.
+For more details, please visit: https://github.com/ruby/irb/blob/master/EXTEND_IRB.md
+MSG

data/lib/rails/dev_caching.rb

@@ -12,10 +12,10 @@ module Rails
 
         if File.exist?(FILE)
           delete_cache_file
-          puts "Development mode is no longer being cached."
+          puts "Action Controller caching disabled for development mode."
         else
           create_cache_file
-          puts "Development mode is now being cached."
+          puts "Action Controller caching enabled for development mode."
         end
 
         FileUtils.touch "tmp/restart.txt"

data/lib/rails/engine/configuration.rb

@@ -6,7 +6,7 @@ module Rails
   class Engine
     class Configuration < ::Rails::Railtie::Configuration
       attr_reader :root
-      attr_accessor :middleware, :javascript_path
+      attr_accessor :middleware, :javascript_path, :route_set_class, :default_scope
       attr_writer :eager_load_paths, :autoload_once_paths, :autoload_paths
 
       # An array of custom autoload paths to be added to the ones defined
@@ -44,6 +44,8 @@ module Rails
         @generators = app_generators.dup
         @middleware = Rails::Configuration::MiddlewareStackProxy.new
         @javascript_path = "javascript"
+        @route_set_class = ActionDispatch::Routing::RouteSet
+        @default_scope = nil
 
         @autoload_paths = []
         @autoload_once_paths = []

data/lib/rails/engine/lazy_route_set.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+# :markup: markdown
+
+require "action_dispatch/routing/route_set"
+
+# :enddoc:
+
+module Rails
+  class Engine
+    class LazyRouteSet < ActionDispatch::Routing::RouteSet
+      class NamedRouteCollection < ActionDispatch::Routing::RouteSet::NamedRouteCollection
+        def route_defined?(name)
+          Rails.application&.reload_routes_unless_loaded
+          super
+        end
+      end
+
+      module ProxyUrlHelpers
+        def url_for(options)
+          Rails.application&.reload_routes_unless_loaded
+          super
+        end
+
+        def full_url_for(options)
+          Rails.application&.reload_routes_unless_loaded
+          super
+        end
+
+        def route_for(name, *args)
+          Rails.application&.reload_routes_unless_loaded
+          super
+        end
+
+        def optimize_routes_generation?
+          Rails.application&.reload_routes_unless_loaded
+          super
+        end
+      end
+
+      def initialize(config = DEFAULT_CONFIG)
+        super
+        self.named_routes = NamedRouteCollection.new
+        named_routes.url_helpers_module.prepend(method_missing_module)
+        named_routes.path_helpers_module.prepend(method_missing_module)
+      end
+
+      def generate_extras(options, recall = {})
+        Rails.application&.reload_routes_unless_loaded
+
+        super(options, recall)
+      end
+
+      def generate_url_helpers(supports_path)
+        super.tap { |mod| mod.singleton_class.prepend(ProxyUrlHelpers) }
+      end
+
+      def call(req)
+        Rails.application&.reload_routes_unless_loaded
+        super
+      end
+
+      def polymorphic_mappings
+        Rails.application&.reload_routes_unless_loaded
+        super
+      end
+
+      def draw(&block)
+        Rails.application&.reload_routes_unless_loaded
+        super
+      end
+
+      def recognize_path(path, environment = {})
+        Rails.application&.reload_routes_unless_loaded
+        super
+      end
+
+      def recognize_path_with_request(...)
+        Rails.application&.reload_routes_unless_loaded
+        super
+      end
+
+      def routes
+        Rails.application&.reload_routes_unless_loaded
+        super
+      end
+
+      private
+        def method_missing_module
+          @method_missing_module ||= Module.new do
+            private
+              def method_missing(...)
+                if Rails.application&.reload_routes_unless_loaded
+                  public_send(...)
+                else
+                  super
+                end
+              end
+
+              def respond_to_missing?(...)
+                if Rails.application&.reload_routes_unless_loaded
+                  respond_to?(...)
+                else
+                  super
+                end
+              end
+          end
+        end
+    end
+  end
+end

data/lib/rails/engine.rb

@@ -6,7 +6,6 @@ require "active_support/callbacks"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/try"
 require "pathname"
-require "thread"
 
 module Rails
   # +Rails::Engine+ allows you to wrap a specific \Rails application or subset of
@@ -246,7 +245,7 @@ module Rails
   #   polymorphic_url(MyEngine::Article.new)
   #   # => "articles_path" # not "my_engine_articles_path"
   #
-  #   form_for(MyEngine::Article.new) do
+  #   form_with(model: MyEngine::Article.new) do
   #     text_field :title # => <input type="text" name="article[title]" id="article_title" />
   #   end
   #
@@ -295,7 +294,7 @@ module Rails
   # All you need to do is pass the helper as the first element in array with
   # attributes for URL:
   #
-  #   form_for([my_engine, @user])
+  #   form_with(model: [my_engine, @user])
   #
   # This code will use <tt>my_engine.user_path(@user)</tt> to generate the proper route.
   #
@@ -349,6 +348,7 @@ module Rails
   #   config.railties_order = [Blog::Engine, :main_app, :all]
   class Engine < Railtie
     autoload :Configuration, "rails/engine/configuration"
+    autoload :LazyRouteSet,  "rails/engine/lazy_route_set"
 
     class << self
       attr_accessor :called_from, :isolated
@@ -385,7 +385,8 @@ module Rails
       def isolate_namespace(mod)
         engine_name(generate_railtie_name(mod.name))
 
-        routes.default_scope = { module: ActiveSupport::Inflector.underscore(mod.name) }
+        config.default_scope = { module: ActiveSupport::Inflector.underscore(mod.name) }
+
         self.isolated = true
 
         unless mod.respond_to?(:railtie_namespace)
@@ -451,7 +452,6 @@ module Rails
     # Load console and invoke the registered hooks.
     # Check Rails::Railtie.console for more info.
     def load_console(app = self)
-      require "rails/console/methods"
       run_console_blocks(app)
       self
     end
@@ -543,7 +543,7 @@ module Rails
     # Defines the routes for this engine. If a block is given to
     # routes, it is appended to the engine.
     def routes(&block)
-      @routes ||= ActionDispatch::Routing::RouteSet.new_with_config(config)
+      @routes ||= config.route_set_class.new_with_config(config)
       @routes.append(&block) if block_given?
       @routes
     end
@@ -588,6 +588,10 @@ module Rails
       config.eager_load_paths.freeze
     end
 
+    initializer :make_routes_lazy, before: :bootstrap_hook do |app|
+      config.route_set_class = LazyRouteSet if Rails.env.local?
+    end
+
     initializer :add_routing_paths do |app|
       routing_paths = paths["config/routes.rb"].existent
       external_paths = self.paths["config/routes"].paths

data/lib/rails/gem_version.rb

@@ -7,9 +7,9 @@ module Rails
   end
 
   module VERSION
-    MAJOR = 7
-    MINOR = 2
-    TINY  = 3
+    MAJOR = 8
+    MINOR = 0
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/rails/generators/actions.rb

@@ -520,9 +520,9 @@ module Rails
 
         def route_namespace_pattern(namespace)
           namespace.each_with_index.reverse_each.reduce(nil) do |pattern, (name, i)|
-            cummulative_margin = "\\#{i + 1}[ ]{2}"
-            blank_or_indented_line = "^[ ]*\n|^#{cummulative_margin}.*\n"
-            "(?:(?:#{blank_or_indented_line})*?^(#{cummulative_margin})namespace :#{name} do\n#{pattern})?"
+            cumulative_margin = "\\#{i + 1}[ ]{2}"
+            blank_or_indented_line = "^[ ]*\n|^#{cumulative_margin}.*\n"
+            "(?:(?:#{blank_or_indented_line})*?^(#{cumulative_margin})namespace :#{name} do\n#{pattern})?"
           end.then do |pattern|
             /^([ ]*).+\.routes\.draw do[ ]*\n#{pattern}/
           end

data/lib/rails/generators/app_base.rb

@@ -7,19 +7,20 @@ require "open-uri"
 require "tsort"
 require "uri"
 require "rails/generators"
+require "rails/generators/bundle_helper"
 require "active_support/core_ext/array/extract_options"
 
 module Rails
   module Generators
     class AppBase < Base # :nodoc:
       include AppName
+      include BundleHelper
 
       NODE_LTS_VERSION = "20.11.1"
       BUN_VERSION = "1.0.1"
 
       JAVASCRIPT_OPTIONS = %w( importmap bun webpack esbuild rollup )
       CSS_OPTIONS = %w( tailwind bootstrap bulma postcss sass )
-      ASSET_PIPELINE_OPTIONS = %w( none sprockets propshaft )
 
       attr_accessor :rails_template
       add_shebang_option!
@@ -74,10 +75,6 @@ module Rails
 
         class_option :skip_asset_pipeline, type: :boolean, aliases: "-A", default: nil
 
-        class_option :asset_pipeline,      type: :string, aliases: "-a", default: "sprockets",
-                                           enum: ASSET_PIPELINE_OPTIONS,
-                                           desc: "Choose your asset pipeline"
-
         class_option :skip_javascript,     type: :boolean, aliases: ["-J", "--skip-js"], default: (true if name == "plugin"),
                                            desc: "Skip JavaScript files"
 
@@ -99,6 +96,9 @@ module Rails
         class_option :skip_dev_gems,       type: :boolean, default: nil,
                                            desc: "Skip development gems (e.g., web-console)"
 
+        class_option :skip_thruster,       type: :boolean, default: nil,
+                                           desc: "Skip Thruster setup"
+
         class_option :skip_rubocop,        type: :boolean, default: nil,
                                            desc: "Skip RuboCop setup"
 
@@ -108,10 +108,16 @@ module Rails
         class_option :skip_ci,             type: :boolean, default: nil,
                                            desc: "Skip GitHub CI files"
 
+        class_option :skip_kamal,          type: :boolean, default: nil,
+                                           desc: "Skip Kamal setup"
+
+        class_option :skip_solid,          type: :boolean, default: nil,
+                                           desc: "Skip Solid Cache, Queue, and Cable setup"
+
         class_option :dev,                 type: :boolean, default: nil,
                                            desc: "Set up the #{name} with Gemfile pointing to your Rails checkout"
 
-        class_option :devcontainer,        type: :boolean, default: false,
+        class_option :devcontainer,        type: :boolean, default: nil,
                                            desc: "Generate devcontainer files"
 
         class_option :edge,                type: :boolean, default: nil,
@@ -197,7 +203,7 @@ module Rails
 
       OPTION_IMPLICATIONS = { # :nodoc:
         skip_active_job:     [:skip_action_mailer, :skip_active_storage],
-        skip_active_record:  [:skip_active_storage],
+        skip_active_record:  [:skip_active_storage, :skip_solid],
         skip_active_storage: [:skip_action_mailbox, :skip_action_text],
         skip_javascript:     [:skip_hotwire],
       }
@@ -287,12 +293,7 @@ module Rails
       end
 
       def asset_pipeline_gemfile_entry
-        return if skip_asset_pipeline?
-
-        if options[:asset_pipeline] == "sprockets"
-          GemfileEntry.floats "sprockets-rails",
-            "The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]"
-        elsif options[:asset_pipeline] == "propshaft"
+        unless skip_asset_pipeline?
           GemfileEntry.floats "propshaft", "The modern asset pipeline for Rails [https://github.com/rails/propshaft]"
         end
       end
@@ -386,12 +387,8 @@ module Rails
         options[:skip_asset_pipeline]
       end
 
-      def skip_sprockets?
-        skip_asset_pipeline? || options[:asset_pipeline] != "sprockets"
-      end
-
-      def skip_propshaft?
-        skip_asset_pipeline? || options[:asset_pipeline] != "propshaft"
+      def skip_thruster?
+        options[:skip_thruster]
       end
 
       def skip_rubocop?
@@ -414,6 +411,14 @@ module Rails
         options[:devcontainer]
       end
 
+      def skip_kamal?
+        options[:skip_kamal]
+      end
+
+      def skip_solid?
+        options[:skip_solid]
+      end
+
       class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
         def initialize(name, version, comment, options = {}, commented_out = false)
           super
@@ -536,6 +541,11 @@ module Rails
         "latest"
       end
 
+      def yarn_through_corepack?
+        true if dockerfile_yarn_version == "latest"
+        dockerfile_yarn_version >= "2"
+      end
+
       def dockerfile_bun_version
         using_bun? and `bun --version`[/\d+\.\d+\.\d+/]
       rescue
@@ -572,7 +582,7 @@ module Rails
       end
 
       def dockerfile_base_packages
-        # Add curl to work with the default healthcheck strategy in Kamal
+        # Add curl to work with the default health check strategy in Kamal
         packages = ["curl"]
 
         # ActiveRecord databases
@@ -606,6 +616,14 @@ module Rails
         packages.compact.sort
       end
 
+      def ci_packages
+        if depends_on_system_test?
+          dockerfile_build_packages << "google-chrome-stable"
+        else
+          dockerfile_build_packages
+        end
+      end
+
       def css_gemfile_entry
         return if options[:api]
         return unless options[:css]
@@ -620,35 +638,9 @@ module Rails
       end
 
       def cable_gemfile_entry
-        return if options[:skip_action_cable]
-
-        comment = "Use Redis adapter to run Action Cable in production"
-        GemfileEntry.new("redis", ">= 4.0.1", comment, {}, true)
-      end
-
-      def bundle_command(command, env = {})
-        say_status :run, "bundle #{command}"
-
-        # We are going to shell out rather than invoking Bundler::CLI.new(command)
-        # because `rails new` loads the Thor gem and on the other hand bundler uses
-        # its own vendored Thor, which could be a different version. Running both
-        # things in the same process is a recipe for a night with paracetamol.
-        #
-        # Thanks to James Tucker for the Gem tricks involved in this call.
-        _bundle_command = Gem.bin_path("bundler", "bundle")
-
-        require "bundler"
-        Bundler.with_original_env do
-          exec_bundle_command(_bundle_command, command, env)
-        end
-      end
-
-      def exec_bundle_command(bundle_command, command, env)
-        full_command = %Q["#{Gem.ruby}" "#{bundle_command}" #{command}]
-        if options[:quiet]
-          system(env, full_command, out: File::NULL)
-        else
-          system(env, full_command)
+        if !options[:skip_action_cable] && options[:skip_solid]
+          comment = "Use Redis adapter to run Action Cable in production"
+          GemfileEntry.new("redis", ">= 4.0.1", comment, {}, true)
         end
       end
 
@@ -656,10 +648,6 @@ module Rails
         !(options[:skip_bundle] || options[:pretend])
       end
 
-      def bundler_windows_platforms
-        Gem.rubygems_version >= Gem::Version.new("3.3.22") ? "windows" : "mswin mswin64 mingw x64_mingw"
-      end
-
       def depends_on_system_test?
         !(options[:skip_system_test] || options[:skip_test] || options[:api])
       end
@@ -721,6 +709,25 @@ module Rails
         end
       end
 
+      def run_kamal
+        return if options[:skip_kamal] || !bundle_install?
+
+        bundle_command "binstubs kamal"
+        bundle_command "exec kamal init"
+
+        template "kamal-secrets.tt", ".kamal/secrets", force: true
+        template "config/deploy.yml", force: true
+      end
+
+      def run_solid
+        return if skip_solid? || !bundle_install?
+
+        commands = "solid_cache:install solid_queue:install"
+        commands += " solid_cable:install" unless skip_action_cable?
+
+        rails_command commands
+      end
+
       def add_bundler_platforms
         if bundle_install? && !jruby?
           # The vast majority of Rails apps will be deployed on `x86_64-linux`.
@@ -731,14 +738,27 @@ module Rails
         end
       end
 
+      def generate_bundler_binstub
+        if bundle_install?
+          bundle_command("binstubs bundler")
+        end
+      end
+
       def jruby?
         defined?(JRUBY_VERSION)
       end
 
-      def generate_bundler_binstub
-        if bundle_install?
-          bundle_command("binstubs bundler")
+      def version_manager_ruby_version
+        return ENV["RBENV_VERSION"] if ENV["RBENV_VERSION"]
+        return ENV["rvm_ruby_string"] if ENV["rvm_ruby_string"]
+
+        version = if RUBY_ENGINE == "ruby"
+          Gem.ruby_version.to_s.sub(/\.([a-zA-Z])/, '-\1')
+        else
+          RUBY_ENGINE_VERSION
         end
+
+        "#{RUBY_ENGINE}-#{version}"
       end
 
       def empty_directory_with_keep_file(destination, config = {})