Merge branch 'master' into registry-662

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

app/controllers/admin/contact_versions_controller.rb

@@ -1,5 +1,7 @@
 module Admin
   class ContactVersionsController < BaseController
+    include ObjectVersionsHelper
+
     load_and_authorize_resource
 
     def index
@@ -24,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
 

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

app/controllers/admin/domain_versions_controller.rb

@@ -1,5 +1,7 @@
 module Admin
   class DomainVersionsController < BaseController
+    include ObjectVersionsHelper
+
     load_and_authorize_resource
 
     def index
@@ -41,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

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

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

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

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|

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

app/controllers/registrant/whois_controller.rb

@@ -1,3 +1,5 @@
+# As non-GDPR compliant, this controller is deprecated. Needs to be replaced with one that relies
+# on the REST WHOIS API.
 class Registrant::WhoisController < RegistrantController
   def index
     authorize! :view, :registrant_whois

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

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

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