RubyGems - railties - Versions diffs - 6.1.7.8 → 7.0.8.6 - Mend

railties 6.1.7.8 → 7.0.8.6

Files changed (164) hide show

data/lib/rails/generators/rails/plugin/templates/Gemfile.tt CHANGED Viewed

@@ -1,41 +1,19 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+<% unless options[:skip_gemspec] -%>
-<% if options[:skip_gemspec] -%>
-<%= '# ' if options.dev? || options.edge? || options.master? -%>gem 'rails', '<%= Array(rails_version_specifier).join("', '") %>'
-<% else -%>
 # Specify your gem's dependencies in <%= name %>.gemspec.
 gemspec
 <% end -%>
-<% unless options[:skip_active_record] -%>
-group :development do
-  gem '<%= gem_for_database[0] %>'
-end
+<% gemfile_entries.each do |gemfile_entry| %>
+<%= gemfile_entry %>
 <% end -%>
+<% if RUBY_ENGINE == "ruby" -%>
-<% if options.dev? || options.edge? -%>
-# Your gem is dependent on dev or edge Rails. Once you can lock this
-# dependency down to a specific version, move it to your gemspec.
-<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
-<% gemfile_entries.each do |gem| -%>
-<% if gem.comment -%>
-# <%= gem.comment %>
-<% end -%>
-<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
-<% if gem.options.any? -%>
-, <%= gem.options.map { |k,v|
-  "#{k}: #{v.inspect}" }.join(', ') %>
-<% end -%>
-<% end -%>
-<% end -%>
-<% if RUBY_ENGINE == 'ruby' -%>
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
+# Start debugger with binding.b [https://github.com/ruby/debug]
+# gem "debug", ">= 1.0.0"
 <% end -%>
-<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
+<% if RUBY_PLATFORM.match?(/bccwin|cygwin|emx|mingw|mswin|wince|java/) -%>
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
 <% end -%>

data/lib/rails/generators/rails/plugin/templates/README.md.tt CHANGED Viewed

@@ -8,7 +8,7 @@ How to use my plugin.
 Add this line to your application's Gemfile:
 ```ruby
-gem '<%= name %>'
+gem "<%= name %>"
 ```
 And then execute:

data/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt CHANGED Viewed

@@ -1,7 +1,7 @@
 <%= wrap_in_modules <<~rb
   class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
+    default from: "from@example.com"
+    layout "mailer"
   end
 rb
 %>

data/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt CHANGED Viewed

@@ -6,9 +6,6 @@
   <%%= csp_meta_tag %>
   <%%= stylesheet_link_tag    "<%= namespaced_name %>/application", media: "all" %>
-  <%- unless options[:skip_javascript] -%>
-  <%%= javascript_include_tag "<%= namespaced_name %>/application" %>
-  <%- end -%>
 </head>
 <body>

data/lib/rails/generators/rails/plugin/templates/bin/rails.tt CHANGED Viewed

@@ -1,14 +1,14 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
-ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/<%= namespaced_name -%>/engine', __dir__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/<%= namespaced_name -%>/engine", __dir__)
 <% if with_dummy_app? -%>
-APP_PATH = File.expand_path('../<%= dummy_path -%>/config/application', __dir__)
+APP_PATH = File.expand_path("../<%= dummy_path -%>/config/application", __dir__)
 <% end -%>
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 <% if include_all_railties? -%>
@@ -17,14 +17,15 @@ require "rails/all"
 require "rails"
 # Pick the frameworks you want:
 require "active_model/railtie"
-require "active_job/railtie"
+<%= comment_if :skip_active_job %>require "active_job/railtie"
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 <%= comment_if :skip_active_storage %>require "active_storage/engine"
 require "action_controller/railtie"
 <%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
+<%= comment_if :skip_action_mailbox %>require "action_mailbox/engine"
+<%= comment_if :skip_action_text %>require "action_text/engine"
 require "action_view/railtie"
 <%= comment_if :skip_action_cable %>require "action_cable/engine"
-<%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test %>require "rails/test_unit/railtie"
 <% end -%>
 require "rails/engine/commands"

data/lib/rails/generators/rails/plugin/templates/gitignore.tt CHANGED Viewed

