railties 7.0.10 → 7.1.0.beta1

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.

data/lib/rails/generators/database.rb

@@ -4,7 +4,7 @@ module Rails
   module Generators
     module Database # :nodoc:
       JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
-      DATABASES = %w( mysql postgresql sqlite3 oracle sqlserver ) + JDBC_DATABASES
+      DATABASES = %w( mysql trilogy postgresql sqlite3 oracle sqlserver ) + JDBC_DATABASES
 
       def initialize(*)
         super
@@ -14,6 +14,7 @@ module Rails
       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]
@@ -38,6 +39,23 @@ module Rails
         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
+        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
+      end
+
       private
         def mysql_socket
           @mysql_socket ||= [

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/generated_attribute.rb

@@ -62,7 +62,6 @@ module Rails
 
         def valid_type?(type)
           DEFAULT_TYPES.include?(type.to_s) ||
-            !defined?(ActiveRecord::Base) ||
             ActiveRecord::Base.connection.valid_type?(type)
         end
 
@@ -79,6 +78,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+)\}/

data/lib/rails/generators/migration.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,24 @@
 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
+Examples:
+    `rails new ~/Code/Ruby/weblog`
 
-    This generates a skeletal Rails installation in ~/Code/Ruby/weblog.
+    This generates a new Rails app in ~/Code/Ruby/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.

data/lib/rails/generators/rails/app/app_generator.rb

@@ -21,8 +21,8 @@ module Rails
         RUBY
       end
 
-      def method_missing(meth, *args, &block)
-        @generator.send(meth, *args, &block)
+      def method_missing(...)
+        @generator.send(...)
       end
   end
 
@@ -54,6 +54,10 @@ module Rails
       template "ruby-version", ".ruby-version"
     end
 
+    def node_version
+      template "node-version", ".node-version"
+    end
+
     def gemfile
       template "Gemfile"
     end
@@ -70,12 +74,17 @@ module Rails
       template "gitattributes", ".gitattributes"
     end
 
+    def dockerfiles
+      template "Dockerfile"
+      template "dockerignore", ".dockerignore"
+
+      template "docker-entrypoint", "bin/docker-entrypoint"
+      chmod "bin/docker-entrypoint", 0755 & ~File.umask, verbose: false
+    end
+
     def version_control
       if !options[:skip_git] && !options[:pretend]
-        run "git init", capture: options[:quiet], abort_on_failure: false
-        if user_default_branch.strip.empty?
-          `git symbolic-ref HEAD refs/heads/main`
-        end
+        run git_init_command, capture: options[:quiet], abort_on_failure: false
       end
     end
 
@@ -103,16 +112,16 @@ module Rails
       empty_directory "config"
 
       inside "config" do
-        template "routes.rb" unless options[:updating]
+        template "routes.rb" unless options[:update]
         template "application.rb"
         template "environment.rb"
-        template "cable.yml" unless options[:updating] || options[:skip_action_cable]
-        template "puma.rb"   unless options[:updating]
-        template "storage.yml" unless options[:updating] || skip_active_storage?
+        template "cable.yml" unless options[:update] || options[:skip_action_cable]
+        template "puma.rb"   unless options[:update]
+        template "storage.yml" unless options[:update] || skip_active_storage?
 
         directory "environments"
         directory "initializers"
-        directory "locales" unless options[:updating]
+        directory "locales" unless options[:update]
       end
     end
 
@@ -182,7 +191,15 @@ module Rails
       return if options[:pretend] || options[:dummy_app]
 
       require "rails/generators/rails/credentials/credentials_generator"
-      Rails::Generators::CredentialsGenerator.new([], quiet: options[:quiet]).add_credentials_file_silently
+      Rails::Generators::CredentialsGenerator.new([], quiet: true).add_credentials_file
+    end
+
+    def credentials_diff_enroll
+      return if options[:skip_decrypted_diffs] || options[:dummy_app] || options[:pretend]
+
+      @generator.shell.mute do
+        rails_command "credentials:diff --enroll", inline: true, shell: @generator.shell
+      end
     end
 
     def database_yml
@@ -193,14 +210,6 @@ module Rails
       directory "db"
     end
 
-    def db_when_updating
-      path = File.expand_path("db/schema.rb", destination_root)
-
-      if File.exist?(path)
-        gsub_file("db/schema.rb", /ActiveRecord::Schema\.define/, "ActiveRecord::Schema[6.1].define")
-      end
-    end
-
     def lib
       empty_directory "lib"
       empty_directory_with_keep_file "lib/tasks"
@@ -252,11 +261,6 @@ module Rails
     def config_target_version
       defined?(@config_target_version) ? @config_target_version : Rails::VERSION::STRING.to_f
     end
-
-    private
-      def user_default_branch
-        @user_default_branch ||= `git config init.defaultbranch`
-      end
   end
 
   module Generators
