Skip to content

Commit

Permalink
Add and apply Naming/BlockForwarding rubocop rule
Browse files Browse the repository at this point in the history
This syntax has been added in Ruby 3.1.

Not using a variable name might not be very descriptive, but it's just
as descriptive as using "block" as a variable name. Using just `&` we
get the same amount of information than using `&block`: that we're
passing a block.
  • Loading branch information
javierm committed Sep 6, 2023
1 parent aec9276 commit 353d4e3
Show file tree
Hide file tree
Showing 14 changed files with 34 additions and 31 deletions.
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,9 @@ Lint/UselessAssignment:
Lint/Void:
Enabled: true

Naming/BlockForwarding:
Enabled: true

Naming/VariableName:
Enabled: true

Expand Down
4 changes: 2 additions & 2 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ def verify_lock
end
end

def switch_locale(&action)
def switch_locale(&)
locale = current_locale

if current_user && current_user.locale != locale.to_s
current_user.update(locale: locale)
end

session[:locale] = locale
I18n.with_locale(locale, &action)
I18n.with_locale(locale, &)
end

def current_locale
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/management/base_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ def check_verified_user(alert_msg)
redirect_to management_document_verifications_path, alert: message
end

def switch_locale(&action)
def switch_locale(&)
if params[:locale] && I18n.available_locales.include?(params[:locale].to_sym)
session[:locale] = params[:locale]
end

session[:locale] ||= I18n.default_locale

I18n.with_locale(session[:locale], &action)
I18n.with_locale(session[:locale], &)
end

def clear_password
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/stats_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def index

private

def daily_cache(key, &block)
Rails.cache.fetch("public_stats/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &block)
def daily_cache(key, &)
Rails.cache.fetch("public_stats/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &)
end
end
4 changes: 2 additions & 2 deletions app/controllers/subscriptions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ def allowed_params
[:email_on_comment, :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter]
end

def set_user_locale(&action)
def set_user_locale(&)
if params[:locale].blank?
session[:locale] = I18n.available_locales.find { |locale| locale == @user.locale&.to_sym }
end
I18n.with_locale(session[:locale], &action)
I18n.with_locale(session[:locale], &)
end
end
6 changes: 3 additions & 3 deletions app/graphql/types/base_object.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Types
class BaseObject < GraphQL::Schema::Object
def self.field(*args, **kwargs, &block)
super(*args, **kwargs, &block)
def self.field(*args, **kwargs, &)
super(*args, **kwargs, &)

# The old api contained non-camelized fields
# We want to support these for now, but throw a deprecation warning
Expand All @@ -14,7 +14,7 @@ def self.field(*args, **kwargs, &block)
if field_name.to_s.include?("_")
reason = "Snake case fields are deprecated. Please use #{field_name.to_s.camelize(:lower)}."
kwargs = kwargs.merge({ camelize: false, deprecation_reason: reason })
super(*args, **kwargs, &block)
super(*args, **kwargs, &)
end

# Make sure associations only return public records
Expand Down
4 changes: 2 additions & 2 deletions app/helpers/globalize_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def translation_enabled_tag(locale, enabled)
hidden_field_tag("enabled_translations[#{locale}]", (enabled ? 1 : 0))
end

def globalize(locale, &block)
Globalize.with_locale(locale, &block)
def globalize(locale, &)
Globalize.with_locale(locale, &)
end
end
12 changes: 6 additions & 6 deletions app/helpers/translatable_form_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module TranslatableFormHelper
def translatable_form_for(record, options = {}, &block)
form_for(record, options.merge(builder: TranslatableFormBuilder), &block)
def translatable_form_for(record, options = {}, &)
form_for(record, options.merge(builder: TranslatableFormBuilder), &)
end

def translations_interface_enabled?
Expand All @@ -18,13 +18,13 @@ def highlight_translation_html_class
class TranslatableFormBuilder < ConsulFormBuilder
attr_accessor :translations

def translatable_fields(&block)
def translatable_fields(&)
@translations = {}
visible_locales.map do |locale|
@translations[locale] = translation_for(locale)
end
safe_join(visible_locales.map do |locale|
Globalize.with_locale(locale) { fields_for_locale(locale, &block) }
Globalize.with_locale(locale) { fields_for_locale(locale, &) }
end)
end

Expand All @@ -46,8 +46,8 @@ def fields_for_locale(locale)
end
end

def fields_for_translation(translation, &block)
fields_for(:translations, translation, builder: TranslationsFieldsBuilder, &block)
def fields_for_translation(translation, &)
fields_for(:translations, translation, builder: TranslationsFieldsBuilder, &)
end

def translation_for(locale)
Expand Down
4 changes: 2 additions & 2 deletions app/mailers/mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ def already_confirmed(user)

private

def with_user(user, &block)
I18n.with_locale(user.locale, &block)
def with_user(user, &)
I18n.with_locale(user.locale, &)
end

def prevent_delivery_to_users_without_email
Expand Down
4 changes: 2 additions & 2 deletions app/models/budget/stats.rb
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def supports(supportable)

stats_cache(*stats_methods)

def stats_cache(key, &block)
Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/#{version}", &block)
def stats_cache(key, &)
Rails.cache.fetch("budgets_stats/#{budget.id}/#{phases.join}/#{key}/#{version}", &)
end
end
4 changes: 2 additions & 2 deletions app/models/poll/stats.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def total_unregistered_booth

stats_cache(*stats_methods)

def stats_cache(key, &block)
Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/#{version}", &block)
def stats_cache(key, &)
Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/#{version}", &)
end
end
4 changes: 2 additions & 2 deletions app/models/tenant.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ def self.switch(...)
Apartment::Tenant.switch(...)
end

def self.run_on_each(&block)
def self.run_on_each(&)
["public"].union(Apartment.tenant_names).each do |schema|
switch(schema, &block)
switch(schema, &)
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/remote_translations/microsoft/available_locales.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def self.remote_available_locales
JSON.parse(result)["translation"].map(&:first)
end

def self.daily_cache(key, &block)
Rails.cache.fetch("remote_available_locales/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &block)
def self.daily_cache(key, &)
Rails.cache.fetch("remote_available_locales/#{Time.current.strftime("%Y-%m-%d")}/#{key}", &)
end
end
4 changes: 2 additions & 2 deletions spec/sessions_helper.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
def in_browser(name, &block)
Capybara.using_session(name, &block)
def in_browser(name, &)
Capybara.using_session(name, &)
end

0 comments on commit 353d4e3

Please sign in to comment.