From 32b1fc53e1dad31a0cac668d7c1d8da0c378b650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 1 Jul 2023 17:02:52 +0200 Subject: [PATCH] Add and appy MultilineOperationIndentation rule This way it's easier to see when lines are part of multiline statements and when they belong to `if` statements. --- .rubocop.yml | 3 +++ app/components/admin/menu_component.rb | 2 +- app/helpers/admin_budget_investments_helper.rb | 4 ++-- app/helpers/globalize_helper.rb | 2 +- app/helpers/management_helper.rb | 6 +++--- app/helpers/milestones_helper.rb | 2 +- app/helpers/poll_recounts_helper.rb | 4 ++-- app/helpers/proposals_dashboard_helper.rb | 2 +- app/helpers/users_helper.rb | 2 +- app/helpers/welcome_helper.rb | 2 +- app/models/local_census_records/import.rb | 2 +- app/models/user.rb | 2 +- app/views/dashboard/_menu.html.erb | 6 +++--- spec/components/shared/link_list_component_spec.rb | 8 ++++---- 14 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 3dd4dad6d..4315154ae 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -105,6 +105,9 @@ Layout/MultilineHashBraceLayout: Layout/MultilineHashKeyLineBreaks: Enabled: true +Layout/MultilineOperationIndentation: + Enabled: true + Layout/SpaceAfterColon: Enabled: true diff --git a/app/components/admin/menu_component.rb b/app/components/admin/menu_component.rb index 1b616c5fb..21ffbc74d 100644 --- a/app/components/admin/menu_component.rb +++ b/app/components/admin/menu_component.rb @@ -41,7 +41,7 @@ class Admin::MenuComponent < ApplicationComponent def polls? controller.class.module_parent == Admin::Poll::Questions::Answers || %w[polls active_polls recounts results questions answers].include?(controller_name) && - action_name != "booth_assignments" + action_name != "booth_assignments" end def booths? diff --git a/app/helpers/admin_budget_investments_helper.rb b/app/helpers/admin_budget_investments_helper.rb index 9efa16e69..d3d73988b 100644 --- a/app/helpers/admin_budget_investments_helper.rb +++ b/app/helpers/admin_budget_investments_helper.rb @@ -1,8 +1,8 @@ module AdminBudgetInvestmentsHelper def advanced_menu_visibility if params[:advanced_filters].empty? && - params["min_total_supports"].blank? && - params["max_total_supports"].blank? + params["min_total_supports"].blank? && + params["max_total_supports"].blank? "hide" else "" diff --git a/app/helpers/globalize_helper.rb b/app/helpers/globalize_helper.rb index 13e9ec3d4..6487c5c7b 100644 --- a/app/helpers/globalize_helper.rb +++ b/app/helpers/globalize_helper.rb @@ -35,7 +35,7 @@ module GlobalizeHelper def first_i18n_content_translation_locale if I18nContentTranslation.existing_languages.count == 0 || - I18nContentTranslation.existing_languages.include?(I18n.locale) + I18nContentTranslation.existing_languages.include?(I18n.locale) I18n.locale else I18nContentTranslation.existing_languages.first diff --git a/app/helpers/management_helper.rb b/app/helpers/management_helper.rb index a75fa87c1..99bc18023 100644 --- a/app/helpers/management_helper.rb +++ b/app/helpers/management_helper.rb @@ -25,17 +25,17 @@ module ManagementHelper def menu_create_investments? (controller_name == "budget_investments" && action_name == "new") || - (controller_name == "budgets" && action_name == "create_investments") + (controller_name == "budgets" && action_name == "create_investments") end def menu_support_investments? (controller_name == "budget_investments" && action_name == "index") || - (controller_name == "budgets" && action_name == "support_investments") + (controller_name == "budgets" && action_name == "support_investments") end def menu_print_investments? (controller_name == "budget_investments" && action_name == "print") || - (controller_name == "budgets" && action_name == "print_investments") + (controller_name == "budgets" && action_name == "print_investments") end def menu_user_invites? diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index e98ea3b1f..7a1b4339a 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -10,7 +10,7 @@ module MilestonesHelper "aria-valuemin": "0", tabindex: "0" do tag.span(class: "progress-meter", style: "width: #{progress_bar.percentage}%;") + - tag.p(text, class: "progress-meter-text") + tag.p(text, class: "progress-meter-text") end end end diff --git a/app/helpers/poll_recounts_helper.rb b/app/helpers/poll_recounts_helper.rb index 8e92e7a1f..9155b7556 100644 --- a/app/helpers/poll_recounts_helper.rb +++ b/app/helpers/poll_recounts_helper.rb @@ -2,8 +2,8 @@ module PollRecountsHelper def total_recounts_by_booth(booth_assignment) if booth_assignment.recounts.any? booth_assignment.recounts.sum(:total_amount) + - booth_assignment.recounts.sum(:white_amount) + - booth_assignment.recounts.sum(:null_amount) + booth_assignment.recounts.sum(:white_amount) + + booth_assignment.recounts.sum(:null_amount) end end end diff --git a/app/helpers/proposals_dashboard_helper.rb b/app/helpers/proposals_dashboard_helper.rb index a73b6d0ff..d090ca21c 100644 --- a/app/helpers/proposals_dashboard_helper.rb +++ b/app/helpers/proposals_dashboard_helper.rb @@ -49,7 +49,7 @@ module ProposalsDashboardHelper def is_proposed_action_request? controller_name == "dashboard" && action_name == "new_request" && - dashboard_action&.proposed_action? + dashboard_action&.proposed_action? end def is_request_active(id) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 49db9cb5c..66ec354ea 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -16,7 +16,7 @@ module UsersHelper deleted_commentable_text(comment) elsif commentable.hidden? tag.del(commentable.title) + " " + - tag.span("(#{deleted_commentable_text(comment)})", class: "small") + tag.span("(#{deleted_commentable_text(comment)})", class: "small") else link_to(commentable.title, comment) end diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index cb77252d3..82f93bb3c 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -25,7 +25,7 @@ module WelcomeHelper def calculate_image_path(recommended, image_default) if recommended.respond_to?(:image) && recommended.image.present? && - recommended.image.attachment.attached? + recommended.image.attachment.attached? recommended.image.variant(:medium) elsif image_default.present? image_default diff --git a/app/models/local_census_records/import.rb b/app/models/local_census_records/import.rb index 46bd1880c..e7d09a96b 100644 --- a/app/models/local_census_records/import.rb +++ b/app/models/local_census_records/import.rb @@ -73,7 +73,7 @@ class LocalCensusRecords::Import def file_headers_definition headers = fetch_file_headers return if headers.all? { |header| ATTRIBUTES.include? header } && - ATTRIBUTES.all? { |attr| headers.include? attr } + ATTRIBUTES.all? { |attr| headers.include? attr } errors.add :file, :headers, required_headers: ATTRIBUTES.join(", ") end diff --git a/app/models/user.rb b/app/models/user.rb index 2991a7842..12a78b13c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -396,7 +396,7 @@ class User < ApplicationRecord conditions = warden_conditions.dup login = conditions.delete(:login) where(conditions.to_hash).find_by(["lower(email) = ?", login.downcase]) || - where(conditions.to_hash).find_by(["username = ?", login]) + where(conditions.to_hash).find_by(["username = ?", login]) end def self.find_by_manager_login(manager_login) diff --git a/app/views/dashboard/_menu.html.erb b/app/views/dashboard/_menu.html.erb index 29dea1ad5..f43835c5a 100644 --- a/app/views/dashboard/_menu.html.erb +++ b/app/views/dashboard/_menu.html.erb @@ -38,7 +38,7 @@ <%= link_to proposal_dashboard_polls_path(proposal), class: ("submenu-active" if polls_menu_active?) do %> "> + t("dashboard.menu.polls") %>"> <%= t("dashboard.menu.polls") %> <% end %> @@ -50,7 +50,7 @@ <%= link_to new_proposal_dashboard_mailing_path(proposal), class: ("submenu-active" if mailing_menu_active?) do %> "> + t("dashboard.menu.mailing") %>"> <%= t("dashboard.menu.mailing") %> <% end %> @@ -62,7 +62,7 @@ <%= link_to new_proposal_dashboard_poster_path(proposal), class: ("submenu-active" if poster_menu_active?) do %> "> + t("dashboard.menu.poster") %>"> <%= t("dashboard.menu.poster") %> <% end %> diff --git a/spec/components/shared/link_list_component_spec.rb b/spec/components/shared/link_list_component_spec.rb index 93e57cb01..f6ae9a3d4 100644 --- a/spec/components/shared/link_list_component_spec.rb +++ b/spec/components/shared/link_list_component_spec.rb @@ -19,8 +19,8 @@ describe Shared::LinkListComponent do ) expect(page).to be_rendered with: '\n" + '
  • Home
    • ' + "\n" + + '
  • Info
    • ' + "\n\n" end it "accepts anchor tags" do @@ -29,8 +29,8 @@ describe Shared::LinkListComponent do ) expect(page).to be_rendered with: '\n" + '
  • Home
    • ' + "\n" + + '
  • Info
    • ' + "\n\n" end it "accepts options for links" do