railties 6.1.7.8 → 7.0.8.6

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

@@ -1,5 +1,9 @@
-<h1>New <%= singular_table_name.titleize %></h1>
+<h1>New <%= human_name.downcase %></h1>
 
-<%%= render 'form', <%= singular_table_name %>: @<%= singular_table_name %> %>
+<%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
 
-<%%= link_to 'Back', <%= index_helper %>_path %>
+<br>
+
+<div>
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
+</div>

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

@@ -0,0 +1,17 @@
+<div id="<%%= dom_id <%= singular_name %> %>">
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+  <p>
+    <strong><%= attribute.human_name %>:</strong>
+<% if attribute.attachment? -%>
+    <%%= link_to <%= singular_name %>.<%= attribute.column_name %>.filename, <%= singular_name %>.<%= attribute.column_name %> if <%= singular_name %>.<%= attribute.column_name %>.attached? %>
+<% elsif attribute.attachments? -%>
+    <%% <%= singular_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>| %>
+      <div><%%= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %> %></div>
+    <%% end %>
+<% else -%>
+    <%%= <%= singular_name %>.<%= attribute.column_name %> %>
+<% end -%>
+  </p>
+
+<% end -%>
+</div>

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

@@ -1,19 +1,10 @@
-<p id="notice"><%%= notice %></p>
+<p style="color: green"><%%= notice %></p>
 
-<% attributes.reject(&:password_digest?).each do |attribute| -%>
-<p>
-  <strong><%= attribute.human_name %>:</strong>
-<% if attribute.attachment? -%>
-  <%%= link_to @<%= singular_table_name %>.<%= attribute.column_name %>.filename, @<%= singular_table_name %>.<%= attribute.column_name %> if @<%= singular_table_name %>.<%= attribute.column_name %>.attached? %>
-<% elsif attribute.attachments? -%>
-  <%% @<%= singular_table_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>| %>
-    <div><%%= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %> %></div>
-  <%% end %>
-<% else -%>
-  <%%= @<%= singular_table_name %>.<%= attribute.column_name %> %>
-<% end -%>
-</p>
+<%%= render @<%= singular_table_name %> %>
 
-<% end -%>
-<%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
-<%%= link_to 'Back', <%= index_helper %>_path %>
+<div>
+  <%%= link_to "Edit this <%= human_name.downcase %>", <%= edit_helper(type: :path) %> %> |
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
+
+  <%%= button_to "Destroy this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete %>
+</div>

data/lib/rails/generators/erb.rb

@@ -4,7 +4,7 @@ require "rails/generators/named_base"
 
 module Erb # :nodoc:
   module Generators # :nodoc:
-    class Base < Rails::Generators::NamedBase #:nodoc:
+    class Base < Rails::Generators::NamedBase # :nodoc:
       private
         def formats
           [format]

data/lib/rails/generators/generated_attribute.rb

@@ -7,6 +7,25 @@ module Rails
     class GeneratedAttribute # :nodoc:
       INDEX_OPTIONS = %w(index uniq)
       UNIQ_INDEX_OPTIONS = %w(uniq)
+      DEFAULT_TYPES = %w(
+        attachment
+        attachments
+        belongs_to
+        boolean
+        date
+        datetime
+        decimal
+        digest
+        float
+        integer
+        references
+        rich_text
+        string
+        text
+        time
+        timestamp
+        token
+      )
 
       attr_accessor :name, :type
       attr_reader   :attr_options
@@ -14,23 +33,40 @@ module Rails
 
       class << self
         def parse(column_definition)
-          name, type, has_index = column_definition.split(":")
+          name, type, index_type = column_definition.split(":")
 
           # if user provided "name:index" instead of "name:string:index"
           # type should be set blank so GeneratedAttribute's constructor
           # could set it to :string
-          has_index, type = type, nil if INDEX_OPTIONS.include?(type)
+          index_type, type = type, nil if valid_index_type?(type)
 
           type, attr_options = *parse_type_and_options(type)
           type = type.to_sym if type
 
+          if type && !valid_type?(type)
+            raise Error, "Could not generate field '#{name}' with unknown type '#{type}'."
+          end
+
+          if index_type && !valid_index_type?(index_type)
+            raise Error, "Could not generate field '#{name}' with unknown index '#{index_type}'."
+          end
+
           if type && reference?(type)
-            if UNIQ_INDEX_OPTIONS.include?(has_index)
+            if UNIQ_INDEX_OPTIONS.include?(index_type)
               attr_options[:index] = { unique: true }
             end
           end
 
-          new(name, type, has_index, attr_options)
+          new(name, type, index_type, attr_options)
+        end
+
+        def valid_type?(type)
+          DEFAULT_TYPES.include?(type.to_s) ||
+            ActiveRecord::Base.connection.valid_type?(type)
+        end
+
+        def valid_index_type?(index_type)
+          INDEX_OPTIONS.include?(index_type.to_s)
         end
 
         def reference?(type)
