diff --git a/.rubocop.yml b/.rubocop.yml index 3d8fd0b90..497e45bbe 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,3 +2,6 @@ inherit_from: .rubocop_todo.yml Style/Alias: EnforcedStyle: prefer_alias_method + +Style/FrozenStringLiteralComment: + Enabled: false diff --git a/app/controllers/admin/blocked_domains_controller.rb b/app/controllers/admin/blocked_domains_controller.rb index d9227d773..bf5359b82 100644 --- a/app/controllers/admin/blocked_domains_controller.rb +++ b/app/controllers/admin/blocked_domains_controller.rb @@ -3,13 +3,11 @@ module Admin load_and_authorize_resource def index - params[:q] ||= {} domains = BlockedDomain.all.order(:name) @q = domains.search(params[:q]) @domains = @q.result.page(params[:page]) - @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 - + @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end def new diff --git a/app/controllers/admin/contact_versions_controller.rb b/app/controllers/admin/contact_versions_controller.rb index e64a86774..834353cf4 100644 --- a/app/controllers/admin/contact_versions_controller.rb +++ b/app/controllers/admin/contact_versions_controller.rb @@ -26,7 +26,7 @@ module Admin versions = ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) @q = versions.search(params[:q]) @versions = @q.result.page(params[:page]) - @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 + @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb index 6402d09ae..b53d366ab 100644 --- a/app/controllers/admin/contacts_controller.rb +++ b/app/controllers/admin/contacts_controller.rb @@ -22,7 +22,7 @@ module Admin @contacts = @q.result.uniq.page(params[:page]) end - @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 + @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end def search diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb index 2585ab894..b6245f6ea 100644 --- a/app/controllers/admin/domain_versions_controller.rb +++ b/app/controllers/admin/domain_versions_controller.rb @@ -43,7 +43,7 @@ module Admin versions = DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc) @q = versions.search(params[:q]) @versions = @q.result.page(params[:page]) - @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 + @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? render "admin/domain_versions/archive" end diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 576b5f8e1..71d49a2ab 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -32,7 +32,7 @@ module Admin end end - @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 + @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end # rubocop: enable Metrics/PerceivedComplexity diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index 9b97d0903..39bf06152 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -13,7 +13,7 @@ module Admin @deposit = Deposit.new(deposit_params.merge(registrar: r)) @invoice = @deposit.issue_prepayment_invoice - if @invoice && @invoice.persisted? + if @invoice&.persisted? flash[:notice] = t(:record_created) redirect_to [:admin, @invoice] else diff --git a/app/controllers/admin/reserved_domains_controller.rb b/app/controllers/admin/reserved_domains_controller.rb index 52a74f345..78d752866 100644 --- a/app/controllers/admin/reserved_domains_controller.rb +++ b/app/controllers/admin/reserved_domains_controller.rb @@ -4,13 +4,11 @@ module Admin before_action :set_domain, only: [:edit, :update] def index - params[:q] ||= {} domains = ReservedDomain.all.order(:name) @q = domains.search(params[:q]) @domains = @q.result.page(params[:page]) - @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 - + @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end def new diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 36bdcd6cc..3eba05777 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -168,7 +168,7 @@ class EppController < ApplicationController # validate legal document's type here because it may be in most of the requests @prefix = nil - if element_count('extdata > legalDocument') > 0 + if element_count('extdata > legalDocument').positive? requires_attribute('extdata > legalDocument', 'type', values: LegalDocument::TYPES, policy: true) end @@ -279,7 +279,7 @@ class EppController < ApplicationController def optional(selector, *validations) full_selector = [@prefix, selector].compact.join(' ') el = params[:parsed_frame].css(full_selector).first - return unless el && el.text.present? + return unless el&.text.present? value = el.text validations.each do |x| diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb index 7cde44a86..0e2f6eeaf 100644 --- a/app/controllers/registrant/domains_controller.rb +++ b/app/controllers/registrant/domains_controller.rb @@ -6,7 +6,7 @@ class Registrant::DomainsController < RegistrantController @q = domains.search(params[:q]) @domains = @q.result.page(params[:page]) end - @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 + @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end def show diff --git a/app/controllers/registrar/contacts_controller.rb b/app/controllers/registrar/contacts_controller.rb index f5f527e1f..cb059641e 100644 --- a/app/controllers/registrar/contacts_controller.rb +++ b/app/controllers/registrar/contacts_controller.rb @@ -33,7 +33,7 @@ class Registrar @contacts = @q.result(distinct: :true).page(params[:page]) end - @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 + @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? end def download_list diff --git a/app/controllers/registrar/deposits_controller.rb b/app/controllers/registrar/deposits_controller.rb index 856b22553..ec6d13977 100644 --- a/app/controllers/registrar/deposits_controller.rb +++ b/app/controllers/registrar/deposits_controller.rb @@ -10,7 +10,7 @@ class Registrar @deposit = Deposit.new(deposit_params.merge(registrar: current_user.registrar)) @invoice = @deposit.issue_prepayment_invoice - if @invoice && @invoice.persisted? + if @invoice&.persisted? flash[:notice] = t(:please_pay_the_following_invoice) redirect_to [:registrar, @invoice] else diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb index b85923a02..774ec2e44 100644 --- a/app/controllers/registrar/domains_controller.rb +++ b/app/controllers/registrar/domains_controller.rb @@ -40,7 +40,7 @@ class Registrar end end - @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0 + @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? respond_to do |format| format.html diff --git a/app/models/ability.rb b/app/models/ability.rb index 3883bbabf..6083d700f 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -13,9 +13,9 @@ class Ability case @user.class.to_s when 'AdminUser' - @user.roles.each { |role| send(role) } if @user.roles + @user.roles&.each { |role| send(role) } when 'ApiUser' - @user.roles.each { |role| send(role) } if @user.roles + @user.roles&.each { |role| send(role) } when 'RegistrantUser' static_registrant end diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb index b280ceea6..699c07ab0 100644 --- a/app/models/epp/contact.rb +++ b/app/models/epp/contact.rb @@ -147,7 +147,7 @@ class Epp::Contact < Contact end if doc = attach_legal_document(Epp::Domain.parse_legal_document_from_frame(frame)) - frame.css("legalDocument").first.content = doc.path if doc && doc.persisted? + frame.css("legalDocument").first.content = doc.path if doc&.persisted? self.legal_document_id = doc.id end @@ -238,7 +238,7 @@ class Epp::Contact < Contact ) self.legal_documents = [doc] - frame.css("legalDocument").first.content = doc.path if doc && doc.persisted? + frame.css("legalDocument").first.content = doc.path if doc&.persisted? self.legal_document_id = doc.id end diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 4e0e7d44c..dcf61ddcf 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -197,7 +197,7 @@ class Epp::Domain < Domain ) self.legal_documents = [doc] - frame.css("legalDocument").first.content = doc.path if doc && doc.persisted? + frame.css("legalDocument").first.content = doc.path if doc&.persisted? self.legal_document_id = doc.id end # rubocop: enable Metrics/PerceivedComplexity @@ -472,7 +472,7 @@ class Epp::Domain < Domain at.deep_merge!(attrs_from(frame.css('rem'), current_user, 'rem')) if doc = attach_legal_document(Epp::Domain.parse_legal_document_from_frame(frame)) - frame.css("legalDocument").first.content = doc.path if doc && doc.persisted? + frame.css("legalDocument").first.content = doc.path if doc&.persisted? self.legal_document_id = doc.id end @@ -547,7 +547,7 @@ class Epp::Domain < Domain check_discarded if doc = attach_legal_document(Epp::Domain.parse_legal_document_from_frame(frame)) - frame.css("legalDocument").first.content = doc.path if doc && doc.persisted? + frame.css("legalDocument").first.content = doc.path if doc&.persisted? end if Setting.request_confirmation_on_domain_deletion_enabled && diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb index 49939087c..26db4dda9 100644 --- a/app/validators/domain_name_validator.rb +++ b/app/validators/domain_name_validator.rb @@ -37,7 +37,7 @@ class DomainNameValidator < ActiveModel::EachValidator def validate_blocked(value) return true unless value - return false if BlockedDomain.where(name: value).count > 0 + return false if BlockedDomain.where(name: value).count.positive? DNS::Zone.where(origin: value).count.zero? end end diff --git a/app/views/epp/domains/info.xml.builder b/app/views/epp/domains/info.xml.builder index 2d10f8baf..850334955 100644 --- a/app/views/epp/domains/info.xml.builder +++ b/app/views/epp/domains/info.xml.builder @@ -22,7 +22,7 @@ xml.epp_head do xml.tag!('domain:contact', ac.code, 'type' => 'admin') end - if @nameservers && @nameservers.any? + if @nameservers&.any? xml.tag!('domain:ns') do @nameservers.each do |x| xml.tag!('domain:hostAttr') do