@@ -273,42 +277,59 @@ module Rails
       class_option :version, type: :boolean, aliases: "-v", group: :rails, desc: "Show Rails version number and quit"
       class_option :api, type: :boolean, desc: "Preconfigure smaller stack for API only apps"
       class_option :minimal, type: :boolean, desc: "Preconfigure a minimal rails app"
-      class_option :javascript, type: :string, aliases: "-j", default: "importmap", desc: "Choose JavaScript approach [options: importmap (default), webpack, esbuild, rollup]"
-      class_option :css, type: :string, aliases: "-c", desc: "Choose CSS processor [options: tailwind, bootstrap, bulma, postcss, sass] check https://github.com/rails/cssbundling-rails"
-      class_option :skip_bundle, type: :boolean, aliases: "-B", default: false, desc: "Don't run bundle install"
+      class_option :javascript, type: :string, aliases: ["-j", "--js"], default: "importmap", desc: "Choose JavaScript approach [options: importmap (default), bun, webpack, esbuild, rollup]"
+      class_option :css, type: :string, aliases: "-c", desc: "Choose CSS processor [options: tailwind, bootstrap, bulma, postcss, sass] check https://github.com/rails/cssbundling-rails for more options"
+      class_option :skip_bundle, type: :boolean, aliases: "-B", default: nil, desc: "Don't run bundle install"
+      class_option :skip_decrypted_diffs, type: :boolean, default: nil, desc: "Don't configure git to show decrypted diffs of encrypted credentials"
+
+      OPTION_IMPLICATIONS = # :nodoc:
+        AppBase::OPTION_IMPLICATIONS.merge(
+          skip_git: [:skip_decrypted_diffs],
+          minimal: [
+            :skip_action_cable,
+            :skip_action_mailbox,
+            :skip_action_mailer,
+            :skip_action_text,
+            :skip_active_job,
+            :skip_active_storage,
+            :skip_bootsnap,
+            :skip_dev_gems,
+            :skip_hotwire,
+            :skip_javascript,
+            :skip_jbuilder,
+            :skip_system_test,
+          ],
+          api: [
+            :skip_asset_pipeline,
+            :skip_javascript,
+          ],
+        ) do |option, implications, more_implications|
+          implications + more_implications
+        end
+
+      META_OPTIONS = [:minimal] # :nodoc:
+
+      def self.apply_rails_template(template, destination) # :nodoc:
+        generator = new([destination], { template: template }, { destination_root: destination })
+        generator.set_default_accessors!
+        generator.apply_rails_template
+        generator.run_bundle
+        generator.run_after_bundle_callbacks
+      end
 
       def initialize(*args)
         super
 
+        imply_options(OPTION_IMPLICATIONS, meta_options: META_OPTIONS)
+
         if !options[:skip_active_record] && !DATABASES.include?(options[:database])
           raise Error, "Invalid value for --database option. Supported preconfigurations are: #{DATABASES.join(", ")}."
         end
 
-        # Force sprockets and JavaScript to be skipped when generating API only apps.
-        # Can't modify options hash as it's frozen by default.
-        if options[:api]
-          self.options = options.merge(skip_asset_pipeline: true, skip_javascript: true).freeze
-        end
-
-        if options[:minimal]
-          self.options = options.merge(
-            skip_action_cable: true,
-            skip_action_mailer: true,
-            skip_action_mailbox: true,
-            skip_action_text: true,
-            skip_active_job: true,
-            skip_active_storage: true,
-            skip_bootsnap: true,
-            skip_dev_gems: true,
-            skip_javascript: true,
-            skip_jbuilder: true,
-            skip_system_test: true,
-            skip_hotwire: true).freeze
-        end
-
         @after_bundle_callbacks = []
       end
 
+      public_task :report_implied_options
       public_task :set_default_accessors!
       public_task :create_root
       public_task :target_rails_prerelease
@@ -316,6 +337,7 @@ module Rails
       def create_root_files
         build(:readme)
         build(:rakefile)
+        build(:node_version) if using_node?
         build(:ruby_version)
         build(:configru)
 
@@ -341,11 +363,6 @@ module Rails
       end
       remove_task :update_bin_files
 
-      def update_db_schema
-        build(:db_when_updating)
-      end
-      remove_task :update_db_schema
-
       def update_active_storage
         unless skip_active_storage?
           rails_command "active_storage:update", inline: true
@@ -353,6 +370,11 @@ module Rails
       end
       remove_task :update_active_storage
 
+      def create_dockerfiles
+        return if options[:skip_docker] || options[:dummy_app]
+        build(:dockerfiles)
+      end
+
       def create_config_files
         build(:config)
       end
@@ -368,6 +390,7 @@ module Rails
 
       def create_credentials
         build(:credentials)
+        build(:credentials_diff_enroll)
       end
 
       def display_upgrade_guide_info
