From f68e145c48033ce5cb47faaee0cbe8f450c06cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= Date: Fri, 31 Jan 2025 22:07:08 +0100 Subject: [PATCH] Adopt new rubocop rule defaults. --- app/avo/concerns/auditable.rb | 4 ++-- app/avo/fields/array_of_field.rb | 4 ++-- app/controllers/concerns/avo_auditable.rb | 4 ++-- app/controllers/concerns/session_verifiable.rb | 10 +++++----- lib/gem_package_enumerator.rb | 4 ++-- test/functional/api/v1/rubygems_controller_test.rb | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/avo/concerns/auditable.rb b/app/avo/concerns/auditable.rb index 4a544663276..bef46077d50 100644 --- a/app/avo/concerns/auditable.rb +++ b/app/avo/concerns/auditable.rb @@ -10,7 +10,7 @@ def merge_changes!(changes, changes_to_save) end end - def in_audited_transaction(auditable:, admin_github_user:, action:, fields:, arguments:, models:, &blk) # rubocop:disable Metrics Naming/BlockForwarding + def in_audited_transaction(auditable:, admin_github_user:, action:, fields:, arguments:, models:, &) # rubocop:disable Metrics Naming/BlockForwarding logger.debug { "Auditing changes to #{auditable}: #{fields}" } User.transaction do @@ -25,7 +25,7 @@ def in_audited_transaction(auditable:, admin_github_user:, action:, fields:, arg merge_changes!((changed_records[record] ||= {}), record.attributes.transform_values { [nil, _1] }) if record.new_record? merge_changes!((changed_records[record] ||= {}), record.changes_to_save) end - end, "sql.active_record", &blk) + end, "sql.active_record", &) case auditable when :return diff --git a/app/avo/fields/array_of_field.rb b/app/avo/fields/array_of_field.rb index d86dba064d2..5041eef2be8 100644 --- a/app/avo/fields/array_of_field.rb +++ b/app/avo/fields/array_of_field.rb @@ -1,10 +1,10 @@ class Avo::Fields::ArrayOfField < Avo::Fields::BaseField - def initialize(name, field:, field_options: {}, **args, &block) + def initialize(name, field:, field_options: {}, **args, &) super(name, **args, &nil) @make_field = lambda do |id:, index: nil, value: nil| items_holder = Avo::Resources::Items::Holder.new - items_holder.field(id, name: index&.to_s || self.name, as: field, required: -> { false }, value:, **field_options, &block) + items_holder.field(id, name: index&.to_s || self.name, as: field, required: -> { false }, value:, **field_options, &) items_holder.items.sole.hydrate(view:, resource:) end end diff --git a/app/controllers/concerns/avo_auditable.rb b/app/controllers/concerns/avo_auditable.rb index 2fdabd8772a..0f4ee73491a 100644 --- a/app/controllers/concerns/avo_auditable.rb +++ b/app/controllers/concerns/avo_auditable.rb @@ -7,7 +7,7 @@ module AvoAuditable prepend_around_action :unscope_users end - def perform_action_and_record_errors(&blk) + def perform_action_and_record_errors(&) super do action = params.fetch(:action) fields = action == "destroy" ? {} : cast_nullable(model_params) @@ -23,7 +23,7 @@ def perform_action_and_record_errors(&blk) fields: fields.reverse_merge(comment: action_name), arguments: {}, models: [@record], - &blk + & ) value end diff --git a/app/controllers/concerns/session_verifiable.rb b/app/controllers/concerns/session_verifiable.rb index 864e9c95747..f5da95b4844 100644 --- a/app/controllers/concerns/session_verifiable.rb +++ b/app/controllers/concerns/session_verifiable.rb @@ -2,11 +2,11 @@ module SessionVerifiable extend ActiveSupport::Concern class_methods do - def verify_session_before(**opts) - before_action :redirect_to_signin, **opts, unless: :signed_in? - before_action :redirect_to_new_mfa, **opts, if: :mfa_required_not_yet_enabled? - before_action :redirect_to_settings_strong_mfa_required, **opts, if: :mfa_required_weak_level_enabled? - before_action :redirect_to_verify, **opts, unless: :verified_session_active? + def verify_session_before(**) + before_action(:redirect_to_signin, **, unless: :signed_in?) + before_action(:redirect_to_new_mfa, **, if: :mfa_required_not_yet_enabled?) + before_action(:redirect_to_settings_strong_mfa_required, **, if: :mfa_required_weak_level_enabled?) + before_action(:redirect_to_verify, **, unless: :verified_session_active?) end end diff --git a/lib/gem_package_enumerator.rb b/lib/gem_package_enumerator.rb index 04c97385727..15703f48510 100644 --- a/lib/gem_package_enumerator.rb +++ b/lib/gem_package_enumerator.rb @@ -25,11 +25,11 @@ def filter_map(&) private - def open_data_tar(&blk) + def open_data_tar(&) @package.verify @package.gem.with_read_io do |io| Gem::Package::TarReader.new(io).seek("data.tar.gz") do |gem_entry| - @package.open_tar_gz(gem_entry, &blk) + @package.open_tar_gz(gem_entry, &) end end end diff --git a/test/functional/api/v1/rubygems_controller_test.rb b/test/functional/api/v1/rubygems_controller_test.rb index cf60b05c4c4..cee517e10f0 100644 --- a/test/functional/api/v1/rubygems_controller_test.rb +++ b/test/functional/api/v1/rubygems_controller_test.rb @@ -23,7 +23,7 @@ def self.should_respond_to_show end end - def self.should_respond_to(format, &blk) + def self.should_respond_to(format, &) context "with #{format.to_s.upcase} for a hosted gem" do setup do @rubygem = create(:rubygem) @@ -31,7 +31,7 @@ def self.should_respond_to(format, &blk) get :show, params: { id: @rubygem.slug }, format: format end - should_respond_to_show(&blk) + should_respond_to_show(&) end context "with #{format.to_s.upcase} for a hosted gem with a period in its name" do @@ -41,7 +41,7 @@ def self.should_respond_to(format, &blk) get :show, params: { id: @rubygem.slug }, format: format end - should_respond_to_show(&blk) + should_respond_to_show(&) end end