railties 6.1.3.2 → 6.1.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 61739e28458d5f2b4e28ee12d71375baafa44dccc9d978038cbd45a63d4f6580
4
- data.tar.gz: 242072e49d750c6d7638a1e1c719ce3cfcfef0e35847b02150a0285acc43359f
3
+ metadata.gz: 579db8705bfddfb4ad877091124e238f804e03aa5eefb29913e63492622a2c2a
4
+ data.tar.gz: ceaf3ccf971e958b82dbd2c3ab83248d742cf6ba8bd60fb5777a32a9187cefb8
5
5
  SHA512:
6
- metadata.gz: da4278d70f737c93ae1da37c2d9383980598eac4a1ccb446cb741965af8db09d9180244d6e5e2a895875e5857d6d2c55a00df429840bb05938b0e785ea702572
7
- data.tar.gz: d36016d02d180a8473f6f4699c4c6212d48277b2f5723a6225725137d9d692e03706a9c94063e47ce440cf3da55cefcac9a2cd3d3c529a5b94662d6f31da8c09
6
+ metadata.gz: 5f572d8ce2287fdaa832767e191c7b88e8703103b453c62494fb7d9e710b5d73859455ff2a6b060c70ea6e61bc8736de6a7580c54353c6a7e96d7dfb60994475
7
+ data.tar.gz: 63dedca83d5fe4b3df7bf94480b5612938272577c5685d89a8472449ffddcd674fbfe694d07b344f40a4211470cfd6979a42d6719d070a92e987d44ccd346111
data/CHANGELOG.md CHANGED
@@ -1,3 +1,21 @@
1
+ ## Rails 6.1.4 (June 24, 2021) ##
2
+
3
+ * Fix compatibility with `psych >= 4`.
4
+
5
+ Starting in Psych 4.0.0 `YAML.load` behaves like `YAML.safe_load`. To preserve compatibility
6
+ `Rails.application.config_for` now uses `YAML.unsafe_load` if available.
7
+
8
+ *Jean Boussier*
9
+
10
+ * Ensure `Rails.application.config_for` always cast hashes to `ActiveSupport::OrderedOptions`.
11
+
12
+ *Jean Boussier*
13
+
14
+ * Fix create migration generator with `--pretend` option.
15
+
16
+ *euxx*
17
+
18
+
1
19
  ## Rails 6.1.3.2 (May 05, 2021) ##
2
20
 
3
21
  * No changes.
@@ -246,11 +246,18 @@ module Rails
246
246
  all_configs = ActiveSupport::ConfigurationFile.parse(yaml).deep_symbolize_keys
247
247
  config, shared = all_configs[env.to_sym], all_configs[:shared]
248
248
 
249
+ if shared
250
+ config = {} if config.nil?
251
+ if config.is_a?(Hash)
252
+ config = shared.deep_merge(config)
253
+ end
254
+ end
255
+
249
256
  if config.is_a?(Hash)
250
- ActiveSupport::OrderedOptions.new.update(shared&.deep_merge(config) || config)
251
- else
252
- config || shared
257
+ config = ActiveSupport::OrderedOptions.new.update(config)
253
258
  end
259
+
260
+ config
254
261
  else
255
262
  raise "Could not load configuration. No such file - #{yaml}"
256
263
  end
@@ -256,10 +256,13 @@ module Rails
256
256
  if path = paths["config/database"].existent.first
257
257
  require "rails/application/dummy_erb_compiler"
258
258
 
259
- yaml = Pathname.new(path)
260
- erb = DummyERB.new(yaml.read)
259
+ yaml = DummyERB.new(Pathname.new(path).read).result
261
260
 
262
- YAML.load(erb.result) || {}
261
+ if YAML.respond_to?(:unsafe_load)
262
+ YAML.unsafe_load(yaml) || {}
263
+ else
264
+ YAML.load(yaml) || {}
265
+ end
263
266
  else
264
267
  {}
265
268
  end
data/lib/rails/command.rb CHANGED
@@ -40,10 +40,8 @@ module Rails
40
40
  command_name, namespace = "help", "help" if command_name.blank? || HELP_MAPPINGS.include?(command_name)
41
41
  command_name, namespace = "version", "version" if %w( -v --version ).include?(command_name)
42
42
 
43
- # isolate ARGV to ensure that commands depend only on the args they are given
44
- args = args.dup # args might *be* ARGV so dup before clearing
45
- old_argv = ARGV.dup
46
- ARGV.clear
43
+ original_argv = ARGV.dup
44
+ ARGV.replace(args)
47
45
 
