railties 6.1.4.1 → 7.0.0.rc2

data/lib/rails/generators/app_base.rb

@@ -30,9 +30,6 @@ module Rails
         class_option :database,            type: :string, aliases: "-d", default: "sqlite3",
                                            desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
-        class_option :skip_gemfile,        type: :boolean, default: false,
-                                           desc: "Don't create a Gemfile"
-
         class_option :skip_git,            type: :boolean, aliases: "-G", default: false,
                                            desc: "Skip .gitignore file"
 
@@ -58,26 +55,19 @@ module Rails
         class_option :skip_active_storage, type: :boolean, default: false,
                                            desc: "Skip Active Storage files"
 
-        class_option :skip_puma,           type: :boolean, aliases: "-P", default: false,
-                                           desc: "Skip Puma related files"
-
         class_option :skip_action_cable,   type: :boolean, aliases: "-C", default: false,
                                            desc: "Skip Action Cable files"
 
-        class_option :skip_sprockets,      type: :boolean, aliases: "-S", default: false,
-                                           desc: "Skip Sprockets files"
+        class_option :skip_asset_pipeline, type: :boolean, aliases: "-A", default: false
 
-        class_option :skip_spring,         type: :boolean, default: false,
-                                           desc: "Don't install Spring application preloader"
-
-        class_option :skip_listen,         type: :boolean, default: false,
-                                           desc: "Don't generate configuration that depends on the listen gem"
+        class_option :asset_pipeline,      type: :string, aliases: "-a", default: "sprockets",
+                                           desc: "Choose your asset pipeline [options: sprockets (default), propshaft]"
 
         class_option :skip_javascript,     type: :boolean, aliases: "-J", default: name == "plugin",
                                            desc: "Skip JavaScript files"
 
-        class_option :skip_turbolinks,     type: :boolean, default: false,
-                                           desc: "Skip turbolinks gem"
+        class_option :skip_hotwire,        type: :boolean, default: false,
+                                           desc: "Skip Hotwire integration"
 
         class_option :skip_jbuilder,       type: :boolean, default: false,
                                            desc: "Skip jbuilder gem"
@@ -97,7 +87,7 @@ module Rails
         class_option :edge,                type: :boolean, default: false,
                                            desc: "Set up the #{name} with Gemfile pointing to Rails repository"
 
-        class_option :master,              type: :boolean, default: false,
+        class_option :main,                type: :boolean, default: false, aliases: "--master",
                                            desc: "Set up the #{name} with Gemfile pointing to Rails repository main branch"
 
         class_option :rc,                  type: :string, default: nil,
@@ -110,47 +100,23 @@ module Rails
                                            desc: "Show this help message and quit"
       end
 
-      def initialize(positional_argv, option_argv, *)
-        @argv = [*positional_argv, *option_argv]
+      def initialize(*)
         @gem_filter = lambda { |gem| true }
-        @extra_entries = []
         super
       end
 
     private
-      def gemfile_entry(name, *args) # :doc:
-        options = args.extract_options!
-        version = args.first
-        github = options[:github]
-        path   = options[:path]
-
-        if github
-          @extra_entries << GemfileEntry.github(name, github)
-        elsif path
-          @extra_entries << GemfileEntry.path(name, path)
-        else
-          @extra_entries << GemfileEntry.version(name, version)
-        end
-        self
-      end
-
       def gemfile_entries # :doc:
         [rails_gemfile_entry,
+         asset_pipeline_gemfile_entry,
          database_gemfile_entry,
          web_server_gemfile_entry,
-         assets_gemfile_entry,
-         webpacker_gemfile_entry,
          javascript_gemfile_entry,
+         hotwire_gemfile_entry,
+         css_gemfile_entry,
          jbuilder_gemfile_entry,
          psych_gemfile_entry,
-         cable_gemfile_entry,
-         @extra_entries].flatten.find_all(&@gem_filter)
-      end
-
-      def add_gem_entry_filter # :doc:
-        @gem_filter = lambda { |next_filter, entry|
-          yield(entry) && next_filter.call(entry)
-        }.curry[@gem_filter]
+         cable_gemfile_entry].flatten.find_all(&@gem_filter)
       end
 
       def builder # :doc:
