diff --git a/.rubocop.yml b/.rubocop.yml index a5ad75143..2442210e7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,6 +18,9 @@ Bundler/OrderedGems: Enabled: true ConsiderPunctuation: true +Layout/ArrayAlignment: + Enabled: true + Layout/AssignmentIndentation: Enabled: true @@ -57,6 +60,10 @@ Layout/EndOfLine: Layout/ExtraSpacing: Enabled: true +Layout/FirstArrayElementIndentation: + Enabled: true + EnforcedStyle: consistent + Layout/HeredocIndentation: Enabled: true @@ -79,6 +86,9 @@ Layout/LineLength: Max: 110 Severity: refactor +Layout/MultilineArrayBraceLayout: + Enabled: true + Layout/MultilineBlockLayout: Enabled: true diff --git a/app/components/shared/advanced_search_component.rb b/app/components/shared/advanced_search_component.rb index 242335ed7..43a72917e 100644 --- a/app/components/shared/advanced_search_component.rb +++ b/app/components/shared/advanced_search_component.rb @@ -8,13 +8,16 @@ class Shared::AdvancedSearchComponent < ApplicationComponent end def date_range_options - options_for_select([ - [t("shared.advanced_search.date_1"), 1], - [t("shared.advanced_search.date_2"), 2], - [t("shared.advanced_search.date_3"), 3], - [t("shared.advanced_search.date_4"), 4], - [t("shared.advanced_search.date_5"), "custom"]], - selected_date_range) + options_for_select( + [ + [t("shared.advanced_search.date_1"), 1], + [t("shared.advanced_search.date_2"), 2], + [t("shared.advanced_search.date_3"), 3], + [t("shared.advanced_search.date_4"), 4], + [t("shared.advanced_search.date_5"), "custom"] + ], + selected_date_range + ) end def selected_date_range diff --git a/app/controllers/admin/budgets_controller.rb b/app/controllers/admin/budgets_controller.rb index 9617c904a..6ce7b2721 100644 --- a/app/controllers/admin/budgets_controller.rb +++ b/app/controllers/admin/budgets_controller.rb @@ -60,13 +60,14 @@ class Admin::BudgetsController < Admin::BaseController def allowed_params descriptions = Budget::Phase::PHASE_KINDS.map { |p| "description_#{p}" }.map(&:to_sym) - valid_attributes = [:phase, - :currency_symbol, - :voting_style, - :hide_money, - administrator_ids: [], - valuator_ids: [], - image_attributes: image_attributes + valid_attributes = [ + :phase, + :currency_symbol, + :voting_style, + :hide_money, + administrator_ids: [], + valuator_ids: [], + image_attributes: image_attributes ] + descriptions [*valid_attributes, *report_attributes, translation_params(Budget)] diff --git a/app/controllers/valuation/budget_investments_controller.rb b/app/controllers/valuation/budget_investments_controller.rb index 3460b6d20..185606ff1 100644 --- a/app/controllers/valuation/budget_investments_controller.rb +++ b/app/controllers/valuation/budget_investments_controller.rb @@ -77,12 +77,12 @@ class Valuation::BudgetInvestmentsController < Valuation::BaseController investment_headings = Budget::Heading.where(id: investments.pluck(:heading_id)).sort_by(&:name) all_headings_filter = [ - { - name: t("valuation.budget_investments.index.headings_filter_all"), - id: nil, - count: investments.size - } - ] + { + name: t("valuation.budget_investments.index.headings_filter_all"), + id: nil, + count: investments.size + } + ] investment_headings.reduce(all_headings_filter) do |filters, heading| filters << { diff --git a/app/models/budget/phase.rb b/app/models/budget/phase.rb index 28ae761d1..5e4b00fca 100644 --- a/app/models/budget/phase.rb +++ b/app/models/budget/phase.rb @@ -1,7 +1,7 @@ class Budget class Phase < ApplicationRecord PHASE_KINDS = %w[informing accepting reviewing selecting valuating publishing_prices balloting - reviewing_ballots finished].freeze + reviewing_ballots finished].freeze PUBLISHED_PRICES_PHASES = %w[publishing_prices balloting reviewing_ballots finished].freeze DESCRIPTION_MAX_LENGTH = 2000 diff --git a/app/models/comment.rb b/app/models/comment.rb index e1a348bfa..a3304e34e 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -6,8 +6,8 @@ class Comment < ApplicationRecord include Searchable COMMENTABLE_TYPES = %w[Debate Proposal Budget::Investment Poll Topic - Legislation::Question Legislation::Annotation - Legislation::Proposal].freeze + Legislation::Question Legislation::Annotation + Legislation::Proposal].freeze acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases diff --git a/app/models/concerns/statisticable.rb b/app/models/concerns/statisticable.rb index 790b01b3e..9b32b22b3 100644 --- a/app/models/concerns/statisticable.rb +++ b/app/models/concerns/statisticable.rb @@ -163,8 +163,7 @@ module Statisticable [75, 79], [80, 84], [85, 89], - [90, 300] - ] + [90, 300]] end def participants_between_ages(from, to) diff --git a/config/application.rb b/config/application.rb index 9391b39fa..268880a5c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -97,7 +97,8 @@ module Consul "uk-UA", "val", "zh-CN", - "zh-TW"] + "zh-TW" + ] config.i18n.available_locales = available_locales config.i18n.fallbacks = [I18n.default_locale, { "ca" => "es", diff --git a/spec/lib/tasks/seed_spec.rb b/spec/lib/tasks/seed_spec.rb index c7cad5ff0..c3e16b75d 100644 --- a/spec/lib/tasks/seed_spec.rb +++ b/spec/lib/tasks/seed_spec.rb @@ -5,8 +5,8 @@ describe "rake db:seed" do default_locales = I18n.available_locales begin I18n.available_locales = [:ar, :bg, :bs, :ca, :cs, :da, :de, :el, :en, :es, :"es-PE", :eu, :fa, :fr, - :gl, :he, :hr, :id, :it, :ka, :nl, :oc, :pl, :"pt-BR", - :ro, :ru, :sl, :sq, :so, :sr, :sv, :tr, :val, :"zh-CN", :"zh-TW"] + :gl, :he, :hr, :id, :it, :ka, :nl, :oc, :pl, :"pt-BR", + :ro, :ru, :sl, :sq, :so, :sr, :sv, :tr, :val, :"zh-CN", :"zh-TW"] SiteCustomization::Page.destroy_all load Rails.root.join("db", "pages.rb") diff --git a/spec/models/local_census_records/import_spec.rb b/spec/models/local_census_records/import_spec.rb index 7a97f0df5..b763c13c7 100644 --- a/spec/models/local_census_records/import_spec.rb +++ b/spec/models/local_census_records/import_spec.rb @@ -72,7 +72,7 @@ describe LocalCensusRecords::Import do invalid_records_document_types = [nil, "1", "2", "3", "DNI"] invalid_records_document_numbers = ["44556678T", nil, "22556678T", "X11556678", "Z11556678"] invalid_records_date_of_births = [Date.parse("07/08/1984"), Date.parse("07/08/1985"), nil, - Date.parse("07/08/1987"), Date.parse("07/08/1987")] + Date.parse("07/08/1987"), Date.parse("07/08/1987")] invalid_records_postal_codes = ["7008", "7009", "7010", nil, "7011"] expect(import.invalid_records.map(&:document_type)) .to eq(invalid_records_document_types)