Apply Style/Proc rubocop rule

While I tend to use `Proc.new`, using `proc` is shorter and more
consistent since we also use `lambda`.
This commit is contained in:
Javi Martín
2019-10-26 13:15:36 +02:00
parent 69c01df63e
commit ddb37f89ae
4 changed files with 6 additions and 3 deletions

View File

@@ -403,6 +403,9 @@ Style/OrAssignment:
Style/PercentLiteralDelimiters:
Enabled: true
Style/Proc:
Enabled: true
Style/RedundantFreeze:
Enabled: true

View File

@@ -1,6 +1,6 @@
class ApplicationMailer < ActionMailer::Base
helper :settings
helper :application
default from: Proc.new { "#{Setting["mailer_from_name"]} <#{Setting["mailer_from_address"]}>" }
default from: proc { "#{Setting["mailer_from_name"]} <#{Setting["mailer_from_address"]}>" }
layout "mailer"
end

View File

@@ -26,7 +26,7 @@ class Poll::Question < ApplicationRecord
validates_translation :title, presence: true, length: { minimum: 4 }
validates :author, presence: true
validates :poll_id, presence: true, if: Proc.new { |question| question.poll.nil? }
validates :poll_id, presence: true, if: proc { |question| question.poll.nil? }
validates_associated :votation_type
accepts_nested_attributes_for :question_answers, reject_if: :all_blank, allow_destroy: true

View File

@@ -12,7 +12,7 @@ Devise.setup do |config|
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class
# with default "from" parameter.
config.mailer_sender = Proc.new { "'#{Setting["mailer_from_name"]}' <#{Setting["mailer_from_address"]}>" }
config.mailer_sender = proc { "'#{Setting["mailer_from_name"]}' <#{Setting["mailer_from_address"]}>" }
# Configure the class responsible to send e-mails.
config.mailer = "DeviseMailer"