@@ -173,14 +139,9 @@ module Rails
       end
 
       def apply_rails_template # :doc:
-        original_argv = ARGV.dup
-        ARGV.replace(@argv)
-
         apply rails_template if rails_template
       rescue Thor::Error, LoadError, Errno::ENOENT => e
         raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
-      ensure
-        ARGV.replace(original_argv)
       end
 
       def set_default_accessors! # :doc:
@@ -190,7 +151,7 @@ module Rails
           when /^https?:\/\//
             options[:template]
           when String
-            File.expand_path(options[:template], Dir.pwd)
+            File.expand_path(`echo #{options[:template]}`.strip)
           else
             options[:template]
           end
@@ -200,13 +161,24 @@ module Rails
         return [] if options[:skip_active_record]
         gem_name, gem_version = gem_for_database
         GemfileEntry.version gem_name, gem_version,
-                            "Use #{options[:database]} as the database for Active Record"
+          "Use #{options[:database]} as the database for Active Record"
       end
 
       def web_server_gemfile_entry # :doc:
-        return [] if options[:skip_puma]
-        comment = "Use Puma as the app server"
-        GemfileEntry.new("puma", "~> 5.0", comment)
+        GemfileEntry.new "puma", "~> 5.0", "Use the Puma web server [https://github.com/puma/puma]"
+      end
+
+      def asset_pipeline_gemfile_entry
+        return [] if options[:skip_asset_pipeline]
+
+        if options[:asset_pipeline] == "sprockets"
+          GemfileEntry.version "sprockets-rails", ">= 3.4.1",
+            "The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]"
+        elsif options[:asset_pipeline] == "propshaft"
+          GemfileEntry.version "propshaft", ">= 0.4.1", "The modern asset pipeline for Rails [https://github.com/rails/propshaft/]"
+        else
+          []
+        end
       end
 
       def include_all_railties? # :doc:
@@ -215,7 +187,6 @@ module Rails
             :skip_active_record,
             :skip_action_mailer,
             :skip_test,
-            :skip_sprockets,
             :skip_action_cable,
             :skip_active_job
           ),
@@ -262,6 +233,11 @@ module Rails
         options[:skip_dev_gems]
       end
 
+      def skip_sprockets?
+        options[:skip_asset_pipeline] || options[:asset_pipeline] != "sprockets"
+      end
+
+
       class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
         def initialize(name, version, comment, options = {}, commented_out = false)
           super
@@ -287,7 +263,7 @@ module Rails
           version = super
 
           if version.is_a?(Array)
-            version.join("', '")
+            version.join('", "')
           else
             version
           end
@@ -297,20 +273,21 @@ module Rails
       def rails_gemfile_entry
         if options.dev?
           [
-            GemfileEntry.path("rails", Rails::Generators::RAILS_DEV_PATH)
+            GemfileEntry.path("rails", Rails::Generators::RAILS_DEV_PATH, "Use local checkout of Rails")
           ]
         elsif options.edge?
+          edge_branch = Rails.gem_version.prerelease? ? "main" : [*Rails.gem_version.segments.first(2), "stable"].join("-")
           [
-            GemfileEntry.github("rails", "rails/rails", "6-1-stable")
+            GemfileEntry.github("rails", "rails/rails", edge_branch, "Use specific branch of Rails")
           ]
