railties 7.2.1.2 → 8.0.0.beta1

data/lib/rails/engine/lazy_route_set.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+# :markup: markdown
+
+require "action_dispatch/routing/route_set"
+
+module Rails
+  class Engine
+    class LazyRouteSet < ActionDispatch::Routing::RouteSet # :nodoc:
+      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
+
+        def polymorphic_url(record_or_hash_or_array, options = {})
+          Rails.application&.reload_routes_unless_loaded
+          super
+        end
+
+        def polymorphic_path(record_or_hash_or_array, options = {})
+          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 draw(&block)
+        Rails.application&.reload_routes_unless_loaded
+        super
+      end
+
+      def recognize_path(path, environment = {})
+        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(method_name, *args, &block)
+                if Rails.application&.reload_routes_unless_loaded
+                  public_send(method_name, *args, &block)
+                else
+                  super(method_name, *args, &block)
+                end
+              end
+
+              def respond_to_missing?(method_name, *args)
+                if Rails.application&.reload_routes_unless_loaded
+                  respond_to?(method_name, *args)
+                else
+                  super(method_name, *args)
+                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
@@ -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)
@@ -543,7 +544,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 +589,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
@@ -643,9 +648,9 @@ module Rails
       end
     end
 
-    initializer :wrap_executor_around_load_seed do |app|
+    initializer :wrap_reloader_around_load_seed do |app|
       self.class.set_callback(:load_seed, :around) do |engine, seeds_block|
-        app.executor.wrap(&seeds_block)
+        app.reloader.wrap(&seeds_block)
       end
     end
 

data/lib/rails/gem_version.rb

@@ -7,10 +7,10 @@ module Rails
   end
 
   module VERSION
-    MAJOR = 7
-    MINOR = 2
-    TINY  = 1
-    PRE   = "2"
+    MAJOR = 8
+    MINOR = 0
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/app_base.rb

@@ -19,7 +19,6 @@ module Rails
 
       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 +73,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 +94,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 +106,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 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 +201,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 +291,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 +385,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 +409,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
@@ -572,7 +575,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
@@ -620,10 +623,10 @@ 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)
+        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
 
       def bundle_command(command, env = {})
@@ -721,6 +724,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?
           # The vast majority of Rails apps will be deployed on `x86_64-linux`.

data/lib/rails/generators/database.rb

@@ -3,25 +3,91 @@
 module Rails
   module Generators
     class Database
-      DATABASES = %w( mysql trilogy postgresql sqlite3 )
+      DATABASES = %w( mysql trilogy postgresql sqlite3 mariadb-mysql mariadb-trilogy )
+
+      module MySQL
+        def name
+          "mysql"
+        end
+
+        def port
+          3306
+        end
+
+        def service
+          {
+            "image" => "mysql/mysql-server:8.0",
+            "restart" => "unless-stopped",
+            "environment" => {
+              "MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
+              "MYSQL_ROOT_HOST" => "%"
+            },
+            "volumes" => ["mysql-data:/var/lib/mysql"],
+            "networks" => ["default"],
+          }
+        end
+
+        def socket
+          @socket ||= [
+            "/tmp/mysql.sock",                        # default
+            "/var/run/mysqld/mysqld.sock",            # debian/gentoo
+            "/var/tmp/mysql.sock",                    # freebsd
+            "/var/lib/mysql/mysql.sock",              # fedora
+            "/opt/local/lib/mysql/mysql.sock",        # fedora
+            "/opt/local/var/run/mysqld/mysqld.sock",  # mac + darwinports + mysql
+            "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
+            "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
+            "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
+          ].find { |f| File.exist?(f) } unless Gem.win_platform?
+        end
+
+        def host
+          "127.0.0.1"
+        end
+      end
+
+      module MariaDB
+        def name
+          "mariadb"
+        end
+
+        def port
+          3306
+        end
+
+        def service
+          {
+            "image" => "mariadb:10.5",
+            "restart" => "unless-stopped",
+            "networks" => ["default"],
+            "volumes" => ["mariadb-data:/var/lib/mysql"],
+            "environment" => {
+              "MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
+            },
+          }
+        end
+      end
 
       class << self
         def build(database_name)
           case database_name