48
46
  command = find_by_namespace(namespace, command_name)
49
47
  if command && command.all_commands[command_name]
@@ -52,7 +50,7 @@ module Rails
52
50
  find_by_namespace("rake").perform(full_namespace, args, config)
53
51
  end
54
52
  ensure
55
- ARGV.replace(old_argv)
53
+ ARGV.replace(original_argv)
56
54
  end
57
55
 
58
56
  # Rails finds namespaces similar to Thor, it only adds one rule:
@@ -102,7 +102,7 @@ module Rails
102
102
  # first time around to show a consistent error message to people
103
103
  # relying on 2-level database configuration.
104
104
 
105
- @db_config = configurations.configs_for(env_name: environment, name: database)
105
+ @db_config = configurations.configs_for(env_name: environment, name: database, include_replicas: true)
106
106
 
107
107
  unless @db_config
108
108
  raise ActiveRecord::AdapterNotSpecified,
@@ -9,8 +9,8 @@ module Rails
9
9
  module VERSION
10
10
  MAJOR = 6
11
11
  MINOR = 1
12
- TINY = 3
13
- PRE = "2"
12
+ TINY = 4
13
+ PRE = nil
14
14
 
15
15
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
16
16
  end
@@ -20,6 +20,8 @@ module Rails
20
20
  end
21
21
 
22
22
  def invoke!
23
+ return super if pretend?
24
+
23
25
  invoked_file = super
24
26
  File.exist?(@destination) ? invoked_file : relative_existing_migration
25
27
  end
@@ -10,13 +10,13 @@ namespace :yarn do
10
10
  end
11
11
 
12
12
  yarn_flags =
13
- if `"#{Rails.root}/bin/yarn" --version`.start_with?("1")
13
+ if `#{RbConfig.ruby} "#{Rails.root}/bin/yarn" --version`.start_with?("1")
14
14
  "--no-progress --frozen-lockfile"
15
15
  else
16
16
  "--immutable"
17
17
  end
18
18
 
19
- system({ "NODE_ENV" => node_env }, "\"#{Rails.root}/bin/yarn\" install #{yarn_flags}")
19
+ system({ "NODE_ENV" => node_env }, "#{RbConfig.ruby} \"#{Rails.root}/bin/yarn\" install #{yarn_flags}")
20
20
  rescue Errno::ENOENT
21
21
  $stderr.puts "bin/yarn was not found."
22
22
  $stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: railties
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.1.3.2
4
+ version: 6.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-05-05 00:00:00.000000000 Z
11
+ date: 2021-06-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,42 +16,42 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 6.1.3.2
19
+ version: 6.1.4
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 6.1.3.2
26
+ version: 6.1.4
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: actionpack
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 6.1.3.2
33
+ version: 6.1.4
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 6.1.3.2
40
+ version: 6.1.4
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 0.8.7
47
+ version: '0.13'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 0.8.7
54
+ version: '0.13'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: thor
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - '='
88
88
  - !ruby/object:Gem::Version
89
- version: 6.1.3.2
89
+ version: 6.1.4
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - '='
95
95
  - !ruby/object:Gem::Version
96
- version: 6.1.3.2
96
+ version: 6.1.4
97
97
  description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
98
98
  email: david@loudthinking.com
99
99
  executables:
@@ -426,11 +426,11 @@ licenses:
426
426
  - MIT
427
427
  metadata:
428
428
  bug_tracker_uri: https://github.com/rails/rails/issues
429
- changelog_uri: https://github.com/rails/rails/blob/v6.1.3.2/railties/CHANGELOG.md
430
- documentation_uri: https://api.rubyonrails.org/v6.1.3.2/
429
+ changelog_uri: https://github.com/rails/rails/blob/v6.1.4/railties/CHANGELOG.md
430
+ documentation_uri: https://api.rubyonrails.org/v6.1.4/
431
431
  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
432
- source_code_uri: https://github.com/rails/rails/tree/v6.1.3.2/railties
433
- post_install_message:
432
+ source_code_uri: https://github.com/rails/rails/tree/v6.1.4/railties
433
+ post_install_message:
434
434
  rdoc_options:
435
435
  - "--exclude"
436
436
  - "."
@@ -448,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
448
448
  version: '0'
449
449
  requirements: []
450
450
  rubygems_version: 3.1.2
451
- signing_key:
451
+ signing_key:
452
452
  specification_version: 4
453
453
  summary: Tools for creating, working with, and running Rails applications.
454
454
  test_files: []