railties 6.0.3.3 → 6.1.1

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

@@ -1,19 +1,21 @@
-.bundle/
-log/*.log
-pkg/
+/.bundle/
+/doc/
+/log/*.log
+/pkg/
+/tmp/
 <% if with_dummy_app? -%>
 <% if sqlite3? -%>
-<%= dummy_path %>/db/*.sqlite3
-<%= dummy_path %>/db/*.sqlite3-journal
-<%= dummy_path %>/db/*.sqlite3-*
+/<%= dummy_path %>/db/*.sqlite3
+/<%= dummy_path %>/db/*.sqlite3-*
 <% end -%>
-<%= dummy_path %>/log/*.log
+/<%= dummy_path %>/log/*.log
 <% unless options[:skip_javascript] -%>
-<%= dummy_path %>/node_modules/
-<%= dummy_path %>/yarn-error.log
+/<%= dummy_path %>/node_modules/
+/<%= dummy_path %>/yarn-error.log
 <% end -%>
 <% unless skip_active_storage? -%>
-<%= dummy_path %>/storage/
+/<%= dummy_path %>/storage/
 <% end -%>
-<%= dummy_path %>/tmp/
+/<%= dummy_path %>/tmp/
 <% end -%>
+.byebug_history

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

@@ -1,3 +1,4 @@
+require "<%= namespaced_name %>/version"
 <% if engine? -%>
 require "<%= namespaced_name %>/engine"
 <% else -%>

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

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

data/lib/rails/generators/rails/plugin/templates/test/%namespaced_name%_test.rb.tt

@@ -1,7 +1,7 @@
-require 'test_helper'
+require "test_helper"
 
-class <%= camelized_modules %>::Test < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, <%= camelized_modules %>
+class <%= camelized_modules %>Test < ActiveSupport::TestCase
+  test "it has a version number" do
+    assert <%= camelized_modules %>::VERSION
   end
 end

data/lib/rails/generators/rails/plugin/templates/test/integration/navigation_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class NavigationTest < ActionDispatch::IntegrationTest
   # test "the truth" do

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

@@ -10,9 +10,6 @@ ActiveRecord::Migrator.migrations_paths << File.expand_path('../db/migrate', __d
 <% end -%>
 require "rails/test_help"
 
-# Filter out the backtrace from minitest while preserving the one from other libraries.
-Minitest.backtrace_filter = Minitest::BacktraceFilter.new
-
 <% unless engine? -%>
 require "rails/test_unit/reporter"
 Rails::TestUnitReporter.executable = 'bin/test'

data/lib/rails/generators/rails/resource/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Stubs out a new resource including an empty model and controller suitable
+    Generates a new resource including an empty model and controller suitable
     for a RESTful, resource-oriented application. Pass the singular model name,
     either CamelCased or under_scored, as the first argument, and an optional
     list of attribute pairs.
@@ -18,6 +18,6 @@ Description:
     views or add any methods to the generated controller.
 
 Examples:
-    `rails generate resource post` # no attributes
-    `rails generate resource post title:string body:text published:boolean`
-    `rails generate resource purchase order_id:integer amount:decimal`
+    `bin/rails generate resource post` # no attributes
+    `bin/rails generate resource post title:string body:text published:boolean`
+    `bin/rails generate resource purchase order_id:integer amount:decimal`

data/lib/rails/generators/rails/resource_route/resource_route_generator.rb

@@ -5,7 +5,7 @@ module Rails
     class ResourceRouteGenerator < NamedBase # :nodoc:
       # Properly nests namespaces passed into a generator
       #
-      #   $ rails generate resource admin/users/products
+      #   $ bin/rails generate resource admin/users/products
       #
       # should give you
       #
@@ -16,32 +16,7 @@ module Rails
       #   end
       def add_resource_route
         return if options[:actions].present?
-
-        depth = 0
-        lines = []
-
-        # Create 'namespace' ladder
-        # namespace :foo do
-        #   namespace :bar do
-        regular_class_path.each do |ns|
-          lines << indent("namespace :#{ns} do\n", depth * 2)
-          depth += 1
-        end
-
-        # inserts the primary resource
-        # Create route
-        #     resources 'products'
-        lines << indent(%{resources :#{file_name.pluralize}\n}, depth * 2)
-
-        # Create `end` ladder
-        #   end
-        # end
-        until depth.zero?
-          depth -= 1
-          lines << indent("end\n", depth * 2)
-        end
-
-        route lines.join
+        route "resources :#{file_name.pluralize}", namespace: regular_class_path
       end
     end
   end

data/lib/rails/generators/rails/scaffold/USAGE

@@ -32,10 +32,10 @@ Description:
     in config/routes.rb.
 
     If you want to remove all the generated files, run
-    'rails destroy scaffold ModelName'.
+    'bin/rails destroy scaffold ModelName'.
 
 Examples:
-    `rails generate scaffold post`
-    `rails generate scaffold post title:string body:text published:boolean`
-    `rails generate scaffold purchase amount:decimal tracking_id:integer:uniq`
-    `rails generate scaffold user email:uniq password:digest`
+    `bin/rails generate scaffold post`
+    `bin/rails generate scaffold post title:string body:text published:boolean`
+    `bin/rails generate scaffold purchase amount:decimal tracking_id:integer:uniq`
+    `bin/rails generate scaffold user email:uniq password:digest`

data/lib/rails/generators/rails/scaffold_controller/USAGE

@@ -1,5 +1,5 @@
 Description:
-    Stubs out a scaffolded controller, its seven RESTful actions and related
+    Generates a scaffolded controller, its seven RESTful actions and related
     views. Pass the model name, either CamelCased or under_scored. The
     controller name is retrieved as a pluralized version of the model name.
 
@@ -10,7 +10,7 @@ Description:
     template engine and test framework generators.
 
 Example:
-    `rails generate scaffold_controller CreditCard`
+    `bin/rails generate scaffold_controller CreditCard`
 
     Credit card controller with URLs like /credit_cards.
         Controller: app/controllers/credit_cards_controller.rb

data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -15,6 +15,8 @@ module Rails
       class_option :api, type: :boolean,
                          desc: "Generates API controller"
 
+      class_option :skip_routes, type: :boolean, desc: "Don't add routes to config/routes.rb."
+
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_controller_files
@@ -26,6 +28,10 @@ module Rails
         invoke template_engine unless options.api?
       end
 
+      hook_for :resource_route, required: true do |route|
+        invoke route unless options.skip_routes?
+      end
+
       hook_for :test_framework, as: :scaffold
 
       # Invoke the helper using the controller name (pluralized)

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

@@ -49,7 +49,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow a list of trusted parameters through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
       params.fetch(:<%= singular_table_name %>, {})

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

@@ -56,7 +56,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow a list of trusted parameters through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
       params.fetch(:<%= singular_table_name %>, {})

data/lib/rails/generators/rails/system_test/USAGE

@@ -1,10 +1,10 @@
 Description:
-    Stubs out a new system test. Pass the name of the test, either
+    Generates a new system test. Pass the name of the test, either
     CamelCased or under_scored, as an argument.
 
     This generator invokes the current system tool, which defaults to
     TestUnit.
 
 Example:
-    `rails generate system_test GeneralStories` creates a GeneralStories
+    `bin/rails generate system_test GeneralStories` creates a GeneralStories
     system test in test/system/general_stories_test.rb

data/lib/rails/generators/rails/task/USAGE

@@ -1,9 +1,9 @@
 Description:
-    Stubs out a new Rake task. Pass the namespace name, and a list of tasks as arguments.
+    Generates a new Rake task. Pass the namespace name, and a list of tasks as arguments.
 
     This generates a task file in lib/tasks.
 
 Example:
-    `rails generate task feeds fetch erase add`
+    `bin/rails generate task feeds fetch erase add`
 
-        Task:      lib/tasks/feeds.rake
+        Task:      lib/tasks/feeds.rake

data/lib/rails/generators/test_case.rb

@@ -11,7 +11,7 @@ module Rails
     # Disable color in output. Easier to debug.
     no_color!
 
-    # This class provides a TestCase for testing generators. To setup, you need
+    # This class provides a TestCase for testing generators. To set up, you need
     # just to configure the destination and set which generator is being tested:
     #
     #   class AppGeneratorTest < Rails::Generators::TestCase

data/lib/rails/generators/test_unit/controller/controller_generator.rb

@@ -6,6 +6,8 @@ module TestUnit # :nodoc:
   module Generators # :nodoc:
     class ControllerGenerator < Base # :nodoc:
       argument :actions, type: :array, default: [], banner: "action action"
+      class_option :skip_routes, type: :boolean
+
       check_class_collision suffix: "ControllerTest"
 
       def create_test_files

data/lib/rails/generators/test_unit/controller/templates/functional_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
@@ -6,7 +6,7 @@ class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
   include Engine.routes.url_helpers
 
 <% end -%>
-<% if actions.empty? -%>
+<% if actions.empty? || options[:skip_routes] -%>
   # test "the truth" do
   #   assert true
   # end
@@ -16,7 +16,7 @@ class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
     get <%= url_helper_prefix %>_<%= action %>_url
     assert_response :success
   end
-
+<%= "\n" unless action == actions.last -%>
 <% end -%>
 <% end -%>
 end

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

@@ -1,5 +1,5 @@
-require 'test_helper'
-require '<%= generator_path %>'
+require "test_helper"
+require "<%= generator_path %>"
 
 <% module_namespacing do -%>
 class <%= class_name %>GeneratorTest < Rails::Generators::TestCase

data/lib/rails/generators/test_unit/integration/templates/integration_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>Test < ActionDispatch::IntegrationTest

data/lib/rails/generators/test_unit/job/templates/unit_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>JobTest < ActiveJob::TestCase

data/lib/rails/generators/test_unit/mailer/templates/functional_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>MailerTest < ActionMailer::TestCase

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

@@ -6,7 +6,7 @@
   <%- if attribute.password_digest? -%>
   password_digest: <%%= BCrypt::Password.create('secret') %>
   <%- elsif attribute.reference? -%>
-  <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default || name) %>
+  <%= yaml_key_value(attribute.column_name.delete_suffix("_id"), attribute.default || name) %>
   <%- elsif !attribute.virtual? -%>
   <%= yaml_key_value(attribute.column_name, attribute.default) %>
   <%- end -%>

data/lib/rails/generators/test_unit/model/templates/unit_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= class_name %>Test < ActiveSupport::TestCase

data/lib/rails/generators/test_unit/plugin/templates/%file_name%_test.rb.tt

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class <%= class_name %>Test < ActiveSupport::TestCase
   # test "the truth" do

data/lib/rails/generators/test_unit/plugin/templates/test_helper.rb

@@ -1,2 +1,2 @@
-require 'active_support/testing/autorun'
-require 'active_support'
+require "active_support/testing/autorun"
+require "active_support"

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

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest

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

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 <% module_namespacing do -%>
 class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest

data/lib/rails/generators/testing/assertions.rb

@@ -27,7 +27,7 @@ module Rails
           assert File.exist?(absolute), "Expected file #{relative.inspect} to exist, but does not"
 
           read = File.read(absolute) if block_given? || !contents.empty?
-          yield read if block_given?
+          assert_nothing_raised { yield read } if block_given?
 
           contents.each do |content|
             case content
@@ -99,7 +99,7 @@ module Rails
         #   end
         def assert_instance_method(method, content)
           assert content =~ /(\s+)def #{method}(\(.+\))?(.*?)\n\1end/m, "Expected to have method #{method}"
-          yield $3.strip if block_given?
+          assert_nothing_raised { yield $3.strip } if block_given?
         end
         alias :assert_method :assert_instance_method
 

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

@@ -104,7 +104,7 @@ module Rails
 
           def migration_file_name(relative)
             absolute = File.expand_path(relative, destination_root)
-            dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, "")
+            dirname, file_name = File.dirname(absolute), File.basename(absolute).delete_suffix(".rb")
             Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
           end
       end

data/lib/rails/info.rb

@@ -95,7 +95,7 @@ module Rails
 
     # The name of the database adapter for the current environment.
     property "Database adapter" do
-      ActiveRecord::Base.configurations[Rails.env]["adapter"]
+      ActiveRecord::Base.connection.pool.db_config.adapter
     end
 
     property "Database schema version" do

data/lib/rails/info_controller.rb

@@ -20,7 +20,7 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc:
 
   def routes
     if path = params[:path]
-      path = URI.parser.escape path
+      path = URI::DEFAULT_PARSER.escape path
       normalized_path = with_leading_slash path
       render json: {
         exact: match_route { |it| it.match normalized_path },

data/lib/rails/mailers_controller.rb

@@ -26,6 +26,7 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
       @email_action = File.basename(params[:path])
 
       if @preview.email_exists?(@email_action)
+        @page_title = "Mailer Preview for #{@preview.preview_name}##{@email_action}"
         @email = @preview.call(@email_action, params)
 
         if params[:part]

data/lib/rails/paths.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "pathname"
+
 module Rails
   module Paths
     # This object is an extended hash that behaves as root of the <tt>Rails::Paths</tt> system.
@@ -180,6 +182,14 @@ module Rails
         @paths
       end
 
+      def paths
+        raise "You need to set a path root" unless @root.path
+
+        map do |p|
+          Pathname.new(@root.path).join(p)
+        end
+      end
+
       def extensions # :nodoc:
         $1.split(",") if @glob =~ /\{([\S]+)\}/
       end
@@ -223,12 +233,10 @@ module Rails
 
       private
         def files_in(path)
-          Dir.chdir(path) do
-            files = Dir.glob(@glob)
-            files -= @exclude if @exclude
-            files.map! { |file| File.join(path, file) }
-            files.sort
-          end
+          files = Dir.glob(@glob, base: path)
+          files -= @exclude if @exclude
+          files.map! { |file| File.join(path, file) }
+          files.sort
         end
     end
   end