railties 6.1.7.9 → 7.0.0.alpha1

data/lib/rails/application.rb

@@ -57,29 +57,6 @@ module Rails
   #   9)  Build the middleware stack and run to_prepare callbacks
   #   10) Run config.before_eager_load and eager_load! if eager_load is true
   #   11) Run config.after_initialize callbacks
-  #
-  # == Multiple Applications
-  #
-  # If you decide to define multiple applications, then the first application
-  # that is initialized will be set to +Rails.application+, unless you override
-  # it with a different application.
-  #
-  # To create a new application, you can instantiate a new instance of a class
-  # that has already been created:
-  #
-  #   class Application < Rails::Application
-  #   end
-  #
-  #   first_application  = Application.new
-  #   second_application = Application.new(config: first_application.config)
-  #
-  # In the above example, the configuration from the first application was used
-  # to initialize the second application. You can also use the +initialize_copy+
-  # on one of the applications to create a copy of the application which shares
-  # the configuration.
-  #
-  # If you decide to define Rake tasks, runners, or initializers in an
-  # application other than +Rails.application+, then you must run them manually.
   class Application < Engine
     autoload :Bootstrap,              "rails/application/bootstrap"
     autoload :Configuration,          "rails/application/configuration"
@@ -247,9 +224,11 @@ module Rails
         config, shared = all_configs[env.to_sym], all_configs[:shared]
 
         if shared
-          config = {} if config.nil?
-          if config.is_a?(Hash)
+          config = {} if config.nil? && shared.is_a?(Hash)
+          if config.is_a?(Hash) && shared.is_a?(Hash)
             config = shared.deep_merge(config)
+          elsif config.nil?
+            config = shared
           end
         end
 
@@ -266,13 +245,13 @@ module Rails
     # Stores some of the Rails initial environment parameters which
     # will be used by middlewares and engines to configure themselves.
     def env_config
-      @app_env_config ||= begin
-        super.merge(
+      @app_env_config ||= super.merge(
           "action_dispatch.parameter_filter" => config.filter_parameters,
           "action_dispatch.redirect_filter" => config.filter_redirect,
           "action_dispatch.secret_key_base" => secret_key_base,
           "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions,
           "action_dispatch.show_detailed_exceptions" => config.consider_all_requests_local,
+          "action_dispatch.log_rescued_responses" => config.action_dispatch.log_rescued_responses,
           "action_dispatch.logger" => Rails.logger,
           "action_dispatch.backtrace_cleaner" => Rails.backtrace_cleaner,
           "action_dispatch.key_generator" => key_generator,
@@ -295,7 +274,6 @@ module Rails
           "action_dispatch.content_security_policy_nonce_directives" => config.content_security_policy_nonce_directives,
           "action_dispatch.permissions_policy" => config.permissions_policy,
         )
-      end
     end
 
     # If you try to define a set of Rake tasks on the instance, these will get
@@ -355,26 +333,26 @@ module Rails
     # are changing config.root inside your application definition or having a custom
     # Rails application, you will need to add lib to $LOAD_PATH on your own in case
     # you need to load files in lib/ during the application configuration as well.
-    def self.add_lib_to_load_path!(root) #:nodoc:
+    def self.add_lib_to_load_path!(root) # :nodoc:
       path = File.join root, "lib"
       if File.exist?(path) && !$LOAD_PATH.include?(path)
         $LOAD_PATH.unshift(path)
       end
     end
 
-    def require_environment! #:nodoc:
+    def require_environment! # :nodoc:
       environment = paths["config/environment"].existent.first
       require environment if environment
     end
 
-    def routes_reloader #:nodoc:
+    def routes_reloader # :nodoc:
       @routes_reloader ||= RoutesReloader.new
     end
 
     # Returns an array of file paths appended with a hash of
     # directories-extensions suitable for ActiveSupport::FileUpdateChecker
     # API.
-    def watchable_args #:nodoc:
+    def watchable_args # :nodoc:
       files, dirs = config.watchable_files.dup, config.watchable_dirs.dup
 
       ActiveSupport::Dependencies.autoload_paths.each do |path|
@@ -386,20 +364,20 @@ module Rails
 
     # Initialize the application passing the given group. By default, the
     # group is :default
-    def initialize!(group = :default) #:nodoc:
+    def initialize!(group = :default) # :nodoc:
       raise "Application has been already initialized." if @initialized
       run_initializers(group, self)
       @initialized = true
       self
     end
 
-    def initializers #:nodoc:
+    def initializers # :nodoc:
       Bootstrap.initializers_for(self) +
       railties_initializers(super) +
       Finisher.initializers_for(self)
     end
 
-    def config #:nodoc:
+    def config # :nodoc:
       @config ||= Application::Configuration.new(self.class.find_root(self.class.called_from))
     end
 
@@ -487,11 +465,11 @@ module Rails
       )
     end
 