@@ -70,9 +106,9 @@ module Rails
         @field_type ||= case type
                         when :integer                  then :number_field
                         when :float, :decimal          then :text_field
-                        when :time                     then :time_select
-                        when :datetime, :timestamp     then :datetime_select
-                        when :date                     then :date_select
+                        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
@@ -87,8 +123,8 @@ module Rails
                      when :integer                     then 1
                      when :float                       then 1.5
                      when :decimal                     then "9.99"
-                     when :datetime, :timestamp, :time then Time.now.to_s(:db)
-                     when :date                        then Date.today.to_s(:db)
+                     when :datetime, :timestamp, :time then Time.now.to_fs(:db)
+                     when :date                        then Date.today.to_fs(:db)
                      when :string                      then name == "type" ? "" : "MyString"
                      when :text                        then "MyText"
                      when :boolean                     then false

data/lib/rails/generators/migration.rb

@@ -12,7 +12,7 @@ module Rails
       extend ActiveSupport::Concern
       attr_reader :migration_number, :migration_file_name, :migration_class_name
 
-      module ClassMethods #:nodoc:
+      module ClassMethods # :nodoc:
         def migration_lookup_at(dirname)
           Dir.glob("#{dirname}/[0-9]*_*.rb")
         end
@@ -63,11 +63,7 @@ module Rails
         numbered_destination = File.join(dir, ["%migration_number%", base].join("_"))
 
         file = create_migration numbered_destination, nil, config do
-          if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-            ERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer").result(context)
-          else
-            ERB.new(::File.binread(source), nil, "-", "@output_buffer").result(context)
-          end
+          ERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer").result(context)
         end
         Rails::Generators.add_generated_file(file)
       end

data/lib/rails/generators/model_helpers.rb

@@ -18,7 +18,7 @@ module Rails
       ERROR
       mattr_accessor :skip_warn
 
-      def self.included(base) #:nodoc:
+      def self.included(base) # :nodoc:
         base.class_option :force_plural, type: :boolean, default: false, desc: "Forces the use of the given model name"
       end
 

data/lib/rails/generators/named_base.rb

@@ -8,7 +8,7 @@ module Rails
     class NamedBase < Base
       argument :name, type: :string
 
-      def initialize(args, *options) #:nodoc:
+      def initialize(args, *options) # :nodoc:
         @inside_template = nil
         # Unfreeze name in case it's given as a frozen string
         args[0] = args[0].dup if args[0].is_a?(String) && args[0].frozen?
@@ -94,20 +94,20 @@ module Rails
           singular_name == plural_name
         end
 
-        def index_helper # :doc:
-          uncountable? ? "#{plural_route_name}_index" : plural_route_name
+        def index_helper(type: nil) # :doc:
+          [plural_route_name, ("index" if uncountable?), type].compact.join("_")
         end
 
-        def show_helper # :doc:
-          "#{singular_route_name}_url(@#{singular_table_name})"
+        def show_helper(arg = "@#{singular_table_name}", type: :url) # :doc:
+          "#{singular_route_name}_#{type}(#{arg})"
         end
 
-        def edit_helper # :doc:
-          "edit_#{show_helper}"
+        def edit_helper(...) # :doc:
+          "edit_#{show_helper(...)}"
         end
 
-        def new_helper # :doc:
-          "new_#{singular_route_name}_url"
+        def new_helper(type: :url) # :doc:
+          "new_#{singular_route_name}_#{type}"
         end
 
         def singular_table_name # :doc:
@@ -127,7 +127,7 @@ module Rails
         end
 
         def route_url # :doc:
-          @route_url ||= class_path.collect { |dname| "/" + dname }.join + "/" + plural_file_name
+          @route_url ||= controller_class_path.collect { |dname| "/" + dname }.join + "/" + plural_file_name
         end
 
         def url_helper_prefix # :doc:
@@ -147,8 +147,8 @@ module Rails
           model_resource_name(prefix: "@")
         end
 
-        def model_resource_name(prefix: "") # :doc:
-          resource_name = "#{prefix}#{singular_table_name}"
+        def model_resource_name(base_name = singular_table_name, prefix: "") # :doc:
+          resource_name = "#{prefix}#{base_name}"
           if options[:model_name]
             "[#{controller_class_path.map { |name| ":" + name }.join(", ")}, #{resource_name}]"
           else
@@ -202,7 +202,7 @@ module Rails
         end
 
         # Add a class collisions name to be checked on class initialization. You
-        # can supply a hash with a :prefix or :suffix to be tested.
+        # can supply a hash with a +:prefix+ or +:suffix+ to be tested.
         #
         # ==== Examples
         #

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