-        elsif options.master?
+        elsif options.main?
           [
-            GemfileEntry.github("rails", "rails/rails", "main")
+            GemfileEntry.github("rails", "rails/rails", "main", "Use main development branch of Rails")
           ]
         else
           [GemfileEntry.version("rails",
                             rails_version_specifier,
-                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'")]
+                            %(Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"))]
         end
       end
 
@@ -327,30 +304,55 @@ module Rails
         end
       end
 
-      def assets_gemfile_entry
-        return [] if options[:skip_sprockets]
-
-        GemfileEntry.version("sass-rails", ">= 6", "Use SCSS for stylesheets")
+      def jbuilder_gemfile_entry
+        return [] if options[:skip_jbuilder]
+        comment = "Build JSON APIs with ease [https://github.com/rails/jbuilder]"
+        GemfileEntry.new "jbuilder", "~> 2.11", comment, {}, options[:api]
       end
 
-      def webpacker_gemfile_entry
+      def javascript_gemfile_entry
         return [] if options[:skip_javascript]
 
-        GemfileEntry.version "webpacker", "~> 5.0", "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
+        if adjusted_javascript_option == "importmap"
+          GemfileEntry.version("importmap-rails", ">= 0.9.2", "Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]")
+        else
+          GemfileEntry.version "jsbundling-rails", ">= 0.2.2", "Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]"
+        end
       end
 
-      def jbuilder_gemfile_entry
-        return [] if options[:skip_jbuilder]
-        comment = "Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder"
-        GemfileEntry.new "jbuilder", "~> 2.7", comment, {}, options[:api]
+      def hotwire_gemfile_entry
+        return [] if options[:skip_javascript] || options[:skip_hotwire]
+
+        turbo_rails_entry =
+          GemfileEntry.version("turbo-rails", ">= 0.9.0", "Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]")
+
+        stimulus_rails_entry =
+          GemfileEntry.version("stimulus-rails", ">= 0.7.3", "Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]")
+
+        [ turbo_rails_entry, stimulus_rails_entry ]
       end
 
-      def javascript_gemfile_entry
-        if options[:skip_javascript] || options[:skip_turbolinks]
-          []
+      def using_node?
+        options[:javascript] && options[:javascript] != "importmap"
+      end
+
+      # CSS processors other than Tailwind require a node-based JavaScript environment. So overwrite the normal JS default
+      # if one such processor has been specified.
+      def adjusted_javascript_option
+        if options[:css] && options[:css] != "tailwind" && options[:javascript] == "importmap"
+          "esbuild"
         else
-          [ GemfileEntry.version("turbolinks", "~> 5",
-             "Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks") ]
+          options[:javascript]
+        end
+      end
+
+      def css_gemfile_entry
+        return [] unless options[:css]
+
+        if !using_node? && options[:css] == "tailwind"
+          GemfileEntry.version("tailwindcss-rails", ">= 0.5.3", "Use Tailwind CSS [https://github.com/rails/tailwindcss-rails]")
+        else
+          GemfileEntry.version("cssbundling-rails", ">= 0.2.7", "Bundle and process CSS [https://github.com/rails/cssbundling-rails]")
         end
       end
 
@@ -397,51 +399,43 @@ module Rails
       end
 
       def bundle_install?
-        !(options[:skip_gemfile] || options[:skip_bundle] || options[:pretend])
-      end
-
-      def spring_install?
-        !options[:skip_spring] && !options.dev? && Process.respond_to?(:fork) && !RUBY_PLATFORM.include?("cygwin")
-      end
-
-      def webpack_install?
-        !(options[:skip_javascript] || options[:skip_webpack_install])
+        !(options[:skip_bundle] || options[:pretend])
       end
 
       def depends_on_system_test?
         !(options[:skip_system_test] || options[:skip_test] || options[:api])
       end
 
-      def depend_on_listen?
-        !options[:skip_listen] && os_supports_listen_out_of_the_box?
-      end
-
       def depend_on_bootsnap?
         !options[:skip_bootsnap] && !options[:dev] && !defined?(JRUBY_VERSION)
       end
 
-      def os_supports_listen_out_of_the_box?
-        /darwin|linux/.match?(RbConfig::CONFIG["host_os"])
-      end
-
       def run_bundle
         bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
       end
 
-      def run_webpack
-        return unless webpack_install?
+      def run_javascript
+        return if options[:skip_javascript] || !bundle_install?
 
-        unless bundle_install?
-          say <<~EXPLAIN
-            Skipping `rails webpacker:install` because `bundle install` was skipped.
-            To complete setup, you must run `bundle install` followed by `rails webpacker:install`.
-          EXPLAIN
-          return
+        case adjusted_javascript_option
+        when "importmap"                    then rails_command "importmap:install"
+        when "webpack", "esbuild", "rollup" then rails_command "javascript:install:#{adjusted_javascript_option}"
         end
+      end
+
+      def run_hotwire
+        return if options[:skip_javascript] || options[:skip_hotwire] || !bundle_install?
+
+        rails_command "turbo:install stimulus:install"
+      end
+
+      def run_css
+        return if !options[:css] || !bundle_install?
 
-        rails_command "webpacker:install"
-        if options[:webpack] && options[:webpack] != "webpack"
-          rails_command "webpacker:install:#{options[:webpack]}"
+        if !using_node? && options[:css] == "tailwind"
+          rails_command "tailwindcss:install"
+        else
+          rails_command "css:install:#{options[:css]}"
         end
       end
 

data/lib/rails/generators/app_name.rb

@@ -7,7 +7,7 @@ module Rails
 
       private
         def app_name
-          @app_name ||= original_app_name.tr('\\', "").tr("-. ", "_")
+          @app_name ||= original_app_name.tr("\\", "").tr("-. ", "_")
         end
 
         def original_app_name

data/lib/rails/generators/base.rb

@@ -206,7 +206,7 @@ module Rails
       end
 
       # Make class option aware of Rails::Generators.options and Rails::Generators.aliases.
-      def self.class_option(name, options = {}) #:nodoc:
+      def self.class_option(name, options = {}) # :nodoc:
         options[:desc]    = "Indicates when to generate #{name.to_s.humanize.downcase}" unless options.key?(:desc)
         options[:aliases] = default_aliases_for_option(name, options)
         options[:default] = default_value_for_option(name, options)
@@ -231,7 +231,7 @@ module Rails
 
       # Cache source root and add lib/generators/base/generator/templates to
       # source paths.
-      def self.inherited(base) #:nodoc:
+      def self.inherited(base) # :nodoc:
         super
 
         # Invoke source_root so the default_source_root is set.
@@ -324,21 +324,17 @@ module Rails
 
         # Sets the base_name taking into account the current class namespace.
         def self.base_name # :doc:
-          @base_name ||= begin
-            if base = name.to_s.split("::").first
-              base.underscore
-            end
+          @base_name ||= if base = name.to_s.split("::").first
+            base.underscore
           end
         end
 
         # Removes the namespaces and get the generator name. For example,
         # Rails::Generators::ModelGenerator will return "model" as generator name.
         def self.generator_name # :doc:
-          @generator_name ||= begin
-            if generator = name.to_s.split("::").last
-              generator.delete_suffix!("Generator")
-              generator.underscore
-            end
+          @generator_name ||= if generator = name.to_s.split("::").last
+            generator.delete_suffix!("Generator")
+            generator.underscore
           end
         end
 
@@ -368,13 +364,13 @@ module Rails
         end
 
         # Keep hooks configuration that are used on prepare_for_invocation.
-        def self.hooks #:nodoc:
+        def self.hooks # :nodoc:
           @hooks ||= from_superclass(:hooks, {})
         end
 
         # Prepare class invocation to search on Rails namespace if a previous
         # added hook is being used.
-        def self.prepare_for_invocation(name, value) #:nodoc:
+        def self.prepare_for_invocation(name, value) # :nodoc:
           return super unless value.is_a?(String) || value.is_a?(Symbol)
 
           if value && constants = hooks[name]

data/lib/rails/generators/erb/scaffold/scaffold_generator.rb

@@ -21,6 +21,8 @@ module Erb # :nodoc:
             template filename, File.join("app/views", controller_file_path, filename)
           end
         end
+
+        template "partial.html.erb", File.join("app/views", controller_file_path, "_#{singular_name}.html.erb")
       end
 
     private

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

@@ -1,6 +1,6 @@
 <%%= form_with(model: <%= model_resource_name %>) do |form| %>
   <%% if <%= singular_table_name %>.errors.any? %>
-    <div id="error_explanation">
+    <div style="color: red">
       <h2><%%= pluralize(<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
 
       <ul>
@@ -12,26 +12,26 @@
   <%% end %>
 
 <% attributes.each do |attribute| -%>
-  <div class="field">
+  <div>
 <% if attribute.password_digest? -%>
-    <%%= form.label :password %>
+    <%%= form.label :password, style: "display: block" %>
     <%%= form.password_field :password %>
   </div>
 
-  <div class="field">
-    <%%= form.label :password_confirmation %>
+  <div>
+    <%%= form.label :password_confirmation, style: "display: block" %>
     <%%= form.password_field :password_confirmation %>
 <% elsif attribute.attachments? -%>
-    <%%= form.label :<%= attribute.column_name %> %>
+    <%%= form.label :<%= attribute.column_name %>, style: "display: block" %>
     <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true %>
 <% else -%>
-    <%%= form.label :<%= attribute.column_name %> %>
+    <%%= form.label :<%= attribute.column_name %>, style: "display: block" %>
     <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %> %>
 <% end -%>
   </div>
 
 <% end -%>
-  <div class="actions">
+  <div>
     <%%= form.submit %>
   </div>
 <%% end %>

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

@@ -1,6 +1,10 @@
-<h1>Editing <%= singular_table_name.titleize %></h1>
+<h1>Editing <%= human_name.downcase %></h1>
 
-<%%= render 'form', <%= singular_table_name %>: @<%= singular_table_name %> %>
+<%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %>
 
-<%%= link_to 'Show', @<%= singular_table_name %> %> |
-<%%= link_to 'Back', <%= index_helper %>_path %>
+<br>
+
+<div>
+  <%%= link_to "Show this <%= human_name.downcase %>", @<%= singular_table_name %> %> |
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path %>
+</div>

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

@@ -1,31 +1,9 @@
-<p id="notice"><%%= notice %></p>
+<p style="color: green"><%%= notice %></p>
 
-<h1><%= plural_table_name.titleize %></h1>
+<h1><%= human_name.pluralize %></h1>
 
-<table>
-  <thead>
-    <tr>
-<% attributes.reject(&:password_digest?).each do |attribute| -%>
-      <th><%= attribute.human_name %></th>
-<% end -%>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
+<div id="<%= plural_table_name %>">
+  <%%= render @<%= plural_table_name %> %>
+</div>
 
-  <tbody>
-    <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-      <tr>
-<% attributes.reject(&:password_digest?).each do |attribute| -%>
-        <td><%%= <%= singular_table_name %>.<%= attribute.column_name %> %></td>
-<% end -%>
-        <td><%%= link_to 'Show', <%= model_resource_name %> %></td>
-        <td><%%= link_to 'Edit', edit_<%= singular_route_name %>_path(<%= singular_table_name %>) %></td>
-        <td><%%= link_to 'Destroy', <%= model_resource_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <%% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%%= link_to 'New <%= singular_table_name.titleize %>', new_<%= singular_route_name %>_path %>
+<%%= link_to "New <%= human_name.downcase %>", new_<%= singular_route_name %>_path %>

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 %>_path %>
+</div>

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

@@ -0,0 +1,20 @@
+<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 -%>
+  <p>
+    <%%= link_to "Show this <%= human_name.downcase %>", <%= singular_name %> %>
+  </p>
+</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_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path %>
+
+  <%%= button_to "Destroy this <%= human_name.downcase %>", <%= singular_table_name %>_path(@<%= singular_table_name %>), 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]