-    def to_app #:nodoc:
+    def to_app # :nodoc:
       self
     end
 
-    def helpers_paths #:nodoc:
+    def helpers_paths # :nodoc:
       config.helpers_paths
     end
 
@@ -513,17 +491,13 @@ module Rails
 
     # Eager loads the application code.
     def eager_load!
-      if Rails.autoloaders.zeitwerk_enabled?
-        Rails.autoloaders.each(&:eager_load)
-      else
-        super
-      end
+      Rails.autoloaders.each(&:eager_load)
     end
 
   protected
     alias :build_middleware_stack :app
 
-    def run_tasks_blocks(app) #:nodoc:
+    def run_tasks_blocks(app) # :nodoc:
       railties.each { |r| r.run_tasks_blocks(app) }
       super
       load "rails/tasks.rb"
@@ -534,28 +508,28 @@ module Rails
       end
     end
 
-    def run_generators_blocks(app) #:nodoc:
+    def run_generators_blocks(app) # :nodoc:
       railties.each { |r| r.run_generators_blocks(app) }
       super
     end
 
-    def run_runner_blocks(app) #:nodoc:
+    def run_runner_blocks(app) # :nodoc:
       railties.each { |r| r.run_runner_blocks(app) }
       super
     end
 
-    def run_console_blocks(app) #:nodoc:
+    def run_console_blocks(app) # :nodoc:
       railties.each { |r| r.run_console_blocks(app) }
       super
     end
 
-    def run_server_blocks(app) #:nodoc:
+    def run_server_blocks(app) # :nodoc:
       railties.each { |r| r.run_server_blocks(app) }
       super
     end
 
     # Returns the ordered railties for this application considering railties_order.
-    def ordered_railties #:nodoc:
+    def ordered_railties # :nodoc:
       @ordered_railties ||= begin
         order = config.railties_order.map do |railtie|
           if railtie == :main_app
@@ -577,7 +551,7 @@ module Rails
       end
     end
 
-    def railties_initializers(current) #:nodoc:
+    def railties_initializers(current) # :nodoc:
       initializers = []
       ordered_railties.reverse.flatten.each do |r|
         if r == self
@@ -589,7 +563,7 @@ module Rails
       initializers
     end
 
-    def default_middleware_stack #:nodoc:
+    def default_middleware_stack # :nodoc:
       default_stack = DefaultMiddlewareStack.new(self, config, paths)
       default_stack.build_stack
     end

data/lib/rails/application_controller.rb

@@ -7,8 +7,8 @@ class Rails::ApplicationController < ActionController::Base # :nodoc:
   before_action :disable_content_security_policy_nonce!
 
   content_security_policy do |policy|
-    policy.script_src :unsafe_inline
-    policy.style_src :unsafe_inline
+    policy.script_src :self, :unsafe_inline
+    policy.style_src :self, :unsafe_inline
   end
 
   private