@@ -73,13 +73,12 @@ module Rails
     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
       end
     end
 
-    def package_json
-      template "package.json"
-    end
-
     def app
       directory "app"
 
@@ -94,58 +93,42 @@ module Rails
         "#{shebang}\n" + content
       end
       chmod "bin", 0755 & ~File.umask, verbose: false
-
-      remove_file "bin/spring" unless spring_install?
-      remove_file "bin/yarn" if options[:skip_javascript]
     end
 
     def bin_when_updating
       bin
     end
 
-    def yarn_when_updating
-      template "bin/yarn", force: true do |content|
-        "#{shebang}\n" + content
-      end
-
-      chmod "bin", 0755 & ~File.umask, verbose: false
-    end
-
     def config
       empty_directory "config"
 
       inside "config" do
-        template "routes.rb"
+        template "routes.rb" unless options[:updating]
         template "application.rb"
         template "environment.rb"
-        template "cable.yml" unless options[:skip_action_cable]
-        template "puma.rb"   unless options[:skip_puma]
-        template "spring.rb" if spring_install?
-        template "storage.yml" unless skip_active_storage?
+        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?
 
         directory "environments"
         directory "initializers"
-        directory "locales"
+        directory "locales" unless options[:updating]
       end
     end
 
     def config_when_updating
-      cookie_serializer_config_exist = File.exist?("config/initializers/cookies_serializer.rb")
-      action_cable_config_exist      = File.exist?("config/cable.yml")
-      active_storage_config_exist    = File.exist?("config/storage.yml")
-      rack_cors_config_exist         = File.exist?("config/initializers/cors.rb")
-      assets_config_exist            = File.exist?("config/initializers/assets.rb")
-      csp_config_exist               = File.exist?("config/initializers/content_security_policy.rb")
+      action_cable_config_exist       = File.exist?("config/cable.yml")
+      active_storage_config_exist     = File.exist?("config/storage.yml")
+      rack_cors_config_exist          = File.exist?("config/initializers/cors.rb")
+      assets_config_exist             = File.exist?("config/initializers/assets.rb")
+      asset_manifest_exist            = File.exist?("app/assets/config/manifest.js")
+      asset_app_stylesheet_exist      = File.exist?("app/assets/stylesheets/application.css")
+      csp_config_exist                = File.exist?("config/initializers/content_security_policy.rb")
       permissions_policy_config_exist = File.exist?("config/initializers/permissions_policy.rb")
 
       @config_target_version = Rails.application.config.loaded_config_version || "5.0"
 
       config
-      configru
-
-      unless cookie_serializer_config_exist
-        gsub_file "config/initializers/cookies_serializer.rb", /json(?!,)/, "marshal"
-      end
 
       if !options[:skip_action_cable] && !action_cable_config_exist
         template "config/cable.yml"
@@ -155,19 +138,23 @@ module Rails
         template "config/storage.yml"
       end
 
-      if options[:skip_sprockets] && !assets_config_exist
+      if skip_sprockets? && skip_propshaft? && !assets_config_exist
         remove_file "config/initializers/assets.rb"
       end
 
+      if skip_sprockets? && !asset_manifest_exist
+        remove_file "app/assets/config/manifest.js"
+      end
+
+      if skip_sprockets? && !asset_app_stylesheet_exist
+        remove_file "app/assets/stylesheets/application.css"
+      end
+
       unless rack_cors_config_exist
         remove_file "config/initializers/cors.rb"
       end
 
       if options[:api]
-        unless cookie_serializer_config_exist
-          remove_file "config/initializers/cookies_serializer.rb"
-        end
-
         unless csp_config_exist
           remove_file "config/initializers/content_security_policy.rb"
         end
@@ -176,6 +163,10 @@ module Rails
           remove_file "config/initializers/permissions_policy.rb"
         end
       end
+
+      if !skip_sprockets?
+        insert_into_file "config/application.rb", %(require "sprockets/railtie"), after: /require\(["']rails\/all["']\)\n/
+      end
     end
 
     def master_key
@@ -202,6 +193,14 @@ 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"
@@ -253,6 +252,11 @@ 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
@@ -263,28 +267,15 @@ module Rails
     class AppGenerator < AppBase
       # :stopdoc:
 
-      WEBPACKS = %w( react vue angular elm stimulus )
-
       add_shared_options_for "application"
 
       # Add rails command options
-      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 :skip_bundle, type: :boolean, aliases: "-B", default: false,
-                                 desc: "Don't run bundle install"
-
-      class_option :webpack, type: :string, aliases: "--webpacker", default: nil,
-                             desc: "Preconfigure Webpack with a particular framework (options: #{WEBPACKS.join(", ")})"
-
-      class_option :skip_webpack_install, type: :boolean, default: false,
-                                          desc: "Don't run Webpack install"
+      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"
 
       def initialize(*args)
         super
@@ -293,10 +284,10 @@ module Rails
           raise Error, "Invalid value for --database option. Supported preconfigurations are: #{DATABASES.join(", ")}."
         end
 
-        # Force sprockets and yarn to be skipped when generating API only apps.
+        # 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_sprockets: true, skip_javascript: true).freeze
+          self.options = options.merge(skip_asset_pipeline: true, skip_javascript: true).freeze
         end
 
         if options[:minimal]
@@ -311,15 +302,8 @@ module Rails
             skip_dev_gems: true,
             skip_javascript: true,
             skip_jbuilder: true,
-            skip_spring: true,
             skip_system_test: true,
-            skip_webpack_install: true,
-            skip_turbolinks: true).tap do |option|
-              if option[:webpack]
-                option[:skip_webpack_install] = false
-                option[:skip_javascript] = false
-              end
-            end.freeze
+            skip_hotwire: true).freeze
         end
 
         @after_bundle_callbacks = []