-          when "mysql" then MySQL.new
+          when "mysql" then MySQL2.new
           when "postgresql" then PostgreSQL.new
-          when "trilogy" then MariaDB.new
+          when "trilogy" then Trilogy.new
           when "sqlite3" then SQLite3.new
+          when "mariadb-mysql" then MariaDBMySQL2.new
+          when "mariadb-trilogy" then MariaDBTrilogy.new
           else Null.new
           end
         end
 
         def all
           @all ||= [
-            MySQL.new,
+            MySQL2.new,
             PostgreSQL.new,
-            MariaDB.new,
             SQLite3.new,
+            MariaDBMySQL2.new,
+            MariaDBTrilogy.new
           ]
         end
       end
@@ -30,6 +96,10 @@ module Rails
         raise NotImplementedError
       end
 
+      def template
+        raise NotImplementedError
+      end
+
       def service
         raise NotImplementedError
       end
@@ -69,48 +139,11 @@ module Rails
         "#{name}-data"
       end
 
-      module MySqlSocket
-        def socket
-          @socket ||= [
-            "/tmp/mysql.sock",                        # default
-            "/var/run/mysqld/mysqld.sock",            # debian/gentoo
-            "/var/tmp/mysql.sock",                    # freebsd
-            "/var/lib/mysql/mysql.sock",              # fedora
-            "/opt/local/lib/mysql/mysql.sock",        # fedora
-            "/opt/local/var/run/mysqld/mysqld.sock",  # mac + darwinports + mysql
-            "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
-            "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
-            "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
-          ].find { |f| File.exist?(f) } unless Gem.win_platform?
-        end
-
-        def host
-          "localhost"
-        end
-      end
-
-      class MySQL < Database
-        include MySqlSocket
+      class MySQL2 < Database
+        include MySQL
 
-        def name
-          "mysql"
-        end
-
-        def service
-          {
-            "image" => "mysql/mysql-server:8.0",
-            "restart" => "unless-stopped",
-            "environment" => {
-              "MYSQL_ALLOW_EMPTY_PASSWORD" => "true",
-              "MYSQL_ROOT_HOST" => "%"
-            },
-            "volumes" => ["mysql-data:/var/lib/mysql"],
-            "networks" => ["default"],
-          }
-        end
-
-        def port
-          3306
+        def template
+          "config/databases/mysql.yml"
         end
 
         def gem
@@ -135,6 +168,10 @@ module Rails
           "postgres"
         end
 
+        def template
+          "config/databases/postgresql.yml"
+        end
+
         def service
           {
             "image" => "postgres:16.1",
@@ -169,27 +206,11 @@ module Rails
         end
       end
 
-      class MariaDB < Database
-        include MySqlSocket
+      class Trilogy < Database
+        include MySQL
 
-        def name
-          "mariadb"
-        end
-
-        def service
-          {
-            "image" => "mariadb:10.5",
-            "restart" => "unless-stopped",
-            "networks" => ["default"],
-            "volumes" => ["mariadb-data:/var/lib/mysql"],
-            "environment" => {
-              "MARIADB_ALLOW_EMPTY_ROOT_PASSWORD" => "true",
-            },
-          }
-        end
-
-        def port
-          3306
+        def template
+          "config/databases/trilogy.yml"
         end
 
         def gem
@@ -214,6 +235,10 @@ module Rails
           "sqlite3"
         end
 
+        def template
+          "config/databases/sqlite3.yml"
+        end
+
         def service
           nil
         end
@@ -223,7 +248,7 @@ module Rails
         end
 
         def gem
-          ["sqlite3", [">= 1.4"]]
+          ["sqlite3", [">= 2.1"]]
         end
 
         def base_package
@@ -239,8 +264,17 @@ module Rails
         end
       end
 
+      class MariaDBMySQL2 < MySQL2
+        include MariaDB
+      end
+
+      class MariaDBTrilogy < Trilogy
+        include MariaDB
+      end
+
       class Null < Database
         def name; end
+        def template; end
         def service; end
         def port; end
         def volume; end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "rails/generators/erb"
+
+module Erb # :nodoc:
+  module Generators # :nodoc:
+    class AuthenticationGenerator < Rails::Generators::Base # :nodoc:
+      def create_files
+        template "views/passwords/new.html.erb", File.join("app/views/passwords/new.html.erb")
+        template "views/passwords/edit.html.erb", File.join("app/views/passwords/edit.html.erb")
+        template "views/sessions/new.html.erb", File.join("app/views/sessions/new.html.erb")
+      end
+    end
+  end
+end

data/lib/rails/generators/erb/authentication/templates/views/passwords/edit.html.erb

@@ -0,0 +1,9 @@
+<h1>Update your password</h2>
+
+<%%= tag.div(flash[:alert], style: "color:red") if flash[:alert] %>
+
+<%%= form_with url: password_path(params[:token]), method: :put do |form| %>
+  <%%= form.password_field :password, required: true, autocomplete: "new-password", placeholder: "Enter new password", maxlength: 72 %><br>
+  <%%= form.password_field :password_confirmation, required: true, autocomplete: "new-password", placeholder: "Repeat new password", maxlength: 72 %><br>
+  <%%= form.submit "Save" %>
+<%% end %>

data/lib/rails/generators/erb/authentication/templates/views/passwords/new.html.erb

@@ -0,0 +1,8 @@
+<h1>Forgot your password?</h1>
+
+<%%= tag.div(flash[:alert], style: "color:red") if flash[:alert] %>
+
+<%%= form_with url: passwords_path do |form| %>
+  <%%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address] %><br>
+  <%%= form.submit "Email reset instructions" %>
+<%% end %>

