railties 6.1.4.1 → 7.0.0.alpha1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +94 -361
- data/MIT-LICENSE +1 -1
- data/RDOC_MAIN.rdoc +16 -16
- data/README.rdoc +0 -1
- data/lib/rails/app_updater.rb +2 -4
- data/lib/rails/application/bootstrap.rb +17 -5
- data/lib/rails/application/configuration.rb +51 -26
- data/lib/rails/application/default_middleware_stack.rb +6 -3
- data/lib/rails/application/finisher.rb +43 -85
- data/lib/rails/application/routes_reloader.rb +8 -0
- data/lib/rails/application.rb +24 -50
- data/lib/rails/application_controller.rb +2 -2
- data/lib/rails/autoloaders/inflector.rb +21 -0
- data/lib/rails/autoloaders.rb +12 -16
- data/lib/rails/code_statistics.rb +2 -2
- data/lib/rails/code_statistics_calculator.rb +10 -1
- data/lib/rails/command/base.rb +26 -12
- data/lib/rails/command/behavior.rb +1 -1
- data/lib/rails/command/environment_argument.rb +1 -1
- data/lib/rails/command.rb +8 -5
- data/lib/rails/commands/credentials/USAGE +4 -2
- data/lib/rails/commands/credentials/credentials_command/diffing.rb +26 -16
- data/lib/rails/commands/credentials/credentials_command.rb +8 -3
- data/lib/rails/commands/dbconsole/dbconsole_command.rb +10 -6
- data/lib/rails/commands/help/USAGE +3 -2
- data/lib/rails/commands/runner/runner_command.rb +3 -2
- data/lib/rails/commands/server/server_command.rb +2 -5
- data/lib/rails/configuration.rb +18 -23
- data/lib/rails/engine/configuration.rb +2 -2
- data/lib/rails/engine.rb +23 -27
- data/lib/rails/gem_version.rb +4 -4
- data/lib/rails/generators/actions/create_migration.rb +2 -4
- data/lib/rails/generators/actions.rb +35 -13
- data/lib/rails/generators/app_base.rb +66 -102
- data/lib/rails/generators/app_name.rb +1 -1
- data/lib/rails/generators/base.rb +9 -13
- data/lib/rails/generators/erb/scaffold/scaffold_generator.rb +2 -0
- data/lib/rails/generators/erb/scaffold/templates/edit.html.erb.tt +8 -4
- data/lib/rails/generators/erb/scaffold/templates/index.html.erb.tt +5 -27
- data/lib/rails/generators/erb/scaffold/templates/new.html.erb.tt +7 -3
- data/lib/rails/generators/erb/scaffold/templates/partial.html.erb.tt +20 -0
- data/lib/rails/generators/erb/scaffold/templates/show.html.erb.tt +7 -16
- data/lib/rails/generators/erb.rb +1 -1
- data/lib/rails/generators/generated_attribute.rb +40 -4
- data/lib/rails/generators/migration.rb +2 -6
- data/lib/rails/generators/model_helpers.rb +1 -1
- data/lib/rails/generators/named_base.rb +1 -1
- data/lib/rails/generators/rails/app/app_generator.rb +44 -88
- data/lib/rails/generators/rails/app/templates/Gemfile.tt +41 -52
- data/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css.tt +2 -2
- data/lib/rails/generators/rails/app/templates/app/mailers/application_mailer.rb.tt +2 -2
- data/lib/rails/generators/rails/app/templates/app/models/application_record.rb.tt +1 -1
- data/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt +3 -10
- data/lib/rails/generators/rails/app/templates/bin/rails.tt +1 -4
- data/lib/rails/generators/rails/app/templates/bin/rake.tt +0 -3
- data/lib/rails/generators/rails/app/templates/bin/setup.tt +9 -14
- data/lib/rails/generators/rails/app/templates/config/boot.rb.tt +1 -1
- data/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/oracle.yml.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml.tt +3 -3
- data/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml.tt +1 -1
- data/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml.tt +5 -5
- data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +2 -11
- data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +9 -15
- data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +2 -7
- data/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt +1 -5
- data/lib/rails/generators/rails/app/templates/config/initializers/content_security_policy.rb.tt +0 -5
- data/lib/rails/generators/rails/app/templates/config/initializers/cors.rb.tt +2 -2
- data/lib/rails/generators/rails/app/templates/config/initializers/inflections.rb.tt +4 -4
- data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_7_0.rb.tt +85 -0
- data/lib/rails/generators/rails/app/templates/config/locales/en.yml +3 -3
- data/lib/rails/generators/rails/app/templates/config/puma.rb.tt +1 -1
- data/lib/rails/generators/rails/app/templates/config/routes.rb.tt +3 -0
- data/lib/rails/generators/rails/app/templates/config/storage.yml.tt +5 -5
- data/lib/rails/generators/rails/app/templates/db/seeds.rb.tt +2 -2
- data/lib/rails/generators/rails/app/templates/gitattributes.tt +0 -5
- data/lib/rails/generators/rails/app/templates/gitignore.tt +0 -1
- data/lib/rails/generators/rails/app/templates/test/test_helper.rb.tt +1 -1
- data/lib/rails/generators/rails/controller/controller_generator.rb +1 -2
- data/lib/rails/generators/rails/controller/templates/controller.rb.tt +0 -4
- data/lib/rails/generators/rails/db/system/change/change_generator.rb +1 -1
- data/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt +1 -1
- data/lib/rails/generators/rails/plugin/plugin_generator.rb +40 -15
- data/lib/rails/generators/rails/plugin/templates/%name%.gemspec.tt +4 -2
- data/lib/rails/generators/rails/plugin/templates/Gemfile.tt +9 -9
- data/lib/rails/generators/rails/plugin/templates/README.md.tt +1 -1
- data/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt +2 -2
- data/lib/rails/generators/rails/plugin/templates/app/models/%namespaced_name%/application_record.rb.tt +1 -1
- data/lib/rails/generators/rails/plugin/templates/app/views/layouts/%namespaced_name%/application.html.erb.tt +0 -3
- data/lib/rails/generators/rails/plugin/templates/bin/rails.tt +4 -4
- data/lib/rails/generators/rails/plugin/templates/gitignore.tt +0 -5
- data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/engine.rb.tt +2 -2
- data/lib/rails/generators/rails/plugin/templates/lib/%namespaced_name%/version.rb.tt +1 -1
- data/lib/rails/generators/rails/plugin/templates/rails/boot.rb.tt +2 -2
- data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb.tt +3 -3
- data/lib/rails/generators/rails/scaffold/scaffold_generator.rb +0 -19
- data/lib/rails/generators/rails/scaffold_controller/templates/api_controller.rb.tt +1 -5
- data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb.tt +6 -10
- data/lib/rails/generators/resource_helpers.rb +2 -2
- data/lib/rails/generators/test_unit/generator/templates/generator_test.rb.tt +1 -1
- data/lib/rails/generators/test_unit/model/templates/fixtures.yml.tt +2 -2
- data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb +3 -3
- data/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb.tt +5 -5
- data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb.tt +2 -2
- data/lib/rails/generators/test_unit/scaffold/templates/system_test.rb.tt +3 -3
- data/lib/rails/generators/testing/behaviour.rb +1 -2
- data/lib/rails/generators.rb +9 -22
- data/lib/rails/info.rb +1 -1
- data/lib/rails/info_controller.rb +1 -3
- data/lib/rails/initializable.rb +1 -1
- data/lib/rails/mailers_controller.rb +2 -4
- data/lib/rails/rack/logger.rb +0 -1
- data/lib/rails/railtie/configuration.rb +1 -2
- data/lib/rails/railtie.rb +9 -9
- data/lib/rails/ruby_version_check.rb +3 -3
- data/lib/rails/secrets.rb +4 -1
- data/lib/rails/tasks/framework.rake +2 -8
- data/lib/rails/tasks/statistics.rake +3 -1
- data/lib/rails/tasks/tmp.rake +8 -1
- data/lib/rails/tasks/yarn.rake +5 -1
- data/lib/rails/tasks/zeitwerk.rake +2 -10
- data/lib/rails/templates/layouts/application.html.erb +15 -0
- data/lib/rails/templates/rails/mailers/email.html.erb +12 -10
- data/lib/rails/templates/rails/welcome/index.html.erb +3 -0
- data/lib/rails/test_unit/railtie.rb +0 -4
- data/lib/rails/test_unit/runner.rb +7 -5
- data/lib/rails/test_unit/testing.rake +4 -9
- data/lib/rails.rb +1 -0
- metadata +35 -36
- data/lib/rails/command/spellchecker.rb +0 -57
- data/lib/rails/generators/css/assets/assets_generator.rb +0 -15
- data/lib/rails/generators/css/assets/templates/stylesheet.css +0 -4
- data/lib/rails/generators/css/scaffold/scaffold_generator.rb +0 -18
- data/lib/rails/generators/rails/app/templates/app/javascript/channels/consumer.js +0 -6
- data/lib/rails/generators/rails/app/templates/app/javascript/channels/index.js +0 -5
- data/lib/rails/generators/rails/app/templates/app/javascript/packs/application.js.tt +0 -23
- data/lib/rails/generators/rails/app/templates/bin/spring.tt +0 -13
- data/lib/rails/generators/rails/app/templates/bin/yarn.tt +0 -16
- data/lib/rails/generators/rails/app/templates/config/initializers/application_controller_renderer.rb.tt +0 -8
- data/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb.tt +0 -5
- data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_1.rb.tt +0 -67
- data/lib/rails/generators/rails/app/templates/config/spring.rb.tt +0 -6
- data/lib/rails/generators/rails/app/templates/package.json.tt +0 -11
- data/lib/rails/generators/rails/assets/USAGE +0 -16
- data/lib/rails/generators/rails/assets/assets_generator.rb +0 -26
- data/lib/rails/generators/rails/assets/templates/stylesheet.css +0 -4
- data/lib/rails/generators/rails/scaffold/templates/scaffold.css +0 -80
data/lib/rails/command.rb
CHANGED
@@ -10,7 +10,6 @@ module Rails
|
|
10
10
|
module Command
|
11
11
|
extend ActiveSupport::Autoload
|
12
12
|
|
13
|
-
autoload :Spellchecker
|
14
13
|
autoload :Behavior
|
15
14
|
autoload :Base
|
16
15
|
|
@@ -38,6 +37,7 @@ module Rails
|
|
38
37
|
end
|
39
38
|
|
40
39
|
command_name, namespace = "help", "help" if command_name.blank? || HELP_MAPPINGS.include?(command_name)
|
40
|
+
command_name, namespace, args = "application", "application", ["--help"] if rails_new_with_no_path?(args)
|
41
41
|
command_name, namespace = "version", "version" if %w( -v --version ).include?(command_name)
|
42
42
|
|
43
43
|
original_argv = ARGV.dup
|
@@ -47,6 +47,7 @@ module Rails
|
|
47
47
|
if command && command.all_commands[command_name]
|
48
48
|
command.perform(command_name, args, config)
|
49
49
|
else
|
50
|
+
args = ["--describe", full_namespace] if HELP_MAPPINGS.include?(args[0])
|
50
51
|
find_by_namespace("rake").perform(full_namespace, args, config)
|
51
52
|
end
|
52
53
|
ensure
|
@@ -58,14 +59,12 @@ module Rails
|
|
58
59
|
# Command names must end with "_command.rb". This is required because Rails
|
59
60
|
# looks in load paths and loads the command just before it's going to be used.
|
60
61
|
#
|
61
|
-
# find_by_namespace :webrat, :
|
62
|
+
# find_by_namespace :webrat, :integration
|
62
63
|
#
|
63
64
|
# Will search for the following commands:
|
64
65
|
#
|
65
|
-
# "
|
66
|
+
# "webrat", "webrat:integration", "rails:webrat", "rails:webrat:integration"
|
66
67
|
#
|
67
|
-
# Notice that "rails:commands:webrat" could be loaded as well, what
|
68
|
-
# Rails looks for is the first and last parts of the namespace.
|
69
68
|
def find_by_namespace(namespace, command_name = nil) # :nodoc:
|
70
69
|
lookups = [ namespace ]
|
71
70
|
lookups << "#{namespace}:#{command_name}" if command_name
|
@@ -94,6 +93,10 @@ module Rails
|
|
94
93
|
COMMANDS_IN_USAGE = %w(generate console server test test:system dbconsole new)
|
95
94
|
private_constant :COMMANDS_IN_USAGE
|
96
95
|
|
96
|
+
def rails_new_with_no_path?(args)
|
97
|
+
args == ["new"]
|
98
|
+
end
|
99
|
+
|
97
100
|
def commands
|
98
101
|
lookup!
|
99
102
|
|
@@ -32,8 +32,8 @@ You could prepend that to your server's start command like this:
|
|
32
32
|
|
33
33
|
=== Set up Git to Diff Credentials
|
34
34
|
|
35
|
-
Rails provides `rails credentials:diff --enroll` to instruct Git to call
|
36
|
-
when `git diff` is run on a credentials file.
|
35
|
+
Rails provides `bin/rails credentials:diff --enroll` to instruct Git to call
|
36
|
+
`bin/rails credentials:diff` when `git diff` is run on a credentials file.
|
37
37
|
|
38
38
|
Running the command enrolls the project such that all credentials files use the
|
39
39
|
"rails_credentials" diff driver in .gitattributes.
|
@@ -45,6 +45,8 @@ that isn't tracked Rails automatically ensures it's configured when running
|
|
45
45
|
Otherwise each co-worker would have to run enable manually, including on each new
|
46
46
|
repo clone.
|
47
47
|
|
48
|
+
To disenroll from this feature, run `bin/rails credentials:diff --disenroll`.
|
49
|
+
|
48
50
|
=== Editing Credentials
|
49
51
|
|
50
52
|
This will open a temporary file in `$EDITOR` with the decrypted contents to edit
|
@@ -1,37 +1,47 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module Rails::Command::CredentialsCommand::Diffing # :nodoc:
|
4
|
+
GITATTRIBUTES_ENTRY = <<~END
|
5
|
+
config/credentials/*.yml.enc diff=rails_credentials
|
6
|
+
config/credentials.yml.enc diff=rails_credentials
|
7
|
+
END
|
8
|
+
|
4
9
|
def enroll_project_in_credentials_diffing
|
5
|
-
if
|
6
|
-
|
10
|
+
if enrolled_in_credentials_diffing?
|
11
|
+
say "Project is already enrolled in credentials file diffing."
|
7
12
|
else
|
8
|
-
gitattributes.write(
|
9
|
-
config/credentials/*.yml.enc diff=rails_credentials
|
10
|
-
config/credentials.yml.enc diff=rails_credentials
|
11
|
-
end_of_template
|
13
|
+
gitattributes.write(GITATTRIBUTES_ENTRY, mode: "a")
|
12
14
|
|
13
|
-
say "
|
15
|
+
say "Enrolled project in credentials file diffing!"
|
14
16
|
say "Rails ensures the rails_credentials diff driver is set when running `credentials:edit`. See `credentials:help` for more."
|
15
17
|
end
|
16
18
|
end
|
17
19
|
|
18
|
-
def
|
19
|
-
|
20
|
+
def disenroll_project_from_credentials_diffing
|
21
|
+
if enrolled_in_credentials_diffing?
|
22
|
+
gitattributes.write(gitattributes.read.gsub(GITATTRIBUTES_ENTRY, ""))
|
23
|
+
gitattributes.delete if gitattributes.empty?
|
24
|
+
|
25
|
+
say "Disenrolled project from credentials file diffing!"
|
26
|
+
else
|
27
|
+
say "Project is not enrolled in credentials file diffing."
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def ensure_diffing_driver_is_configured
|
32
|
+
configure_diffing_driver if enrolled_in_credentials_diffing? && !diffing_driver_configured?
|
20
33
|
end
|
21
34
|
|
22
35
|
private
|
23
|
-
def
|
24
|
-
gitattributes.read.
|
25
|
-
rescue Errno::ENOENT
|
26
|
-
false
|
36
|
+
def enrolled_in_credentials_diffing?
|
37
|
+
gitattributes.file? && gitattributes.read.include?(GITATTRIBUTES_ENTRY)
|
27
38
|
end
|
28
39
|
|
29
|
-
def
|
40
|
+
def diffing_driver_configured?
|
30
41
|
system "git config --get diff.rails_credentials.textconv", out: File::NULL
|
31
42
|
end
|
32
43
|
|
33
|
-
def
|
34
|
-
puts "running"
|
44
|
+
def configure_diffing_driver
|
35
45
|
system "git config diff.rails_credentials.textconv 'bin/rails credentials:diff'"
|
36
46
|
end
|
37
47
|
|
@@ -1,6 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "pathname"
|
4
|
+
require "shellwords"
|
4
5
|
require "active_support"
|
5
6
|
require "rails/command/helpers/editor"
|
6
7
|
require "rails/command/environment_argument"
|
@@ -32,7 +33,7 @@ module Rails
|
|
32
33
|
|
33
34
|
ensure_encryption_key_has_been_added if credentials.key.nil?
|
34
35
|
ensure_credentials_have_been_added
|
35
|
-
|
36
|
+
ensure_diffing_driver_is_configured
|
36
37
|
|
37
38
|
catch_editing_exceptions do
|
38
39
|
change_credentials_in_system_editor
|
@@ -51,7 +52,10 @@ module Rails
|
|
51
52
|
end
|
52
53
|
|
53
54
|
option :enroll, type: :boolean, default: false,
|
54
|
-
desc: "Enrolls project in
|
55
|
+
desc: "Enrolls project in credentials file diffing with `git diff`"
|
56
|
+
|
57
|
+
option :disenroll, type: :boolean, default: false,
|
58
|
+
desc: "Disenrolls project from credentials file diffing"
|
55
59
|
|
56
60
|
def diff(content_path = nil)
|
57
61
|
if @content_path = content_path
|
@@ -61,6 +65,7 @@ module Rails
|
|
61
65
|
say credentials.read.presence || credentials.content_path.read
|
62
66
|
else
|
63
67
|
require_application!
|
68
|
+
disenroll_project_from_credentials_diffing if options[:disenroll]
|
64
69
|
enroll_project_in_credentials_diffing if options[:enroll]
|
65
70
|
end
|
66
71
|
rescue ActiveSupport::MessageEncryptor::InvalidMessage
|
@@ -87,7 +92,7 @@ module Rails
|
|
87
92
|
|
88
93
|
def change_credentials_in_system_editor
|
89
94
|
credentials.change do |tmp_path|
|
90
|
-
system("#{ENV["EDITOR"]} #{tmp_path}")
|
95
|
+
system("#{ENV["EDITOR"]} #{Shellwords.escape(tmp_path)}")
|
91
96
|
end
|
92
97
|
end
|
93
98
|
|
@@ -31,7 +31,7 @@ module Rails
|
|
31
31
|
sslcapath: "--ssl-capath",
|
32
32
|
sslcipher: "--ssl-cipher",
|
33
33
|
sslkey: "--ssl-key"
|
34
|
-
}.
|
34
|
+
}.filter_map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }
|
35
35
|
|
36
36
|
if config[:password] && @options[:include_password]
|
37
37
|
args << "--password=#{config[:password]}"
|
@@ -44,10 +44,14 @@ module Rails
|
|
44
44
|
find_cmd_and_exec(["mysql", "mysql5"], *args)
|
45
45
|
|
46
46
|
when /^postgres|^postgis/
|
47
|
-
ENV["PGUSER"]
|
48
|
-
ENV["PGHOST"]
|
49
|
-
ENV["PGPORT"]
|
50
|
-
ENV["PGPASSWORD"]
|
47
|
+
ENV["PGUSER"] = config[:username] if config[:username]
|
48
|
+
ENV["PGHOST"] = config[:host] if config[:host]
|
49
|
+
ENV["PGPORT"] = config[:port].to_s if config[:port]
|
50
|
+
ENV["PGPASSWORD"] = config[:password].to_s if config[:password] && @options[:include_password]
|
51
|
+
ENV["PGSSLMODE"] = config[:sslmode].to_s if config[:sslmode]
|
52
|
+
ENV["PGSSLCERT"] = config[:sslcert].to_s if config[:sslcert]
|
53
|
+
ENV["PGSSLKEY"] = config[:sslkey].to_s if config[:sslkey]
|
54
|
+
ENV["PGSSLROOTCERT"] = config[:sslrootcert].to_s if config[:sslrootcert]
|
51
55
|
find_cmd_and_exec("psql", db_config.database)
|
52
56
|
|
53
57
|
when "sqlite3"
|
@@ -102,7 +106,7 @@ module Rails
|
|
102
106
|
# first time around to show a consistent error message to people
|
103
107
|
# relying on 2-level database configuration.
|
104
108
|
|
105
|
-
@db_config = configurations.configs_for(env_name: environment, name: database,
|
109
|
+
@db_config = configurations.configs_for(env_name: environment, name: database, include_hidden: true)
|
106
110
|
|
107
111
|
unless @db_config
|
108
112
|
raise ActiveRecord::AdapterNotSpecified,
|
@@ -6,10 +6,11 @@ The most common rails commands are:
|
|
6
6
|
test:system Run system tests
|
7
7
|
dbconsole Start a console for the database specified in config/database.yml
|
8
8
|
(short-cut alias: "db")
|
9
|
-
<% unless engine?
|
9
|
+
<% unless engine? -%>
|
10
10
|
new Create a new Rails application. "rails new my_app" creates a
|
11
11
|
new application called MyApp in "./my_app"
|
12
|
-
|
12
|
+
plugin new Create a new Rails railtie or engine
|
13
|
+
<% end -%>
|
13
14
|
|
14
15
|
All commands can be run with -h (or --help) for more information.
|
15
16
|
In addition to those commands, there are:
|
@@ -38,8 +38,9 @@ module Rails
|
|
38
38
|
if code_or_file == "-"
|
39
39
|
eval($stdin.read, TOPLEVEL_BINDING, "stdin")
|
40
40
|
elsif File.exist?(code_or_file)
|
41
|
-
|
42
|
-
|
41
|
+
expanded_file_path = File.expand_path code_or_file
|
42
|
+
$0 = expanded_file_path
|
43
|
+
Kernel.load expanded_file_path
|
43
44
|
else
|
44
45
|
begin
|
45
46
|
eval(code_or_file, TOPLEVEL_BINDING, __FILE__, __LINE__)
|
@@ -4,7 +4,6 @@ require "fileutils"
|
|
4
4
|
require "action_dispatch"
|
5
5
|
require "rails"
|
6
6
|
require "active_support/core_ext/string/filters"
|
7
|
-
require "active_support/core_ext/symbol/starts_ends_with"
|
8
7
|
require "rails/dev_caching"
|
9
8
|
require "rails/command/environment_argument"
|
10
9
|
|
@@ -263,11 +262,9 @@ module Rails
|
|
263
262
|
Run `bin/rails server --help` for more options.
|
264
263
|
MSG
|
265
264
|
else
|
266
|
-
|
267
|
-
suggestion_msg = "Maybe you meant #{suggestion.inspect}?" if suggestion
|
268
|
-
|
265
|
+
error = CorrectableError.new("Could not find server '#{server}'.", server, RACK_SERVERS)
|
269
266
|
<<~MSG
|
270
|
-
|
267
|
+
#{error.message}
|
271
268
|
Run `bin/rails server --help` for more options.
|
272
269
|
MSG
|
273
270
|
end
|
data/lib/rails/configuration.rb
CHANGED
@@ -49,48 +49,43 @@ module Rails
|
|
49
49
|
@delete_operations = delete_operations
|
50
50
|
end
|
51
51
|
|
52
|
-
def insert_before(
|
53
|
-
@operations << -> middleware { middleware.insert_before(
|
52
|
+
def insert_before(...)
|
53
|
+
@operations << -> middleware { middleware.insert_before(...) }
|
54
54
|
end
|
55
|
-
ruby2_keywords(:insert_before) if respond_to?(:ruby2_keywords, true)
|
56
55
|
|
57
56
|
alias :insert :insert_before
|
58
57
|
|
59
|
-
def insert_after(
|
60
|
-
@operations << -> middleware { middleware.insert_after(
|
58
|
+
def insert_after(...)
|
59
|
+
@operations << -> middleware { middleware.insert_after(...) }
|
61
60
|
end
|
62
|
-
ruby2_keywords(:insert_after) if respond_to?(:ruby2_keywords, true)
|
63
61
|
|
64
|
-
def swap(
|
65
|
-
@operations << -> middleware { middleware.swap(
|
62
|
+
def swap(...)
|
63
|
+
@operations << -> middleware { middleware.swap(...) }
|
66
64
|
end
|
67
|
-
ruby2_keywords(:swap) if respond_to?(:ruby2_keywords, true)
|
68
65
|
|
69
|
-
def use(
|
70
|
-
@operations << -> middleware { middleware.use(
|
66
|
+
def use(...)
|
67
|
+
@operations << -> middleware { middleware.use(...) }
|
71
68
|
end
|
72
|
-
ruby2_keywords(:use) if respond_to?(:ruby2_keywords, true)
|
73
69
|
|
74
|
-
def delete(
|
75
|
-
@delete_operations << -> middleware { middleware.delete(
|
70
|
+
def delete(...)
|
71
|
+
@delete_operations << -> middleware { middleware.delete(...) }
|
76
72
|
end
|
77
73
|
|
78
|
-
def move_before(
|
79
|
-
@delete_operations << -> middleware { middleware.move_before(
|
74
|
+
def move_before(...)
|
75
|
+
@delete_operations << -> middleware { middleware.move_before(...) }
|
80
76
|
end
|
81
77
|
|
82
78
|
alias :move :move_before
|
83
79
|
|
84
|
-
def move_after(
|
85
|
-
@delete_operations << -> middleware { middleware.move_after(
|
80
|
+
def move_after(...)
|
81
|
+
@delete_operations << -> middleware { middleware.move_after(...) }
|
86
82
|
end
|
87
83
|
|
88
|
-
def unshift(
|
89
|
-
@operations << -> middleware { middleware.unshift(
|
84
|
+
def unshift(...)
|
85
|
+
@operations << -> middleware { middleware.unshift(...) }
|
90
86
|
end
|
91
|
-
ruby2_keywords(:unshift) if respond_to?(:ruby2_keywords, true)
|
92
87
|
|
93
|
-
def merge_into(other)
|
88
|
+
def merge_into(other) # :nodoc:
|
94
89
|
(@operations + @delete_operations).each do |operation|
|
95
90
|
operation.call(other)
|
96
91
|
end
|
@@ -106,7 +101,7 @@ module Rails
|
|
106
101
|
attr_reader :operations, :delete_operations
|
107
102
|
end
|
108
103
|
|
109
|
-
class Generators
|
104
|
+
class Generators # :nodoc:
|
110
105
|
attr_accessor :aliases, :options, :templates, :fallbacks, :colorize_logging, :api_only
|
111
106
|
attr_reader :hidden_namespaces, :after_generate_callbacks
|
112
107
|
|
@@ -55,9 +55,9 @@ module Rails
|
|
55
55
|
paths.add "lib/tasks", glob: "**/*.rake"
|
56
56
|
|
57
57
|
paths.add "config"
|
58
|
-
paths.add "config/environments", glob: "#{Rails.env}.rb"
|
58
|
+
paths.add "config/environments", glob: -"#{Rails.env}.rb"
|
59
59
|
paths.add "config/initializers", glob: "**/*.rb"
|
60
|
-
paths.add "config/locales", glob: "
|
60
|
+
paths.add "config/locales", glob: "**/*.{rb,yml}"
|
61
61
|
paths.add "config/routes.rb"
|
62
62
|
paths.add "config/routes", glob: "**/*.rb"
|
63
63
|
|
data/lib/rails/engine.rb
CHANGED
@@ -33,7 +33,7 @@ module Rails
|
|
33
33
|
# Then ensure that this file is loaded at the top of your <tt>config/application.rb</tt>
|
34
34
|
# (or in your +Gemfile+) and it will automatically load models, controllers and helpers
|
35
35
|
# inside +app+, load routes at <tt>config/routes.rb</tt>, load locales at
|
36
|
-
# <tt>config/locales
|
36
|
+
# <tt>config/locales/**/*</tt>, and load tasks at <tt>lib/tasks/**/*</tt>.
|
37
37
|
#
|
38
38
|
# == Configuration
|
39
39
|
#
|
@@ -482,17 +482,8 @@ module Rails
|
|
482
482
|
end
|
483
483
|
|
484
484
|
def eager_load!
|
485
|
-
# Already done by Zeitwerk::Loader.eager_load_all.
|
486
|
-
#
|
487
|
-
return if Rails.autoloaders.zeitwerk_enabled?
|
488
|
-
|
489
|
-
config.eager_load_paths.each do |load_path|
|
490
|
-
# Starts after load_path plus a slash, ends before ".rb".
|
491
|
-
relname_range = (load_path.to_s.length + 1)...-3
|
492
|
-
Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
|
493
|
-
require_dependency file[relname_range]
|
494
|
-
end
|
495
|
-
end
|
485
|
+
# Already done by Zeitwerk::Loader.eager_load_all. By now, we leave the
|
486
|
+
# method as a no-op for backwards compatibility.
|
496
487
|
end
|
497
488
|
|
498
489
|
def railties
|
@@ -579,17 +570,14 @@ module Rails
|
|
579
570
|
$LOAD_PATH.uniq!
|
580
571
|
end
|
581
572
|
|
582
|
-
|
583
|
-
|
584
|
-
#
|
585
|
-
# This needs to be an initializer, since it needs to run once
|
586
|
-
# per engine and get the engine as a block parameter.
|
587
|
-
initializer :set_autoload_paths, before: :bootstrap_hook do
|
588
|
-
ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
|
573
|
+
initializer :set_autoload_once_paths, before: :setup_once_autoloader do
|
574
|
+
config.autoload_once_paths.freeze
|
589
575
|
ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths)
|
576
|
+
end
|
590
577
|
|
578
|
+
initializer :set_autoload_paths, before: :setup_main_autoloader do
|
591
579
|
config.autoload_paths.freeze
|
592
|
-
|
580
|
+
ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
|
593
581
|
end
|
594
582
|
|
595
583
|
initializer :set_eager_load_paths, before: :bootstrap_hook do
|
@@ -665,12 +653,12 @@ module Rails
|
|
665
653
|
end
|
666
654
|
end
|
667
655
|
|
668
|
-
def routes?
|
656
|
+
def routes? # :nodoc:
|
669
657
|
@routes
|
670
658
|
end
|
671
659
|
|
672
660
|
protected
|
673
|
-
def run_tasks_blocks(*)
|
661
|
+
def run_tasks_blocks(*) # :nodoc:
|
674
662
|
super
|
675
663
|
paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
|
676
664
|
end
|
@@ -686,7 +674,7 @@ module Rails
|
|
686
674
|
paths["db/migrate"].existent.any?
|
687
675
|
end
|
688
676
|
|
689
|
-
def self.find_root_with_flag(flag, root_path, default = nil)
|
677
|
+
def self.find_root_with_flag(flag, root_path, default = nil) # :nodoc:
|
690
678
|
while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
|
691
679
|
parent = File.dirname(root_path)
|
692
680
|
root_path = parent != root_path && parent
|
@@ -703,17 +691,25 @@ module Rails
|
|
703
691
|
end
|
704
692
|
|
705
693
|
def _all_autoload_once_paths
|
706
|
-
config.autoload_once_paths
|
694
|
+
config.autoload_once_paths.uniq
|
707
695
|
end
|
708
696
|
|
709
697
|
def _all_autoload_paths
|
710
|
-
@_all_autoload_paths ||=
|
698
|
+
@_all_autoload_paths ||= begin
|
699
|
+
autoload_paths = config.autoload_paths
|
700
|
+
autoload_paths += config.eager_load_paths
|
701
|
+
autoload_paths -= config.autoload_once_paths
|
702
|
+
autoload_paths.uniq
|
703
|
+
end
|
711
704
|
end
|
712
705
|
|
713
706
|
def _all_load_paths(add_autoload_paths_to_load_path)
|
714
707
|
@_all_load_paths ||= begin
|
715
|
-
load_paths
|
716
|
-
|
708
|
+
load_paths = config.paths.load_paths
|
709
|
+
if add_autoload_paths_to_load_path
|
710
|
+
load_paths += _all_autoload_paths
|
711
|
+
load_paths += _all_autoload_once_paths
|
712
|
+
end
|
717
713
|
load_paths.uniq
|
718
714
|
end
|
719
715
|
end
|