@@ -9,13 +9,8 @@
 /<%= dummy_path %>/db/*.sqlite3-*
 <% end -%>
 /<%= dummy_path %>/log/*.log
-<% unless options[:skip_javascript] -%>
-/<%= dummy_path %>/node_modules/
-/<%= dummy_path %>/yarn-error.log
-<% end -%>
 <% unless skip_active_storage? -%>
 /<%= dummy_path %>/storage/
 <% end -%>
 /<%= dummy_path %>/tmp/
 <% end -%>
-.byebug_history

data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb.tt CHANGED Viewed

@@ -1,7 +1,7 @@
 <%= wrap_in_modules <<~rb
   class Engine < ::Rails::Engine
-  #{mountable? ? '  isolate_namespace ' + camelized_modules : ' '}
-  #{api? ? "  config.generators.api_only = true" : ' '}
+  #{mountable? ? "  isolate_namespace " + camelized_modules : " "}
+  #{api? ? "  config.generators.api_only = true" : " "}
   end
 rb
 %>

data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb.tt CHANGED Viewed

	@@ -1 +1 @@
1	- <%= wrap_in_modules "VERSION = '0.1.0'" %>
1	+ <%= wrap_in_modules 'VERSION = "0.1.0"' %>

data/lib/rails/generators/rails/plugin/templates/rails/boot.rb.tt CHANGED Viewed

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)
+$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)

data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb.tt CHANGED Viewed

@@ -1,20 +1,15 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
-require_relative "<%= File.join('..', options[:dummy_path], 'config/environment') -%>"
+require_relative "<%= File.join("..", options[:dummy_path], "config/environment") -%>"
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../<%= options[:dummy_path] -%>/db/migrate", __dir__)]
 <% if options[:mountable] -%>
-ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __dir__)
+ActiveRecord::Migrator.migrations_paths << File.expand_path("../db/migrate", __dir__)
 <% end -%>
 <% end -%>
 require "rails/test_help"
-<% unless engine? -%>
-require "rails/test_unit/reporter"
-Rails::TestUnitReporter.executable = 'bin/test'
-<% end -%>
 <% unless options[:skip_active_record] -%>
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb CHANGED Viewed

@@ -9,28 +9,9 @@ module Rails
       remove_class_option :actions
       class_option :api, type: :boolean
-      class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
-      class_option :stylesheet_engine, desc: "Engine for Stylesheets"
-      class_option :assets, type: :boolean
       class_option :resource_route, type: :boolean
-      class_option :scaffold_stylesheet, type: :boolean
-      def handle_skip
-        @options = @options.merge(stylesheets: false) unless options[:assets]
-        @options = @options.merge(stylesheet_engine: false) unless options[:stylesheets] && options[:scaffold_stylesheet]
-      end
       hook_for :scaffold_controller, required: true
-      hook_for :assets do |assets|
-        invoke assets, [controller_name]
-      end
-      hook_for :stylesheet_engine do |stylesheet_engine|
-        if behavior == :invoke
-          invoke stylesheet_engine, [controller_name]
-        end
-      end
     end
   end
 end

data/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt CHANGED Viewed

@@ -1,10 +1,6 @@
-<% if namespaced? -%>
-require_dependency "<%= namespaced_path %>/application_controller"
-<% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :update, :destroy]
+  before_action :set_<%= singular_table_name %>, only: %i[ show update destroy ]
   # GET <%= route_url %>
   def index

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt CHANGED Viewed

@@ -1,10 +1,6 @@
-<% if namespaced? -%>
-require_dependency "<%= namespaced_path %>/application_controller"
-<% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+  before_action :set_<%= singular_table_name %>, only: %i[ show edit update destroy ]
   # GET <%= route_url %>
   def index
@@ -29,25 +25,25 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
     if @<%= orm_instance.save %>
-      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully created.") %>
     else
-      render :new
+      render :new, status: :unprocessable_entity
     end
   end
   # PATCH/PUT <%= route_url %>/1
   def update
     if @<%= orm_instance.update("#{singular_table_name}_params") %>
-      redirect_to <%= redirect_resource_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
+      redirect_to <%= redirect_resource_name %>, notice: <%= %("#{human_name} was successfully updated.") %>, status: :see_other
     else
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
   end
   # DELETE <%= route_url %>/1
   def destroy
     @<%= orm_instance.destroy %>
-    redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
+    redirect_to <%= index_helper %>_url, notice: <%= %("#{human_name} was successfully destroyed.") %>, status: :see_other
   end
   private

data/lib/rails/generators/resource_helpers.rb CHANGED Viewed

@@ -8,13 +8,13 @@ module Rails
     # Deal with controller names on scaffold and add some helpers to deal with
     # ActiveModel.
     module ResourceHelpers # :nodoc:
-      def self.included(base) #:nodoc:
+      def self.included(base) # :nodoc:
         base.include(Rails::Generators::ModelHelpers)
         base.class_option :model_name, type: :string, desc: "ModelName to be used"
       end
       # Set controller variables on initialization.
-      def initialize(*args) #:nodoc:
+      def initialize(*args) # :nodoc:
         super
         controller_name = name
         if options[:model_name]

data/lib/rails/generators/test_unit/generator/templates/generator_test.rb.tt CHANGED Viewed

@@ -4,7 +4,7 @@ require "<%= generator_path %>"
 <% module_namespacing do -%>
 class <%= class_name %>GeneratorTest < Rails::Generators::TestCase
   tests <%= class_name %>Generator
-  destination Rails.root.join('tmp/generators')
+  destination Rails.root.join("tmp/generators")
   setup :prepare_destination
   # test "generator runs without errors" do

data/lib/rails/generators/test_unit/model/templates/fixtures.yml.tt CHANGED Viewed

@@ -4,7 +4,7 @@
 <%= name %>:
 <% attributes.each do |attribute| -%>
   <%- if attribute.password_digest? -%>
-  password_digest: <%%= BCrypt::Password.create('secret') %>
+  password_digest: <%%= BCrypt::Password.create("secret") %>
   <%- elsif attribute.reference? -%>
   <%= yaml_key_value(attribute.column_name.delete_suffix("_id"), attribute.default || name) %>
   <%- elsif !attribute.virtual? -%>
@@ -18,7 +18,7 @@
 <% else -%>
 # This model initially had no columns defined. If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
+# model remove the "{}" from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
 one: {}

data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb CHANGED Viewed

@@ -45,13 +45,13 @@ module TestUnit # :nodoc:
         def attributes_hash
           return {} if attributes_names.empty?
-          attributes_names.map do |name|
+          attributes_names.filter_map do |name|
             if %w(password password_confirmation).include?(name) && attributes.any?(&:password_digest?)
-              ["#{name}", "'secret'"]
+              ["#{name}", '"secret"']
             elsif !virtual?(name)
               ["#{name}", "@#{singular_table_name}.#{name}"]
             end
-          end.compact.sort.to_h
+          end.sort.to_h
         end
         def boolean?(name)

data/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb.tt CHANGED Viewed

@@ -16,11 +16,11 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
   test "should create <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count') do
+    assert_difference("<%= class_name %>.count") do
       post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
     end
-    assert_response 201
+    assert_response :created
   end
   test "should show <%= singular_table_name %>" do
@@ -30,15 +30,15 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   test "should update <%= singular_table_name %>" do
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }, as: :json
-    assert_response 200
+    assert_response :success
   end
   test "should destroy <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count', -1) do
+    assert_difference("<%= class_name %>.count", -1) do
       delete <%= show_helper %>, as: :json
     end
-    assert_response 204
+    assert_response :no_content
   end
 end
 <% end -%>

data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb.tt CHANGED Viewed

@@ -11,7 +11,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
   test "should get index" do
-    get <%= index_helper %>_url
+    get <%= index_helper(type: :url) %>
     assert_response :success
   end
@@ -21,11 +21,11 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   end
   test "should create <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count') do
-      post <%= index_helper %>_url, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
+    assert_difference("<%= class_name %>.count") do
+      post <%= index_helper(type: :url) %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
     end
-    assert_redirected_to <%= singular_table_name %>_url(<%= class_name %>.last)
+    assert_redirected_to <%= show_helper("#{class_name}.last") %>
   end
   test "should show <%= singular_table_name %>" do
@@ -40,15 +40,15 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
   test "should update <%= singular_table_name %>" do
     patch <%= show_helper %>, params: { <%= "#{singular_table_name}: { #{attributes_string} }" %> }
-    assert_redirected_to <%= singular_table_name %>_url(<%= "@#{singular_table_name}" %>)
+    assert_redirected_to <%= show_helper %>
   end
   test "should destroy <%= singular_table_name %>" do
-    assert_difference('<%= class_name %>.count', -1) do
+    assert_difference("<%= class_name %>.count", -1) do
       delete <%= show_helper %>
     end
-    assert_redirected_to <%= index_helper %>_url
+    assert_redirected_to <%= index_helper(type: :url) %>
   end
 end
 <% end -%>

data/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt CHANGED Viewed

@@ -8,12 +8,12 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
   test "visiting the index" do
     visit <%= plural_table_name %>_url
-    assert_selector "h1", text: "<%= class_name.pluralize.titleize %>"
+    assert_selector "h1", text: "<%= human_name.pluralize %>"
   end
-  test "creating a <%= human_name %>" do
+  test "should create <%= human_name.downcase %>" do
     visit <%= plural_table_name %>_url
-    click_on "New <%= class_name.titleize %>"
+    click_on "New <%= human_name.downcase %>"
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -28,9 +28,9 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
     click_on "Back"
   end
-  test "updating a <%= human_name %>" do
-    visit <%= plural_table_name %>_url
-    click_on "Edit", match: :first
+  test "should update <%= human_name %>" do
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Edit this <%= human_name.downcase %>", match: :first
     <%- attributes_hash.each do |attr, value| -%>
     <%- if boolean?(attr) -%>
@@ -45,11 +45,9 @@ class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
     click_on "Back"
   end
-  test "destroying a <%= human_name %>" do
-    visit <%= plural_table_name %>_url
-    page.accept_confirm do
-      click_on "Destroy", match: :first
-    end
+  test "should destroy <%= human_name %>" do
+    visit <%= singular_table_name %>_url(@<%= singular_table_name %>)
+    click_on "Destroy this <%= human_name.downcase %>", match: :first
     assert_text "<%= human_name %> was successfully destroyed"
   end

data/lib/rails/generators/testing/behaviour.rb CHANGED Viewed

@@ -66,9 +66,8 @@ module Rails
         # printed by the generator.
         def run_generator(args = default_arguments, config = {})
           capture(:stdout) do
-            args += ["--skip-bundle"] unless args.include? "--dev"
-            args |= ["--skip-bootsnap"] unless args.include? "--no-skip-bootsnap"
-            args |= ["--skip-webpack-install"] unless args.include? "--no-skip-webpack-install"
+            args += ["--skip-bundle"] unless args.include?("--no-skip-bundle") || args.include?("--dev")
+            args += ["--skip-bootsnap"] unless args.include?("--no-skip-bootsnap") || args.include?("--skip-bootsnap")
             generator_class.start(args, config.reverse_merge(destination_root: destination_root))
           end
@@ -82,7 +81,7 @@ module Rails
         # Create a Rails::Generators::GeneratedAttribute by supplying the
         # attribute type and, optionally, the attribute name:
         #
-        #   create_generated_attribute(:string, 'name')
+        #   create_generated_attribute(:string, "name")
         def create_generated_attribute(attribute_type, name = "test", index = nil)
           Rails::Generators::GeneratedAttribute.parse([name, attribute_type, index].compact.join(":"))
         end

data/lib/rails/generators.rb CHANGED Viewed

@@ -34,12 +34,9 @@ module Rails
         actions: "-a",
         orm: "-o",
         javascripts: "-j",
-        javascript_engine: "-je",
         resource_controller: "-c",
         scaffold_controller: "-c",
         stylesheets: "-y",
-        stylesheet_engine: "-se",
-        scaffold_stylesheet: "-ss",
         template_engine: "-e",
         test_framework: "-t"
       },
@@ -60,9 +57,6 @@ module Rails
         resource_controller: :controller,
         resource_route: true,
         scaffold_controller: :scaffold_controller,
-        stylesheets: true,
-        stylesheet_engine: :css,
-        scaffold_stylesheet: true,
         system_tests: nil,
         test_framework: nil,
         template_engine: :erb
@@ -70,7 +64,7 @@ module Rails
     }
     class << self
-      def configure!(config) #:nodoc:
+      def configure!(config) # :nodoc:
         api_only! if config.api_only
         no_color! unless config.colorize_logging
         aliases.deep_merge! config.aliases
@@ -82,15 +76,15 @@ module Rails
         after_generate_callbacks.replace config.after_generate_callbacks
       end
-      def templates_path #:nodoc:
+      def templates_path # :nodoc:
         @templates_path ||= []
       end
-      def aliases #:nodoc:
+      def aliases # :nodoc:
         @aliases ||= DEFAULT_ALIASES.dup
       end
-      def options #:nodoc:
+      def options # :nodoc:
         @options ||= DEFAULT_OPTIONS.dup
       end
@@ -135,14 +129,12 @@ module Rails
       # Returns an array of generator namespaces that are hidden.
       # Generator namespaces may be hidden for a variety of reasons.
       # Some are aliased such as "rails:migration" and can be
-      # invoked with the shorter "migration", others are private to other generators
-      # such as "css:scaffold".
+      # invoked with the shorter "migration".
       def hidden_namespaces
         @hidden_namespaces ||= begin
           orm      = options[:rails][:orm]
           test     = options[:rails][:test_framework]
           template = options[:rails][:template_engine]
-          css      = options[:rails][:stylesheet_engine]
           [
             "rails",
@@ -161,10 +153,6 @@ module Rails
             "#{template}:controller",
             "#{template}:scaffold",
             "#{template}:mailer",
-            "#{css}:scaffold",
-            "#{css}:assets",
-            "css:assets",
-            "css:scaffold",
             "action_text:install",
             "action_mailbox:install"
           ]
@@ -241,7 +229,7 @@ module Rails
       #
       # Notice that "rails:generators:webrat" could be loaded as well, what
       # Rails looks for is the first and last parts of the namespace.
-      def find_by_namespace(name, base = nil, context = nil) #:nodoc:
+      def find_by_namespace(name, base = nil, context = nil) # :nodoc:
         lookups = []
         lookups << "#{base}:#{name}"    if base
         lookups << "#{name}:#{context}" if context
@@ -265,8 +253,8 @@ module Rails
         invoke_fallbacks_for(name, base) || invoke_fallbacks_for(context, name)
       end
-      # Receives a namespace, arguments and the behavior to invoke the generator.
-      # It's used as the default entry point for generate, destroy and update
+      # Receives a namespace, arguments, and the behavior to invoke the generator.
+      # It's used as the default entry point for generate, destroy, and update
       # commands.
       def invoke(namespace, args = ARGV, config = {})
         names = namespace.to_s.split(":")
@@ -275,12 +263,17 @@ module Rails
           klass.start(args, config)
           run_after_generate_callback if config[:behavior] == :invoke
         else
-          options     = sorted_groups.flat_map(&:last)
-          suggestion  = Rails::Command::Spellchecker.suggest(namespace.to_s, from: options)
-          suggestion_msg = "Maybe you meant #{suggestion.inspect}?" if suggestion
+          options = sorted_groups.flat_map(&:last)
+          error   = Command::Base::CorrectableError.new("Could not find generator '#{namespace}'.", namespace, options)
+          if error.respond_to?(:detailed_message)
+            formatted_message = error.detailed_message
+          else
+            formatted_message = error.message
+          end
           puts <<~MSG
-            Could not find generator '#{namespace}'. #{suggestion_msg}
+            #{formatted_message}
             Run `bin/rails generate --help` for more options.
           MSG
         end

data/lib/rails/info.rb CHANGED Viewed

@@ -21,7 +21,7 @@ module Rails
       end
     end
-    class << self #:nodoc:
+    class << self # :nodoc:
       def property(name, value = nil)
         value ||= yield
         properties << [name, value] if value

data/lib/rails/info_controller.rb CHANGED Viewed

@@ -34,9 +34,7 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
   private
     def match_route
-      _routes.routes.select { |route|
-        yield route.path
-      }.map { |route| route.path.spec.to_s }
+      _routes.routes.filter_map { |route| route.path.spec.to_s if yield route.path }
     end
     def with_leading_slash(path)

data/lib/rails/initializable.rb CHANGED Viewed

@@ -4,7 +4,7 @@ require "tsort"
 module Rails
   module Initializable
-    def self.included(base) #:nodoc:
+    def self.included(base) # :nodoc:
       base.extend ClassMethods
     end

data/lib/rails/mailers_controller.rb CHANGED Viewed

@@ -93,9 +93,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       request.query_parameters.merge(locale: locale).to_query
     end
-    def set_locale
-      I18n.with_locale(params[:locale] || I18n.default_locale) do
-        yield
-      end
+    def set_locale(&block)
+      I18n.with_locale(params[:locale] || I18n.default_locale, &block)
     end
 end