data/lib/rails/autoloaders/inflector.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "active_support/inflector"
+
+module Rails
+  module Autoloaders
+    module Inflector # :nodoc:
+      # Concurrent::Map is not needed. This is a private class, and overrides
+      # must be defined while the application boots.
+      @overrides = {}
+
+      def self.camelize(basename, _abspath)
+        @overrides[basename] || basename.camelize
+      end
+
+      def self.inflect(overrides)
+        @overrides.merge!(overrides)
+      end
+    end
+  end
+end

data/lib/rails/autoloaders.rb

@@ -1,35 +1,31 @@
 # frozen_string_literal: true
 
-require "active_support/dependencies/zeitwerk_integration"
+require "zeitwerk"
 
 module Rails
   module Autoloaders # :nodoc:
+    require_relative "autoloaders/inflector"
+
     class << self
       include Enumerable
 
       def main
-        if zeitwerk_enabled?
-          @main ||= Zeitwerk::Loader.new.tap do |loader|
-            loader.tag = "rails.main"
-            loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
-          end
+        @main ||= Zeitwerk::Loader.new.tap do |loader|
+          loader.tag = "rails.main"
+          loader.inflector = Inflector
         end
       end
 
       def once
-        if zeitwerk_enabled?
-          @once ||= Zeitwerk::Loader.new.tap do |loader|
-            loader.tag = "rails.once"
-            loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
-          end
+        @once ||= Zeitwerk::Loader.new.tap do |loader|
+          loader.tag = "rails.once"
+          loader.inflector = Inflector
         end
       end
 
       def each
-        if zeitwerk_enabled?
-          yield main
-          yield once
-        end
+        yield main
+        yield once
       end
 
       def logger=(logger)
@@ -41,7 +37,7 @@ module Rails
       end
 
       def zeitwerk_enabled?
-        Rails.configuration.autoloader == :zeitwerk
+        true
       end
     end
   end

data/lib/rails/code_statistics.rb

@@ -3,7 +3,7 @@
 require "rails/code_statistics_calculator"
 require "active_support/core_ext/enumerable"
 
