Apply Rails/Presence rubocop rule

This commit is contained in:
Javi Martín
2019-06-22 22:03:46 +02:00
parent adc5906253
commit a5ba13b599
13 changed files with 19 additions and 23 deletions

View File

@@ -141,9 +141,6 @@ Rails/Output:
Rails/OutputSafety: Rails/OutputSafety:
Enabled: true Enabled: true
Rails/Presence:
Enabled: true
Rails/Present: Rails/Present:
Enabled: true Enabled: true

View File

@@ -132,6 +132,9 @@ Rails/HttpPositionalArguments:
Rails/PluralizationGrammar: Rails/PluralizationGrammar:
Enabled: true Enabled: true
Rails/Presence:
Enabled: true
Rails/RelativeDateConstant: Rails/RelativeDateConstant:
Enabled: true Enabled: true

View File

@@ -51,7 +51,7 @@ class Polls::AnswersController < ApplicationController
end end
def load_for_answers def load_for_answers
@page = params[:page].present? ? params[:page] : 1 @page = params[:page].presence || 1
question_answers question_answers
@answers_by_question_id = { @question.id => @question.answers @answers_by_question_id = { @question.id => @question.answers
.by_author(current_user) .by_author(current_user)

View File

@@ -37,7 +37,7 @@ class Polls::QuestionsController < ApplicationController
private private
def load_for_answers def load_for_answers
@page = params[:page].present? ? params[:page] : 1 @page = params[:page].presence || 1
question_answers question_answers
@answers_by_question_id = { @question.id => @question.answers @answers_by_question_id = { @question.id => @question.answers
.by_author(current_user) .by_author(current_user)

View File

@@ -13,11 +13,11 @@ module BannersHelper
end end
def banner_bg_color_or_default 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 end
def banner_font_color_or_default 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
end end

View File

@@ -35,11 +35,11 @@ module LegislationHelper
end end
def bg_color_or_default def bg_color_or_default
@process.background_color.present? ? @process.background_color : default_bg_color @process.background_color.presence || default_bg_color
end end
def font_color_or_default def font_color_or_default
@process.font_color.present? ? @process.font_color : default_font_color @process.font_color.presence || default_font_color
end end
def css_for_process_header def css_for_process_header

View File

@@ -65,7 +65,7 @@ class Legislation::PeopleProposal < ApplicationRecord
def self.search(terms) def self.search(terms)
by_code = search_by_code(terms.strip) by_code = search_by_code(terms.strip)
by_code.present? ? by_code : pg_search(terms) by_code.presence || pg_search(terms)
end end
def self.search_by_code(terms) def self.search_by_code(terms)

View File

@@ -66,7 +66,7 @@ class Legislation::Proposal < ApplicationRecord
def self.search(terms) def self.search(terms)
by_code = search_by_code(terms.strip) by_code = search_by_code(terms.strip)
by_code.present? ? by_code : pg_search(terms) by_code.presence || pg_search(terms)
end end
def self.search_by_code(terms) def self.search_by_code(terms)

View File

@@ -141,7 +141,7 @@ class Proposal < ApplicationRecord
def self.search(terms) def self.search(terms)
by_code = search_by_code(terms.strip) by_code = search_by_code(terms.strip)
by_code.present? ? by_code : pg_search(terms) by_code.presence || pg_search(terms)
end end
def self.search_by_code(terms) def self.search_by_code(terms)

View File

@@ -9,11 +9,11 @@ class Tracker < ApplicationRecord
validates :user_id, presence: true, uniqueness: true validates :user_id, presence: true, uniqueness: true
def description_or_email def description_or_email
description.present? ? description : email description.presence || email
end end
def description_or_name def description_or_name
description.present? ? description : name description.presence || name
end end
def assigned_investment_ids def assigned_investment_ids

View File

@@ -10,11 +10,11 @@ class Valuator < ApplicationRecord
validates :user_id, presence: true, uniqueness: true validates :user_id, presence: true, uniqueness: true
def description_or_email def description_or_email
description.present? ? description : email description.presence || email
end end
def description_or_name def description_or_name
description.present? ? description : name description.presence || name
end end
def assigned_investment_ids def assigned_investment_ids

View File

@@ -7,16 +7,12 @@ module ActionView
include TagHelper include TagHelper
def t(key, options = {}) 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 i18_content = I18nContent.by_key(key).first
translation = I18nContentTranslation.where(i18n_content_id: i18_content&.id, translation = I18nContentTranslation.where(i18n_content_id: i18_content&.id,
locale: current_locale).first&.value locale: current_locale).first&.value
if translation.present? translation.presence || translate(key, options)
translation
else
translate(key, options)
end
end end
end end
end end

View File

@@ -12,7 +12,7 @@ module RemoteTranslations::Microsoft::SentencesParser
def get_split_position(valid_point, valid_whitespace, minimum_valid_index) def get_split_position(valid_point, valid_whitespace, minimum_valid_index)
split_position = minimum_valid_index split_position = minimum_valid_index
if valid_point.present? || valid_whitespace.present? 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 split_position = split_position + valid_position
end end
split_position split_position