railties 7.1.6 → 7.2.3

data/lib/rails/generators/actions.rb

@@ -445,8 +445,8 @@ module Rails
 
       private
         # Define log for backwards compatibility. If just one argument is sent,
-        # invoke say, otherwise invoke say_status. Differently from say and
-        # similarly to say_status, this method respects the quiet? option given.
+        # invoke +say+, otherwise invoke +say_status+. Differently from +say+ and
+        # similarly to +say_status+, this method respects the +quiet?+ option given.
         def log(*args) # :doc:
           if args.size == 1
             say args.first.to_s unless options.quiet?
@@ -456,7 +456,7 @@ module Rails
           end
         end
 
-        # Runs the supplied command using either "rake ..." or "rails ..."
+        # Runs the supplied command using either +rake+ or +rails+
         # based on the executor parameter provided.
         def execute_command(executor, command, options = {}) # :doc:
           log executor, command
@@ -490,12 +490,16 @@ module Rails
         end
         alias rebase_indentation optimize_indentation
 
-        # Indent the +Gemfile+ to the depth of @indentation
+        # Returns a string corresponding to the current indentation level
+        # (i.e. 2 * <code>@indentation</code> spaces). See also
+        # #with_indentation, which can be used to manage the indentation level.
         def indentation # :doc:
           "  " * @indentation
         end
 
-        # Manage +Gemfile+ indentation for a DSL action block
+        # Increases the current indentation indentation level for the duration
+        # of the given block, and decreases it after the block ends. Call
+        # #indentation to get an indentation string.
         def with_indentation(&block) # :doc:
           @indentation += 1
           instance_eval(&block)

data/lib/rails/generators/app_base.rb

@@ -12,12 +12,15 @@ require "active_support/core_ext/array/extract_options"
 module Rails
   module Generators
     class AppBase < Base # :nodoc:
-      include Database
       include AppName
 
-      NODE_LTS_VERSION = "18.15.0"
+      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!
 
@@ -35,7 +38,8 @@ module Rails
                                            desc: "Path to some #{name} template (can be a filesystem path or URL)"
 
         class_option :database,            type: :string, aliases: "-d", default: "sqlite3",
-                                           desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+                                           enum: Database::DATABASES,
+                                           desc: "Preconfigure for selected database"
 
         class_option :skip_git,            type: :boolean, aliases: "-G", default: nil,
                                            desc: "Skip git init, .gitignore and .gitattributes"
@@ -71,7 +75,8 @@ module Rails
         class_option :skip_asset_pipeline, type: :boolean, aliases: "-A", default: nil
 
         class_option :asset_pipeline,      type: :string, aliases: "-a", default: "sprockets",
-                                           desc: "Choose your asset pipeline [options: sprockets (default), propshaft]"
+                                           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"
@@ -94,9 +99,21 @@ module Rails
         class_option :skip_dev_gems,       type: :boolean, default: nil,
                                            desc: "Skip development gems (e.g., web-console)"
 
+        class_option :skip_rubocop,        type: :boolean, default: nil,
+                                           desc: "Skip RuboCop setup"
+
+        class_option :skip_brakeman,       type: :boolean, default: nil,
+                                           desc: "Skip brakeman setup"
+
+        class_option :skip_ci,             type: :boolean, default: nil,
+                                           desc: "Skip GitHub CI files"
+
         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,
+                                           desc: "Generate devcontainer files"
+
         class_option :edge,                type: :boolean, default: nil,
                                            desc: "Set up the #{name} with a Gemfile pointing to the #{edge_branch} branch on the Rails repository"
 
@@ -260,7 +277,7 @@ module Rails
       def database_gemfile_entry # :doc:
         return if options[:skip_active_record]
 
-        gem_name, gem_version = gem_for_database
+        gem_name, gem_version = database.gem
         GemfileEntry.version gem_name, gem_version,
           "Use #{options[:database]} as the database for Active Record"
       end
@@ -345,6 +362,10 @@ module Rails
         options[:skip_active_storage]
       end
 
+      def skip_storage? # :doc:
+        skip_active_storage? && !sqlite3?
+      end
+
       def skip_action_cable? # :doc:
         options[:skip_action_cable]
       end
@@ -373,6 +394,25 @@ module Rails
         skip_asset_pipeline? || options[:asset_pipeline] != "propshaft"
       end
 
+      def skip_rubocop?
+        options[:skip_rubocop]
+      end
+
+      def skip_brakeman?
+        options[:skip_brakeman]
+      end
+
+      def skip_ci?
+        options[:skip_ci]
+      end
+
+      def skip_devcontainer?
+        !options[:devcontainer]
+      end
+
+      def devcontainer?
+        options[:devcontainer]
+      end
 
       class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
         def initialize(name, version, comment, options = {}, commented_out = false)
