railties 7.0.8 → 7.2.0

data/lib/rails/generators/app_name.rb

@@ -7,26 +7,15 @@ module Rails
 
       private
         def app_name
-          @app_name ||= original_app_name.tr("\\", "").tr("-. ", "_")
+          @app_name ||= original_app_name.parameterize(preserve_case: true).underscore
         end
 
         def original_app_name
-          @original_app_name ||= defined_app_const_base? ? defined_app_name : File.basename(destination_root)
+          @original_app_name ||= (options[:name] || File.basename(destination_root))
         end
 
-        def defined_app_name
-          defined_app_const_base.underscore
-        end
-
-        def defined_app_const_base
-          Rails.respond_to?(:application) && defined?(Rails::Application) &&
-            Rails.application.is_a?(Rails::Application) && Rails.application.class.name.chomp("::Application")
-        end
-
-        alias :defined_app_const_base? :defined_app_const_base
-
         def app_const_base
-          @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, "_").squeeze("_").camelize
+          @app_const_base ||= app_name.gsub(/\W/, "_").squeeze("_").camelize
         end
         alias :camelized :app_const_base
 

data/lib/rails/generators/base.rb

@@ -79,15 +79,15 @@ module Rails
       #
       # For example, if the user invoke the controller generator as:
       #
-      #   bin/rails generate controller Account --test-framework=test_unit
+      #   $ bin/rails generate controller Account --test-framework=test_unit
       #
       # The controller generator will then try to invoke the following generators:
       #
       #   "rails:test_unit", "test_unit:controller", "test_unit"
       #
       # Notice that "rails:generators:test_unit" could be loaded as well, what
-      # Rails looks for is the first and last parts of the namespace. This is what
-      # allows any test framework to hook into Rails as long as it provides any
+      # \Rails looks for is the first and last parts of the namespace. This is what
+      # allows any test framework to hook into \Rails as long as it provides any
       # of the hooks above.
       #
       # ==== Options
@@ -134,11 +134,11 @@ module Rails
       # All hooks come with switches for user interface. If you do not want
       # to use any test framework, you can do:
       #
-      #   bin/rails generate controller Account --skip-test-framework
+      #   $ bin/rails generate controller Account --skip-test-framework
       #
       # Or similarly:
       #
-      #   bin/rails generate controller Account --no-test-framework
+      #   $ bin/rails generate controller Account --no-test-framework
       #
       # ==== Boolean hooks
       #
@@ -150,7 +150,7 @@ module Rails
       #
       # Then, if you want webrat to be invoked, just supply:
       #
-      #   bin/rails generate controller Account --webrat
+      #   $ bin/rails generate controller Account --webrat
       #
       # The hooks lookup is similar as above:
       #
@@ -189,6 +189,13 @@ module Rails
             class_option(name, defaults.merge!(options))
           end
 
+          klass = self
+
+          singleton_class.define_method("#{name}_generator") do
+            value = class_options[name].default
+            Rails::Generators.find_by_namespace(klass.generator_name, value)
+          end
+
           hooks[name] = [ in_base, as_hook ]
           invoke_from_option(name, options, &block)
         end
@@ -201,6 +208,7 @@ module Rails
         remove_invocation(*names)
 
         names.each do |name|
+          singleton_class.undef_method("#{name}_generator")
           hooks.delete(name)
         end
       end
@@ -214,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
@@ -317,9 +325,9 @@ module Rails
           @namespaced_path ||= namespace_dirs.join("/")
         end
 
-        # Use Rails default banner.
+        # Use \Rails default banner.
         def self.banner # :doc:
-          "rails generate #{namespace.delete_prefix("rails:")} #{arguments.map(&:usage).join(' ')} [options]".gsub(/\s+/, " ")
+          "bin/rails generate #{namespace.delete_prefix("rails:")} #{arguments.map(&:usage).join(' ')} [options]".gsub(/\s+/, " ")
         end
 
         # Sets the base_name taking into account the current class namespace.
@@ -415,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,45 +2,76 @@
 
 module Rails
   module Generators
