diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-02-01 14:16:55 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-02-01 14:20:11 +0900 |
| commit | 7ebfb319ffbfc1f9d3dc5439052ae06019bf4290 (patch) | |
| tree | 64d61f0307323d11f46e8ca153d3eed8e8355d00 | |
| parent | 6127b8d9203d7ce852d103ff1686621f9aca292f (diff) | |
| download | rails-7ebfb319ffbfc1f9d3dc5439052ae06019bf4290.tar.gz rails-7ebfb319ffbfc1f9d3dc5439052ae06019bf4290.tar.bz2 rails-7ebfb319ffbfc1f9d3dc5439052ae06019bf4290.zip | |
Enable `Lint/ErbNewArguments` cop to avoid the deprecated arguments warning
Related 5754a29a974d31cab2b4392716b9825a3d910a69.
And follows Ruby standard library style https://github.com/ruby/ruby/commit/3406c5d.
| -rw-r--r-- | .rubocop.yml | 3 | ||||
| -rw-r--r-- | railties/lib/rails/generators/migration.rb | 3 | ||||
| -rw-r--r-- | tasks/release.rb | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index dce1a30d9f..618817daca 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -179,6 +179,9 @@ Layout/TrailingWhitespace: Style/UnneededPercentQ: Enabled: true +Lint/ErbNewArguments: + Enabled: true + # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg. Lint/RequireParentheses: Enabled: true diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb index 5081060895..b6ec0160cf 100644 --- a/railties/lib/rails/generators/migration.rb +++ b/railties/lib/rails/generators/migration.rb @@ -63,8 +63,7 @@ module Rails numbered_destination = File.join(dir, ["%migration_number%", base].join("_")) create_migration numbered_destination, nil, config do - match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /) - if match && match[:version] >= "2.2.0" # Ruby 2.6+ + if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ ERB.new(::File.binread(source), trim_mode: "-", eoutvar: "@output_buffer").result(context) else ERB.new(::File.binread(source), nil, "-", "@output_buffer").result(context) diff --git a/tasks/release.rb b/tasks/release.rb index 2fdcea9d12..82d1fb6a68 100644 --- a/tasks/release.rb +++ b/tasks/release.rb @@ -314,8 +314,7 @@ task :announce do require "erb" template = File.read("../tasks/release_announcement_draft.erb") - match = ERB.version.match(/\Aerb\.rb \[(?<version>[^ ]+) /) - if match && match[:version] >= "2.2.0" # Ruby 2.6+ + if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ puts ERB.new(template, trim_mode: "<>").result(binding) else puts ERB.new(template, nil, "<>").result(binding) |