@@ -410,10 +450,6 @@ module Rails
         end
       end
 
-      def gem_ruby_version
-        Gem::Version.new(Gem::VERSION) >= Gem::Version.new("3.3.13") ? Gem.ruby_version : RUBY_VERSION
-      end
-
       def rails_prerelease?
         options.dev? || options.edge? || options.main?
       end
@@ -535,17 +571,28 @@ module Rails
         binfixups
       end
 
-      def dockerfile_build_packages
-        # start with the essentials
-        packages = %w(build-essential git pkg-config)
+      def dockerfile_base_packages
+        # Add curl to work with the default healthcheck strategy in Kamal
+        packages = ["curl"]
 
-        # add database support
-        packages << build_package_for_database unless skip_active_record?
+        # ActiveRecord databases
+        packages << database.base_package unless skip_active_record?
 
         # ActiveStorage preview support
         packages << "libvips" unless skip_active_storage?
 
-        packages << "curl" if using_js_runtime?
+        # jemalloc for memory optimization
+        packages << "libjemalloc2"
+
+        packages.compact.sort
+      end
+
+      def dockerfile_build_packages
+        # start with the essentials
+        packages = %w(build-essential git pkg-config libyaml-dev)
+
+        # add database support
+        packages << database.build_package unless skip_active_record?
 
         packages << "unzip" if using_bun?
 
@@ -553,43 +600,14 @@ module Rails
         if using_node?
           packages << "node-gyp" # pkg-config already listed above
 
-          # module build process depends on Python, and debian changed
-          # how python is installed with the bullseye release.  Below
-          # is based on debian release included with the Ruby images on
-          # Dockerhub.
-          case Gem.ruby_version.to_s
-          when /^2\.7/
-            bullseye = Gem.ruby_version >= Gem::Version.new("2.7.4")
-          when /^3\.0/
-            bullseye = Gem.ruby_version >= Gem::Version.new("3.0.2")
-          else
-            bullseye = true
-          end
-
-          if bullseye
-            packages << "python-is-python3"
-          else
-            packages << "python"
-          end
+          packages << "python-is-python3"
         end
 
         packages.compact.sort
       end
 
-      def dockerfile_deploy_packages
-        # Add curl to work with the default healthcheck strategy in Kamal
-        packages = ["curl"]
-
-        # ActiveRecord databases
-        packages << deploy_package_for_database unless skip_active_record?
-
-        # ActiveStorage preview support
-        packages << "libvips" unless skip_active_storage?
-
-        packages.compact.sort
-      end
-
       def css_gemfile_entry
+        return if options[:api]
         return unless options[:css]
 
         if !using_js_runtime? && options[:css] == "tailwind"
@@ -647,7 +665,7 @@ module Rails
       end
 
       def depend_on_bootsnap?
-        !options[:skip_bootsnap] && !options[:dev] && !defined?(JRUBY_VERSION)
+        !options[:skip_bootsnap] && !options[:dev] && !jruby?
       end
 
       def target_rails_prerelease(self_command = "new")
@@ -656,7 +674,6 @@ module Rails
         if !File.exist?(File.expand_path("Gemfile", destination_root))
           create_file("Gemfile", <<~GEMFILE)
             source "https://rubygems.org"
-            git_source(:github) { |repo| "https://github.com/\#{repo}.git" }
             #{rails_gemfile_entry}
           GEMFILE
 
@@ -674,7 +691,7 @@ module Rails
       end
 
       def run_bundle