-    module Database # :nodoc:
-      JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
-      DATABASES = %w( mysql 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 "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 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
+
+        def all
+          @all ||= [
+            MySQL.new,
+            PostgreSQL.new,
+            MariaDB.new,
+            SQLite3.new,
+          ]
+        end
+      end
+
+      def name
+        raise NotImplementedError
+      end
+
+      def service
+        raise NotImplementedError
+      end
+
+      def port
+        raise NotImplementedError
+      end
+
+      def feature_name
+        raise NotImplementedError
+      end
+
+      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
 
-      private
-        def mysql_socket
-          @mysql_socket ||= [
+      module MySqlSocket
+        def socket
+          @socket ||= [
             "/tmp/mysql.sock",                        # default
             "/var/run/mysqld/mysqld.sock",            # debian/gentoo
             "/var/tmp/mysql.sock",                    # freebsd
@@ -52,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
+          "libsqlite3-0"
+        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/mailer/templates/layout.html.erb.tt

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <style>
       /* Email styles need to be inline */
     </style>

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

@@ -43,6 +43,10 @@ module Rails
           type, attr_options = *parse_type_and_options(type)
           type = type.to_sym if type
 
+          if dangerous_name?(name)
+            raise Error, "Could not generate field '#{name}', as it is already defined by Active Record."
+          end
+
           if type && !valid_type?(type)
             raise Error, "Could not generate field '#{name}' with unknown type '#{type}'."
           end
@@ -60,9 +64,15 @@ module Rails
           new(name, type, index_type, attr_options)
         end
 
+        def dangerous_name?(name)
+          defined?(ActiveRecord::Base) &&
+            ActiveRecord::Base.dangerous_attribute_method?(name)
+        end
+
         def valid_type?(type)
           DEFAULT_TYPES.include?(type.to_s) ||
-            ActiveRecord::Base.connection.valid_type?(type)
+            !defined?(ActiveRecord::Base) ||
+            ActiveRecord::Base.lease_connection.valid_type?(type)
         end
 
         def valid_index_type?(index_type)
@@ -78,6 +88,8 @@ module Rails
           # when declaring options curly brackets should be used
           def parse_type_and_options(type)
             case type
+            when /(text|binary)\{([a-z]+)\}/
+              return $1, size: $2.to_sym
             when /(string|text|binary|integer)\{(\d+)\}/
               return $1, limit: $2.to_i
             when /decimal\{(\d+)[,.-](\d+)\}/
@@ -227,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

data/lib/rails/generators/migration.rb

@@ -7,7 +7,7 @@ module Rails
   module Generators
     # Holds common methods for migrations. It assumes that migrations have the
     # [0-9]*_name format and can be used by other frameworks (like Sequel)
-    # just by implementing the next migration version method.
+    # just by implementing the +next_migration_number+ method.
     module Migration
       extend ActiveSupport::Concern
       attr_reader :migration_number, :migration_file_name, :migration_class_name
@@ -46,10 +46,10 @@ module Rails
       end
 
       # Creates a migration template at the given destination. The difference
-      # to the default template method is that the migration version is appended
+      # to the default template method is that the migration number is prepended
       # to the destination file name.
       #
-      # The migration version, migration file name, migration class name are
+      # The migration number, migration file name, migration class name are
       # available as instance variables in the template to be rendered.
       #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"
@@ -57,13 +57,12 @@ module Rails
         source = File.expand_path(find_in_source_paths(source.to_s))
 
         set_migration_assigns!(destination)
-        context = instance_eval("binding")
 
         dir, base = File.split(destination)
         numbered_destination = File.join(dir, ["%migration_number%", base].join("_"))
 
         file = create_migration numbered_destination, nil, config do
-          ERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer").result(context)
+          ERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer").result(binding)
         end
         Rails::Generators.add_generated_file(file)
       end

data/lib/rails/generators/model_helpers.rb

@@ -19,7 +19,8 @@ module Rails
       mattr_accessor :skip_warn
 
       def self.included(base) # :nodoc:
-        base.class_option :force_plural, type: :boolean, default: false, desc: "Forces the use of the given model name"
+        base.class_option :force_plural, type: :boolean, default: false,
+          desc: "Do not singularize the model name, even if it appears plural"
       end
 
       def initialize(args, *_options)

data/lib/rails/generators/rails/app/USAGE

@@ -1,15 +1,31 @@
 Description:
-    The 'rails new' command creates a new Rails application with a default
+    The `rails new` command creates a new Rails application with a default
     directory structure and configuration at the path you specify.
 
     You can specify extra command-line arguments to be used every time
-    'rails new' runs in the .railsrc configuration file in your home directory,
+    `rails new` runs in the .railsrc configuration file in your home directory,
     or in $XDG_CONFIG_HOME/rails/railsrc if XDG_CONFIG_HOME is set.
 
     Note that the arguments specified in the .railsrc file don't affect the
-    defaults values shown above in this help message.
+    default values shown above in this help message.
 
-Example:
-    rails new ~/Code/Ruby/weblog
+    You can specify which version to use when creating a new rails application 
+    using `rails _<version>_ new`.
 
-    This generates a skeletal Rails installation in ~/Code/Ruby/weblog.
+Examples:
+    `rails new ~/Code/Ruby/weblog`
+
+    This generates a new Rails app in ~/Code/Ruby/weblog.
+
+    `rails _<version>_ new weblog`
+
+    This generates a new Rails app with the provided version in ./weblog.
+
+    `rails new weblog --api`
+
+    This generates a new Rails app in API mode in ./weblog.
+
+    `rails new weblog --skip-action-mailer`
+
+    This generates a new Rails app without Action Mailer in ./weblog.
+    Any part of Rails can be skipped during app generation.