@@ -327,6 +311,7 @@ module Rails
 
       public_task :set_default_accessors!
       public_task :create_root
+      public_task :target_rails_prerelease
 
       def create_root_files
         build(:readme)
@@ -339,9 +324,8 @@ module Rails
           build(:gitattributes)
         end
 
-        build(:gemfile) unless options[:skip_gemfile]
+        build(:gemfile)
         build(:version_control)
-        build(:package_json) unless options[:skip_javascript]
       end
 
       def create_app_files
@@ -357,10 +341,10 @@ module Rails
       end
       remove_task :update_bin_files
 
-      def update_bin_yarn
-        build(:yarn_when_updating)
+      def update_db_schema
+        build(:db_when_updating)
       end
-      remove_task :update_bin_yarn
+      remove_task :update_db_schema
 
       def update_active_storage
         unless skip_active_storage?
@@ -454,7 +438,7 @@ module Rails
 
       def delete_app_views_if_api_option
         if options[:api]
-          if options[:skip_action_mailer]
+          if skip_action_mailer?
             remove_dir "app/views"
           else
             remove_file "app/views/layouts/application.html.erb"
@@ -473,22 +457,16 @@ module Rails
         end
       end
 
-      def delete_js_folder_skipping_javascript
-        if options[:skip_javascript] && !options[:minimal]
-          remove_dir "app/javascript"
-        end
-      end
-
-      def delete_js_packs_when_minimal_skipping_webpack
-        if options[:minimal] && options[:skip_webpack_install]
-          remove_dir "app/javascript/packs"
-          keep_file  "app/javascript"
+      def delete_assets_initializer_skipping_sprockets_and_propshaft
+        if skip_sprockets? && skip_propshaft?
+          remove_file "config/initializers/assets.rb"
         end
-      end
 
-      def delete_assets_initializer_skipping_sprockets
-        if options[:skip_sprockets]
-          remove_file "config/initializers/assets.rb"
+        if skip_sprockets?
+          remove_file "app/assets/config/manifest.js"
+          remove_dir  "app/assets/config"
+          remove_file "app/assets/stylesheets/application.css"
+          create_file "app/assets/stylesheets/application.css", "/* Application styles */\n" unless options[:api]
         end
       end
 
@@ -505,7 +483,7 @@ module Rails
       end
 
       def delete_action_mailer_files_skipping_action_mailer
-        if options[:skip_action_mailer]
+        if skip_action_mailer?
           remove_file "app/views/layouts/mailer.html.erb"
           remove_file "app/views/layouts/mailer.text.erb"
           remove_dir "app/mailers"
@@ -523,7 +501,6 @@ module Rails
 
       def delete_non_api_initializers_if_api_option
         if options[:api]
-          remove_file "config/initializers/cookies_serializer.rb"
           remove_file "config/initializers/content_security_policy.rb"
           remove_file "config/initializers/permissions_policy.rb"
         end
@@ -537,7 +514,7 @@ module Rails
 
       def delete_new_framework_defaults
         unless options[:update]
-          remove_file "config/initializers/new_framework_defaults_6_1.rb"
+          remove_file "config/initializers/new_framework_defaults_7_0.rb"
         end
       end
 
@@ -547,7 +524,9 @@ module Rails
 
       public_task :apply_rails_template, :run_bundle
       public_task :generate_bundler_binstub
-      public_task :run_webpack
+      public_task :run_javascript
+      public_task :run_hotwire
+      public_task :run_css
 
       def run_after_bundle_callbacks
         @after_bundle_callbacks.each(&:call)
@@ -565,7 +544,7 @@ module Rails
         create_file(*args, &block)
       end
 
-      # Registers a callback to be executed after bundle and spring binstubs
+      # Registers a callback to be executed after bundle binstubs
       # have run.
       #
       #   after_bundle do