-        bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
+        bundle_command("install --quiet", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
       end
 
       def run_javascript
@@ -705,7 +722,7 @@ module Rails
       end
 
       def add_bundler_platforms
-        if bundle_install?
+        if bundle_install? && !jruby?
           # The vast majority of Rails apps will be deployed on `x86_64-linux`.
           bundle_command("lock --add-platform=x86_64-linux")
 
@@ -714,6 +731,10 @@ module Rails
         end
       end
 
+      def jruby?
+        defined?(JRUBY_VERSION)
+      end
+
       def generate_bundler_binstub
         if bundle_install?
           bundle_command("binstubs bundler")
@@ -752,11 +773,15 @@ module Rails
       def dockerfile_chown_directories
         directories = %w(log tmp)
 
-        directories << "storage" unless skip_active_storage? && !sqlite3?
+        directories << "storage" unless skip_storage?
         directories << "db" unless skip_active_record?
 
         directories.sort
       end
+
+      def database
+        @database ||= Database.build(options[:database])
+      end
     end
   end
 end

data/lib/rails/generators/base.rb

@@ -222,7 +222,7 @@ module Rails
       end
 
       # Returns the default source root for a given generator. This is used internally
-      # by \Rails to set its generators source root. If you want to customize your source
+      # by Rails to set its generators source root. If you want to customize your source
       # root, you should use source_root.
       def self.default_source_root
         return unless base_name && generator_name
@@ -423,6 +423,10 @@ module Rails
           path = File.expand_path(File.join(base_name, generator_name), base_root)
           path if File.exist?(path)
         end
+
+        def gem_ruby_version
+          Gem::Version.new(Gem::VERSION) >= Gem::Version.new("3.3.13") ? Gem.ruby_version : RUBY_VERSION
+        end
     end
   end
 end

data/lib/rails/generators/database.rb

@@ -2,83 +2,76 @@
 
 module Rails
   module Generators
-    module Database # :nodoc:
-      JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
-      DATABASES = %w( mysql trilogy postgresql sqlite3 oracle sqlserver ) + JDBC_DATABASES
-
-      def initialize(*)
-        super
-        convert_database_option_for_jruby
-      end
-
-      def gem_for_database(database = options[:database])
-        case database
-        when "mysql"          then ["mysql2", ["~> 0.5"]]
-        when "trilogy"        then ["trilogy", ["~> 2.4"]]
-        when "postgresql"     then ["pg", ["~> 1.1"]]
-        when "sqlite3"        then ["sqlite3", [">= 1.4"]]
-        when "oracle"         then ["activerecord-oracle_enhanced-adapter", nil]
-        when "sqlserver"      then ["activerecord-sqlserver-adapter", nil]
-        when "jdbcmysql"      then ["activerecord-jdbcmysql-adapter", nil]
-        when "jdbcsqlite3"    then ["activerecord-jdbcsqlite3-adapter", nil]
-        when "jdbcpostgresql" then ["activerecord-jdbcpostgresql-adapter", nil]
-        when "jdbc"           then ["activerecord-jdbc-adapter", nil]
-        else [database, nil]
-        end
-      end
-
-      def docker_for_database_build(database = options[:database])
-        case database
-        when "mysql"          then "build-essential default-libmysqlclient-dev git"
-        when "trilogy"        then "build-essential default-libmysqlclient-dev git"
-        when "postgresql"     then "build-essential git libpq-dev"
-        when "sqlite3"        then "build-essential git"
-        else nil
-        end
-      end
-
-      def docker_for_database_deploy(database = options[:database])
-        case database
-        when "mysql"          then "curl default-mysql-client libvips"
-        when "trilogy"        then "curl default-mysql-client libvips"
-        when "postgresql"     then "curl libvips postgresql-client"
-        when "sqlite3"        then "curl libsqlite3-0 libvips"
-        else nil
-        end
-      end
-
-      def convert_database_option_for_jruby
-        if defined?(JRUBY_VERSION)
-          opt = options.dup
-          case opt[:database]
-          when "postgresql" then opt[:database] = "jdbcpostgresql"
-          when "mysql"      then opt[:database] = "jdbcmysql"
-          when "sqlite3"    then opt[:database] = "jdbcsqlite3"
+    class Database
+      DATABASES = %w( mysql trilogy postgresql sqlite3 )
+
+      class << self
+        def build(database_name)
+          case database_name
+          when "mysql" then MySQL.new
+          when "postgresql" then PostgreSQL.new
+          when "trilogy" then MariaDB.new
+          when "sqlite3" then SQLite3.new
+          else Null.new
           end
-          self.options = opt.freeze
         end
-      end
 
-      def build_package_for_database(database = options[:database])
-        case database
-        when "mysql" then "default-libmysqlclient-dev"
-        when "postgresql" then "libpq-dev"
-        else nil
+        def all
+          @all ||= [
+            MySQL.new,
+            PostgreSQL.new,
+            MariaDB.new,
+            SQLite3.new,
+          ]
         end
       end
 
-      def deploy_package_for_database(database = options[:database])
-        case database
-        when "mysql" then "default-mysql-client"
-        when "postgresql" then "postgresql-client"
-        when "sqlite3" then "libsqlite3-0"
-        else nil
-        end
+      def name
+        raise NotImplementedError
+      end
+
+      def service
+        raise NotImplementedError
+      end
+
+      def port
+        raise NotImplementedError
+      end
+
+      def feature_name
+        raise NotImplementedError
       end
 
-      private
-        def mysql_socket
-          @mysql_socket ||= [
+      def gem
+        raise NotImplementedError
+      end
+
+      def base_package
+        raise NotImplementedError
+      end
+
+      def build_package
+        raise NotImplementedError
+      end
+
+      def socket; end
+      def host; end
+
+      def feature
+        return unless feature_name
+
+        { feature_name => {} }
+      end
+
+      def volume
+        return unless service
+
+        "#{name}-data"
+      end
+
+      module MySqlSocket
+        def socket
+          @socket ||= [
             "/tmp/mysql.sock",                        # default
             "/var/run/mysqld/mysqld.sock",            # debian/gentoo
             "/var/tmp/mysql.sock",                    # freebsd
@@ -90,6 +83,171 @@ module Rails
             "/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
+
+        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
+        end
+
+        def gem
+          ["mysql2", ["~> 0.5"]]
+        end
+
+        def base_package
+          "default-mysql-client"
+        end
+
+        def build_package
+          "default-libmysqlclient-dev"
+        end
+
+        def feature_name
+          "ghcr.io/rails/devcontainer/features/mysql-client"
+        end
+      end
+
+      class PostgreSQL < Database
+        def name
+          "postgres"
+        end
+
+        def service
+          {
+            "image" => "postgres:16.1",
+            "restart" => "unless-stopped",
+            "networks" => ["default"],
+            "volumes" => ["postgres-data:/var/lib/postgresql/data"],
+            "environment" => {
+              "POSTGRES_USER" => "postgres",
+              "POSTGRES_PASSWORD" => "postgres"
+            }
+          }
+        end
+
+        def port
+          5432
+        end
+
+        def gem
+          ["pg", ["~> 1.1"]]
+        end
+
+        def base_package
+          "postgresql-client"
+        end
+
+        def build_package
+          "libpq-dev"
+        end
+
+        def feature_name
+          "ghcr.io/rails/devcontainer/features/postgres-client"
+        end
+      end
+
+      class MariaDB < Database
+        include MySqlSocket
+
+        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
+        end
+
+        def gem
+          ["trilogy", ["~> 2.7"]]
+        end
+
+        def base_package
+          nil
+        end
+
+        def build_package
+          nil
+        end
+
+        def feature_name
+          nil
+        end
+      end
+
+      class SQLite3 < Database
+        def name
+          "sqlite3"
+        end
+
+        def service
+          nil
+        end
+
+        def port
+          nil
+        end
+
+        def gem
+          ["sqlite3", [">= 1.4"]]
+        end
+
+        def base_package
+          "sqlite3"
+        end
+
+        def build_package
+          nil
+        end
+
+        def feature_name
+          "ghcr.io/rails/devcontainer/features/sqlite3"
+        end
+      end
+
+      class Null < Database
+        def name; end
+        def service; end
+        def port; end
+        def volume; end
+        def base_package; end
+        def build_package; end
+        def feature_name; end
+      end
     end
   end
 end

data/lib/rails/generators/erb/scaffold/templates/edit.html.erb.tt

@@ -1,3 +1,5 @@
+<%% content_for :title, "Editing <%= human_name.downcase %>" %>
+
 <h1>Editing <%= human_name.downcase %></h1>
 
 <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>

data/lib/rails/generators/erb/scaffold/templates/index.html.erb.tt

@@ -1,5 +1,7 @@
 <p style="color: green"><%%= notice %></p>
 
+<%% content_for :title, "<%= human_name.pluralize %>" %>
+
 <h1><%= human_name.pluralize %></h1>
 
 <div id="<%= plural_table_name %>">

data/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt

@@ -1,3 +1,5 @@
+<%% content_for :title, "New <%= human_name.downcase %>" %>
+
 <h1>New <%= human_name.downcase %></h1>
 
 <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>

data/lib/rails/generators/generated_attribute.rb

@@ -72,7 +72,7 @@ module Rails
         def valid_type?(type)
           DEFAULT_TYPES.include?(type.to_s) ||
             !defined?(ActiveRecord::Base) ||
-            ActiveRecord::Base.connection.valid_type?(type)
+            ActiveRecord::Base.lease_connection.valid_type?(type)
         end
 
         def valid_index_type?(index_type)
@@ -239,6 +239,31 @@ module Rails
           end
         end
       end
+
+      def to_s
+        if has_uniq_index?
+          "#{name}:#{type}#{print_attribute_options}:uniq"
+        elsif has_index?
+          "#{name}:#{type}#{print_attribute_options}:index"
+        else
+          "#{name}:#{type}#{print_attribute_options}"
+        end
+      end
+
+      private
+        def print_attribute_options
+          if attr_options.empty?
+            ""
+          elsif attr_options[:size]
+            "{#{attr_options[:size]}}"
+          elsif attr_options[:limit]
+            "{#{attr_options[:limit]}}"
+          elsif attr_options[:precision] && attr_options[:scale]
+            "{#{attr_options[:precision]},#{attr_options[:scale]}}"
+          else
+            "{#{attr_options.keys.join(",")}}"
+          end
+        end
     end
   end
 end