@@ -418,7 +441,7 @@ module Rails
       end
 
       def create_storage_files
-        build(:storage) unless skip_active_storage?
+        build(:storage)
       end
 
       def delete_app_assets_if_api_option
@@ -438,7 +461,7 @@ module Rails
 
       def delete_app_views_if_api_option
         if options[:api]
-          if skip_action_mailer?
+          if options[:skip_action_mailer]
             remove_dir "app/views"
           else
             remove_file "app/views/layouts/application.html.erb"
@@ -483,7 +506,7 @@ module Rails
       end
 
       def delete_action_mailer_files_skipping_action_mailer
-        if skip_action_mailer?
+        if options[:skip_action_mailer]
           remove_file "app/views/layouts/mailer.html.erb"
           remove_file "app/views/layouts/mailer.text.erb"
           remove_dir "app/mailers"
@@ -514,7 +537,7 @@ module Rails
 
       def delete_new_framework_defaults
         unless options[:update]
-          remove_file "config/initializers/new_framework_defaults_7_0.rb"
+          remove_file "config/initializers/new_framework_defaults_#{Rails::VERSION::MAJOR}_#{Rails::VERSION::MINOR}.rb"
         end
       end
 
@@ -522,7 +545,8 @@ module Rails
         build(:leftovers)
       end
 
-      public_task :apply_rails_template, :run_bundle
+      public_task :apply_rails_template
+      public_task :run_bundle
       public_task :generate_bundler_binstub
       public_task :run_javascript
       public_task :run_hotwire

data/lib/rails/generators/rails/app/templates/Dockerfile.tt

@@ -0,0 +1,107 @@
+# syntax = docker/dockerfile:1
+
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
+ARG RUBY_VERSION=<%= Gem.ruby_version %>
+FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
+
+# Rails app lives here
+WORKDIR /rails
+
+# Set production environment
+ENV RAILS_ENV="production" \
+    BUNDLE_DEPLOYMENT="1" \
+    BUNDLE_PATH="/usr/local/bundle" \
+    BUNDLE_WITHOUT="development"
+
+
+# Throw-away build stage to reduce size of final image
+FROM base as build
+
+# Install packages needed to build gems<%= using_node? ? " and node modules" : "" %>
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y <%= dockerfile_build_packages.join(" ") %>
+
+<% if using_node? -%>
+# Install JavaScript dependencies
+ARG NODE_VERSION=<%= node_version %>
+ARG YARN_VERSION=<%= dockerfile_yarn_version %>
+ENV PATH=/usr/local/node/bin:$PATH
+RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
+    /tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
+    npm install -g yarn@$YARN_VERSION && \
+    rm -rf /tmp/node-build-master
+
+<% end -%>
+
+<% if using_bun? -%>
+ENV BUN_INSTALL=/usr/local/bun
+ENV PATH=/usr/local/bun/bin:$PATH
+ARG BUN_VERSION=<%= dockerfile_bun_version %>
+RUN curl -fsSL https://bun.sh/install | bash -s -- "${BUN_VERSION}"
+
+<% end -%>
+
+# Install application gems
+COPY Gemfile Gemfile.lock ./
+RUN bundle install && \
+    rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git<% if depend_on_bootsnap? -%> && \
+    bundle exec bootsnap precompile --gemfile
+<% end %>
+
+<% if using_node? -%>
+# Install node modules
+COPY package.json yarn.lock ./
+RUN yarn install --frozen-lockfile
+
+<% end -%>
+
+<% if using_bun? -%>
+# Install node modules
+COPY package.json bun.lockb ./
+RUN bun install --frozen-lockfile
+
+<% end -%>
+# Copy application code
+COPY . .
+
+<% if depend_on_bootsnap? -%>
+# Precompile bootsnap code for faster boot times
+RUN bundle exec bootsnap precompile app/ lib/
+
+<% end -%>
+<% unless dockerfile_binfile_fixups.empty? -%>
+# Adjust binfiles to be executable on Linux
+<%= "RUN " + dockerfile_binfile_fixups.join(" && \\\n    ") %>
+
+<% end -%>
+<% unless options.api? || skip_asset_pipeline? -%>
+# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
+RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
+
+<% end -%>
+
+# Final stage for app image
+FROM base
+
+<% unless dockerfile_deploy_packages.empty? -%>
+# Install packages needed for deployment
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y <%= dockerfile_deploy_packages.join(" ") %> && \
+    rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+<% end -%>
+# Copy built artifacts: gems, application
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build /rails /rails
+
+# Run and own only the runtime files as a non-root user for security
+RUN useradd rails --create-home --shell /bin/bash && \
+    chown -R rails:rails <%= dockerfile_chown_directories.join(" ") %>
+USER rails:rails
+
+# Entrypoint prepares the database.
+ENTRYPOINT ["/rails/bin/docker-entrypoint"]
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 3000
+CMD ["./bin/rails", "server"]