diff --git a/.rubocop.yml b/.rubocop.yml index 7b50034aa..218cdc615 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -141,9 +141,6 @@ Rails/Output: Rails/OutputSafety: Enabled: true -Rails/Presence: - Enabled: true - Rails/Present: Enabled: true diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml index 081bc2be0..6ea9cd9f3 100644 --- a/.rubocop_basic.yml +++ b/.rubocop_basic.yml @@ -132,6 +132,9 @@ Rails/HttpPositionalArguments: Rails/PluralizationGrammar: Enabled: true +Rails/Presence: + Enabled: true + Rails/RelativeDateConstant: Enabled: true diff --git a/app/controllers/polls/answers_controller.rb b/app/controllers/polls/answers_controller.rb index 61b3b33d3..c8b0081f2 100644 --- a/app/controllers/polls/answers_controller.rb +++ b/app/controllers/polls/answers_controller.rb @@ -51,7 +51,7 @@ class Polls::AnswersController < ApplicationController end def load_for_answers - @page = params[:page].present? ? params[:page] : 1 + @page = params[:page].presence || 1 question_answers @answers_by_question_id = { @question.id => @question.answers .by_author(current_user) diff --git a/app/controllers/polls/questions_controller.rb b/app/controllers/polls/questions_controller.rb index d1ad187da..675c6ffa5 100644 --- a/app/controllers/polls/questions_controller.rb +++ b/app/controllers/polls/questions_controller.rb @@ -37,7 +37,7 @@ class Polls::QuestionsController < ApplicationController private def load_for_answers - @page = params[:page].present? ? params[:page] : 1 + @page = params[:page].presence || 1 question_answers @answers_by_question_id = { @question.id => @question.answers .by_author(current_user) diff --git a/app/helpers/banners_helper.rb b/app/helpers/banners_helper.rb index 20f7ab93d..59cd07c1a 100644 --- a/app/helpers/banners_helper.rb +++ b/app/helpers/banners_helper.rb @@ -13,11 +13,11 @@ module BannersHelper end def banner_bg_color_or_default - @banner.background_color.present? ? @banner.background_color : banner_default_bg_color + @banner.background_color.presence || banner_default_bg_color end def banner_font_color_or_default - @banner.font_color.present? ? @banner.font_color : banner_default_font_color + @banner.font_color.presence || banner_default_font_color end end diff --git a/app/helpers/legislation_helper.rb b/app/helpers/legislation_helper.rb index 943f1b35d..5dd916571 100644 --- a/app/helpers/legislation_helper.rb +++ b/app/helpers/legislation_helper.rb @@ -35,11 +35,11 @@ module LegislationHelper end def bg_color_or_default - @process.background_color.present? ? @process.background_color : default_bg_color + @process.background_color.presence || default_bg_color end def font_color_or_default - @process.font_color.present? ? @process.font_color : default_font_color + @process.font_color.presence || default_font_color end def css_for_process_header diff --git a/app/models/legislation/people_proposal.rb b/app/models/legislation/people_proposal.rb index 69696bb05..b85b197d7 100644 --- a/app/models/legislation/people_proposal.rb +++ b/app/models/legislation/people_proposal.rb @@ -65,7 +65,7 @@ class Legislation::PeopleProposal < ApplicationRecord def self.search(terms) by_code = search_by_code(terms.strip) - by_code.present? ? by_code : pg_search(terms) + by_code.presence || pg_search(terms) end def self.search_by_code(terms) diff --git a/app/models/legislation/proposal.rb b/app/models/legislation/proposal.rb index aa8a686b7..44becffc8 100644 --- a/app/models/legislation/proposal.rb +++ b/app/models/legislation/proposal.rb @@ -66,7 +66,7 @@ class Legislation::Proposal < ApplicationRecord def self.search(terms) by_code = search_by_code(terms.strip) - by_code.present? ? by_code : pg_search(terms) + by_code.presence || pg_search(terms) end def self.search_by_code(terms) diff --git a/app/models/proposal.rb b/app/models/proposal.rb index 4ef4b2638..a4d9d10eb 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -141,7 +141,7 @@ class Proposal < ApplicationRecord def self.search(terms) by_code = search_by_code(terms.strip) - by_code.present? ? by_code : pg_search(terms) + by_code.presence || pg_search(terms) end def self.search_by_code(terms) diff --git a/app/models/tracker.rb b/app/models/tracker.rb index d5f5c4fa2..81f3d8021 100644 --- a/app/models/tracker.rb +++ b/app/models/tracker.rb @@ -9,11 +9,11 @@ class Tracker < ApplicationRecord validates :user_id, presence: true, uniqueness: true def description_or_email - description.present? ? description : email + description.presence || email end def description_or_name - description.present? ? description : name + description.presence || name end def assigned_investment_ids diff --git a/app/models/valuator.rb b/app/models/valuator.rb index 985984a78..372dacc01 100644 --- a/app/models/valuator.rb +++ b/app/models/valuator.rb @@ -10,11 +10,11 @@ class Valuator < ApplicationRecord validates :user_id, presence: true, uniqueness: true def description_or_email - description.present? ? description : email + description.presence || email end def description_or_name - description.present? ? description : name + description.presence || name end def assigned_investment_ids diff --git a/config/initializers/i18n_translation.rb b/config/initializers/i18n_translation.rb index 702c2f5e3..fb23270cd 100644 --- a/config/initializers/i18n_translation.rb +++ b/config/initializers/i18n_translation.rb @@ -7,16 +7,12 @@ module ActionView include TagHelper def t(key, options = {}) - current_locale = options[:locale].present? ? options[:locale] : I18n.locale + current_locale = options[:locale].presence || I18n.locale i18_content = I18nContent.by_key(key).first translation = I18nContentTranslation.where(i18n_content_id: i18_content&.id, locale: current_locale).first&.value - if translation.present? - translation - else - translate(key, options) - end + translation.presence || translate(key, options) end end end diff --git a/lib/remote_translations/microsoft/sentences_parser.rb b/lib/remote_translations/microsoft/sentences_parser.rb index d6f026288..bdf0e446d 100644 --- a/lib/remote_translations/microsoft/sentences_parser.rb +++ b/lib/remote_translations/microsoft/sentences_parser.rb @@ -12,7 +12,7 @@ module RemoteTranslations::Microsoft::SentencesParser def get_split_position(valid_point, valid_whitespace, minimum_valid_index) split_position = minimum_valid_index if valid_point.present? || valid_whitespace.present? - valid_position = valid_point.present? ? valid_point : valid_whitespace + valid_position = valid_point.presence || valid_whitespace split_position = split_position + valid_position end split_position