data/lib/rails/generators/erb/authentication/templates/views/sessions/new.html.erb

@@ -0,0 +1,11 @@
+<%%= tag.div(flash[:alert], style: "color:red") if flash[:alert] %>
+<%%= tag.div(flash[:notice], style: "color:green") if flash[:notice] %>
+
+<%%= form_with url: session_path do |form| %>
+  <%%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", placeholder: "Enter your email address", value: params[:email_address] %><br>
+  <%%= form.password_field :password, required: true, autocomplete: "current-password", placeholder: "Enter your password", maxlength: 72 %><br>
+  <%%= form.submit "Sign in" %>
+<%% end %>
+<br>
+
+<%%= link_to "Forgot password?", new_password_path %>

data/lib/rails/generators/generated_attribute.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_support/time"
+require "active_support/core_ext/string/starts_ends_with"
 
 module Rails
   module Generators
@@ -89,20 +90,24 @@ module Rails
           def parse_type_and_options(type)
             case type
             when /(text|binary)\{([a-z]+)\}/
-              return $1, size: $2.to_sym
+              parsed_type, parsed_options = $1, { size: $2.to_sym }
             when /(string|text|binary|integer)\{(\d+)\}/
-              return $1, limit: $2.to_i
+              parsed_type, parsed_options = $1, { limit: $2.to_i }
             when /decimal\{(\d+)[,.-](\d+)\}/
-              return :decimal, precision: $1.to_i, scale: $2.to_i
+              parsed_type, parsed_options = :decimal, { precision: $1.to_i, scale: $2.to_i }
             when /(references|belongs_to)\{(.+)\}/
-              type = $1
+              parsed_type = $1
               provided_options = $2.split(/[,.-]/)
-              options = Hash[provided_options.map { |opt| [opt.to_sym, true] }]
-
-              return type, options
+              parsed_options = Hash[provided_options.map { |opt| [opt.to_sym, true] }]
             else
-              return type, {}
+              parsed_type, parsed_options = type&.remove("!"), {}
+            end
+
+            if type&.ends_with?("!")
+              parsed_options[:null] = false
             end
+
+            return parsed_type, parsed_options
           end
       end
 
@@ -121,9 +126,9 @@ module Rails
                         when :time                     then :time_field
                         when :datetime, :timestamp     then :datetime_field
                         when :date                     then :date_field
-                        when :text                     then :text_area
-                        when :rich_text                then :rich_text_area
-                        when :boolean                  then :check_box
+                        when :text                     then :textarea
+                        when :rich_text                then :rich_textarea
+                        when :boolean                  then :checkbox
                         when :attachment, :attachments then :file_field
                         else
                           :text_field