-class CodeStatistics #:nodoc:
+class CodeStatistics # :nodoc:
   TEST_TYPES = ["Controller tests",
                 "Helper tests",
                 "Model tests",
@@ -40,7 +40,7 @@ class CodeStatistics #:nodoc:
       Hash[@pairs.map { |pair| [pair.first, calculate_directory_statistics(pair.last)] }]
     end
 
-    def calculate_directory_statistics(directory, pattern = /^(?!\.).*?\.(rb|js|ts|coffee|rake)$/)
+    def calculate_directory_statistics(directory, pattern = /^(?!\.).*?\.(rb|js|ts|css|scss|coffee|rake|erb)$/)
       stats = CodeStatisticsCalculator.new
 
       Dir.foreach(directory) do |file_name|

data/lib/rails/code_statistics_calculator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CodeStatisticsCalculator #:nodoc:
+class CodeStatisticsCalculator # :nodoc:
   attr_reader :lines, :code_lines, :classes, :methods
 
   PATTERNS = {
@@ -11,6 +11,15 @@ class CodeStatisticsCalculator #:nodoc:
       class: /^\s*class\s+[_A-Z]/,
       method: /^\s*def\s+[_a-z]/,
     },
+    erb: {
+      line_comment: %r{((^\s*<%#.*%>)|(<!--.*-->))},
+    },
+    css: {
+      line_comment: %r{^\s*/\*.*\*/},
+    },
+    scss: {
+      line_comment: %r{((^\s*/\*.*\*/)|(^\s*//))},
+    },
     js: {
       line_comment: %r{^\s*//},
       begin_block_comment: %r{^\s*/\*},

data/lib/rails/command/base.rb

@@ -14,6 +14,24 @@ module Rails
       class Error < Thor::Error # :nodoc:
       end
 
+      class CorrectableError < Error # :nodoc:
+        attr_reader :key, :options
+
+        def initialize(message, key, options)
+          @key     = key
+          @options = options
+          super(message)
+        end
+
+        if defined?(DidYouMean::SpellChecker) && defined?(DidYouMean::Correctable)
+          include DidYouMean::Correctable
+
+          def corrections
+            @corrections ||= DidYouMean::SpellChecker.new(dictionary: options).correct(key)
+          end
+        end
+      end
+
       include Actions
 
       class << self
@@ -32,7 +50,7 @@ module Rails
           if usage
             super
           else
-            @desc ||= ERB.new(File.read(usage_path)).result(binding) if usage_path
+            @desc ||= ERB.new(File.read(usage_path), trim_mode: "-").result(binding) if usage_path
           end
         end
 
@@ -53,7 +71,7 @@ module Rails
           Rails::Command.hidden_commands << self
         end
 
-        def inherited(base) #:nodoc:
+        def inherited(base) # :nodoc:
           super
 
           if base.name && !base.name.end_with?("Base")
@@ -86,10 +104,8 @@ module Rails
         #
         #   Rails::Command::TestCommand.base_name # => 'rails'
         def base_name
-          @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
 
@@ -97,11 +113,9 @@ module Rails
         #
         #   Rails::Command::TestCommand.command_name # => 'test'
         def command_name
-          @command_name ||= begin
-            if command = name.to_s.split("::").last
-              command.chomp!("Command")
-              command.underscore
-            end
+          @command_name ||= if command = name.to_s.split("::").last
+            command.chomp!("Command")
+            command.underscore
           end
         end
 
@@ -148,7 +162,7 @@ module Rails
 
           def namespaced_commands
             commands.keys.map do |key|
-              if command_root_namespace.match?(/(\A|\:)#{key}\z/)
+              if command_root_namespace.match?(/(\A|:)#{key}\z/)
                 command_root_namespace
               else
                 "#{command_root_namespace}:#{key}"

data/lib/rails/command/behavior.rb

@@ -4,7 +4,7 @@ require "active_support"
 
 module Rails
   module Command
-    module Behavior #:nodoc:
+    module Behavior # :nodoc:
       extend ActiveSupport::Concern
 
       class_methods do

data/lib/rails/command/environment_argument.rb

@@ -5,7 +5,7 @@ require "active_support/core_ext/class/attribute"
 
 module Rails
   module Command
-    module EnvironmentArgument #:nodoc:
+    module EnvironmentArgument # :nodoc:
       extend ActiveSupport::Concern
 
       included do

data/lib/rails/command.rb

@@ -10,7 +10,6 @@ module Rails
   module Command
     extend ActiveSupport::Autoload
 
-    autoload :Spellchecker
     autoload :Behavior
     autoload :Base
 
@@ -38,6 +37,7 @@ module Rails
         end
 
         command_name, namespace = "help", "help" if command_name.blank? || HELP_MAPPINGS.include?(command_name)
+        command_name, namespace, args = "application", "application", ["--help"] if rails_new_with_no_path?(args)
         command_name, namespace = "version", "version" if %w( -v --version ).include?(command_name)
 
         original_argv = ARGV.dup
@@ -47,6 +47,7 @@ module Rails
         if command && command.all_commands[command_name]
           command.perform(command_name, args, config)
         else
+          args = ["--describe", full_namespace] if HELP_MAPPINGS.include?(args[0])
           find_by_namespace("rake").perform(full_namespace, args, config)
         end
       ensure
@@ -58,14 +59,12 @@ module Rails
       # Command names must end with "_command.rb". This is required because Rails
       # looks in load paths and loads the command just before it's going to be used.
       #
-      #   find_by_namespace :webrat, :rails, :integration
+      #   find_by_namespace :webrat, :integration
       #
       # Will search for the following commands:
       #
-      #   "rails:webrat", "webrat:integration", "webrat"
+      #   "webrat", "webrat:integration", "rails:webrat", "rails:webrat:integration"
       #
-      # Notice that "rails:commands:webrat" could be loaded as well, what
-      # Rails looks for is the first and last parts of the namespace.
       def find_by_namespace(namespace, command_name = nil) # :nodoc:
         lookups = [ namespace ]
         lookups << "#{namespace}:#{command_name}" if command_name
@@ -94,6 +93,10 @@ module Rails
         COMMANDS_IN_USAGE = %w(generate console server test test:system dbconsole new)
         private_constant :COMMANDS_IN_USAGE
 
+        def rails_new_with_no_path?(args)
+          args == ["new"]
+        end
+
         def commands
           lookup!
 

data/lib/rails/commands/credentials/USAGE

@@ -32,8 +32,8 @@ You could prepend that to your server's start command like this:
 
 === Set up Git to Diff Credentials
 
-Rails provides `rails credentials:diff --enroll` to instruct Git to call `rails credentials:diff`
-when `git diff` is run on a credentials file.
+Rails provides `bin/rails credentials:diff --enroll` to instruct Git to call
+`bin/rails credentials:diff` when `git diff` is run on a credentials file.
 
 Running the command enrolls the project such that all credentials files use the
 "rails_credentials" diff driver in .gitattributes.
@@ -45,6 +45,8 @@ that isn't tracked Rails automatically ensures it's configured when running
 Otherwise each co-worker would have to run enable manually, including on each new
 repo clone.
 
+To disenroll from this feature, run `bin/rails credentials:diff --disenroll`.
+
 === Editing Credentials
 
 This will open a temporary file in `$EDITOR` with the decrypted contents to edit

data/lib/rails/commands/credentials/credentials_command/diffing.rb

@@ -1,37 +1,47 @@
 # frozen_string_literal: true
 
 module Rails::Command::CredentialsCommand::Diffing # :nodoc:
+  GITATTRIBUTES_ENTRY = <<~END
+    config/credentials/*.yml.enc diff=rails_credentials
+    config/credentials.yml.enc diff=rails_credentials
+  END
+
   def enroll_project_in_credentials_diffing
-    if enrolled?
-      true
+    if enrolled_in_credentials_diffing?
+      say "Project is already enrolled in credentials file diffing."
     else
-      gitattributes.write(<<~end_of_template, mode: "a")
-        config/credentials/*.yml.enc diff=rails_credentials
-        config/credentials.yml.enc diff=rails_credentials
-      end_of_template
+      gitattributes.write(GITATTRIBUTES_ENTRY, mode: "a")
 
-      say "Project successfully enrolled!"
+      say "Enrolled project in credentials file diffing!"
       say "Rails ensures the rails_credentials diff driver is set when running `credentials:edit`. See `credentials:help` for more."
     end
   end
 
-  def ensure_rails_credentials_driver_is_set
-    set_driver if enrolled? && !driver_configured?
+  def disenroll_project_from_credentials_diffing
+    if enrolled_in_credentials_diffing?
+      gitattributes.write(gitattributes.read.gsub(GITATTRIBUTES_ENTRY, ""))
+      gitattributes.delete if gitattributes.empty?
+
+      say "Disenrolled project from credentials file diffing!"
+    else
+      say "Project is not enrolled in credentials file diffing."
+    end
+  end
+
+  def ensure_diffing_driver_is_configured
+    configure_diffing_driver if enrolled_in_credentials_diffing? && !diffing_driver_configured?
   end
 
   private
-    def enrolled?
-      gitattributes.read.match?(/config\/credentials(\/\*)?\.yml\.enc diff=rails_credentials/)
-    rescue Errno::ENOENT
-      false
+    def enrolled_in_credentials_diffing?
+      gitattributes.file? && gitattributes.read.include?(GITATTRIBUTES_ENTRY)
     end
 
-    def driver_configured?
+    def diffing_driver_configured?
       system "git config --get diff.rails_credentials.textconv", out: File::NULL
     end
 
-    def set_driver
-      puts "running"
+    def configure_diffing_driver
       system "git config diff.rails_credentials.textconv 'bin/rails credentials:diff'"
     end
 

data/lib/rails/commands/credentials/credentials_command.rb

@@ -33,7 +33,7 @@ module Rails
 
         ensure_encryption_key_has_been_added if credentials.key.nil?
         ensure_credentials_have_been_added
-        ensure_rails_credentials_driver_is_set
+        ensure_diffing_driver_is_configured
 
         catch_editing_exceptions do
           change_credentials_in_system_editor
@@ -52,7 +52,10 @@ module Rails
       end
 
       option :enroll, type: :boolean, default: false,
-        desc: "Enrolls project in credential file diffing with `git diff`"
+        desc: "Enrolls project in credentials file diffing with `git diff`"
+
+      option :disenroll, type: :boolean, default: false,
+        desc: "Disenrolls project from credentials file diffing"
 
       def diff(content_path = nil)
         if @content_path = content_path
@@ -62,6 +65,7 @@ module Rails
           say credentials.read.presence || credentials.content_path.read
         else
           require_application!
+          disenroll_project_from_credentials_diffing if options[:disenroll]
           enroll_project_in_credentials_diffing if options[:enroll]
         end
       rescue ActiveSupport::MessageEncryptor::InvalidMessage

data/lib/rails/commands/dbconsole/dbconsole_command.rb

@@ -31,7 +31,7 @@ module Rails
           sslcapath: "--ssl-capath",
           sslcipher: "--ssl-cipher",
           sslkey: "--ssl-key"
-        }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
+        }.filter_map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }
 
         if config[:password] && @options[:include_password]
           args << "--password=#{config[:password]}"
@@ -44,10 +44,14 @@ module Rails
         find_cmd_and_exec(["mysql", "mysql5"], *args)
 
       when /^postgres|^postgis/
-        ENV["PGUSER"]     = config[:username] if config[:username]
-        ENV["PGHOST"]     = config[:host] if config[:host]
-        ENV["PGPORT"]     = config[:port].to_s if config[:port]
-        ENV["PGPASSWORD"] = config[:password].to_s if config[:password] && @options[:include_password]
+        ENV["PGUSER"]         = config[:username] if config[:username]
+        ENV["PGHOST"]         = config[:host] if config[:host]
+        ENV["PGPORT"]         = config[:port].to_s if config[:port]
+        ENV["PGPASSWORD"]     = config[:password].to_s if config[:password] && @options[:include_password]
+        ENV["PGSSLMODE"]      = config[:sslmode].to_s if config[:sslmode]
+        ENV["PGSSLCERT"]      = config[:sslcert].to_s if config[:sslcert]
+        ENV["PGSSLKEY"]       = config[:sslkey].to_s if config[:sslkey]
+        ENV["PGSSLROOTCERT"]  = config[:sslrootcert].to_s if config[:sslrootcert]
         find_cmd_and_exec("psql", db_config.database)
 
       when "sqlite3"
@@ -98,18 +102,15 @@ module Rails
     def db_config
       return @db_config if defined?(@db_config)
 
-      # If the user provided a database, use that. Otherwise find
-      # the first config in the database.yml
-      if database
-        @db_config = configurations.configs_for(env_name: environment, name: database, include_replicas: true)
-      else
-        @db_config = configurations.find_db_config(environment)
-      end
+      # We need to check whether the user passed the database the
+      # first time around to show a consistent error message to people
+      # relying on 2-level database configuration.
+
+      @db_config = configurations.configs_for(env_name: environment, name: database, include_hidden: true)
 
       unless @db_config
-        missing_db = database ? "'#{database}' database is not" : "No databases are"
         raise ActiveRecord::AdapterNotSpecified,
-          "#{missing_db} configured for '#{environment}'. Available configuration: #{configurations.inspect}"
+          "'#{database}' database is not configured for '#{environment}'. Available configuration: #{configurations.inspect}"
       end
 
       @db_config
@@ -120,7 +121,7 @@ module Rails
     end
 
     def database
-      @options[:database]
+      @options.fetch(:database, "primary")
     end
 
     private