bundle exec rubocop -A

aaronskiba · aaronskiba · commit a1038916fa9f · 2025-10-07T14:18:06.000-06:00
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -15,6 +15,7 @@ class ApplicationController < ActionController::Base
 
   include GlobalHelpers
   include Pundit::Authorization
+
   helper_method GlobalHelpers.instance_methods
 
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
diff --git a/app/controllers/concerns/paginable.rb b/app/controllers/concerns/paginable.rb
@@ -4,6 +4,7 @@
 # rubocop:disable Metrics/ModuleLength
 module Paginable
   extend ActiveSupport::Concern
+
   require 'sort_direction'
 
   ##
diff --git a/app/controllers/contributors_controller.rb b/app/controllers/contributors_controller.rb
@@ -3,6 +3,7 @@
 # Controller for the Contributors page
 class ContributorsController < ApplicationController
   include OrgSelectable
+
   helper PaginableHelper
 
   before_action :fetch_plan
diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
@@ -3,6 +3,7 @@
 # Controller for the Comments section of the Write Plan page
 class NotesController < ApplicationController
   include ConditionalUserMailer
+
   after_action :verify_authorized
   respond_to :html
 
diff --git a/app/controllers/org_admin/sections_controller.rb b/app/controllers/org_admin/sections_controller.rb
@@ -14,8 +14,8 @@ def index
       authorize Section.new
       phase = Phase.includes(:template, :sections).find(params[:phase_id])
       edit = phase.template.latest? &&
-             (current_user.can_modify_templates? &&
-             (phase.template.org_id == current_user.org_id))
+             current_user.can_modify_templates? &&
+             (phase.template.org_id == current_user.org_id)
       render partial: 'index',
              locals: {
                template: phase.template,
diff --git a/app/controllers/org_admin/template_customizations_controller.rb b/app/controllers/org_admin/template_customizations_controller.rb
@@ -5,6 +5,7 @@ module OrgAdmin
   class TemplateCustomizationsController < ApplicationController
     include Paginable
     include Versionable
+
     after_action :verify_authorized
 
     # POST /org_admin/templates/:id/customize
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
@@ -3,6 +3,7 @@
 # Controller that handles adding/updating/removing collaborators from a plan
 class RolesController < ApplicationController
   include ConditionalUserMailer
+
   respond_to :html
 
   after_action :verify_authorized
@@ -30,8 +31,7 @@ def create
         user = User.where_case_insensitive('email', role_params[:user][:email]).first
         if user.present? &&
            Role.where(plan: @role.plan, user: user, active: true)
-               .count
-               .positive? # role already exists
+               .any? # role already exists
 
           flash[:notice] = format(_('Plan is already shared with %{email}.'),
                                   email: role_params[:user][:email])
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -5,6 +5,7 @@ class UsersController < ApplicationController
   helper PaginableHelper
   helper PermsHelper
   include ConditionalUserMailer
+
   after_action :verify_authorized
   respond_to :html
 
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
@@ -5,6 +5,7 @@ class UserMailer < ActionMailer::Base
   prepend_view_path 'app/views/branded/'
 
   include MailerHelper
+
   helper MailerHelper
   helper FeedbacksHelper
 
diff --git a/app/models/identifier.rb b/app/models/identifier.rb
@@ -61,7 +61,7 @@ def self.by_scheme_name(scheme, identifiable_type)
   # Ensure that the value of attrs is a hash
   # TODO: evaluate this vs the Serialize approach in condition.rb
   def attrs=(hash)
-    super(hash.is_a?(Hash) ? hash.to_json.to_s : '{}')
+    super(hash.is_a?(Hash) ? hash.to_json : '{}')
   end
 
   # Appends the identifier scheme's prefix to the identifier if necessary
diff --git a/app/models/org.rb b/app/models/org.rb
@@ -38,6 +38,7 @@ class Org < ApplicationRecord
   include Identifiable
 
   extend Dragonfly::Model::Validations
+
   validates_with OrgLinksValidator
 
   LOGO_FORMATS = %w[jpeg png gif jpg bmp].freeze
diff --git a/app/models/template.rb b/app/models/template.rb
@@ -457,12 +457,12 @@ def publishability
       publishable = false
       # all phases must have atleast 1 section
     end
-    unless phases.map { |p| p.sections.count.positive? }.reduce(true) { |fin, val| fin && val }
+    unless phases.map { |p| p.sections.any? }.reduce(true) { |fin, val| fin && val }
       error += _('You can not publish a template without sections in a phase.  ')
       publishable = false
       # all sections must have atleast one question
     end
-    unless sections.map { |s| s.questions.count.positive? }.reduce(true) { |fin, val| fin && val }
+    unless sections.map { |s| s.questions.any? }.reduce(true) { |fin, val| fin && val }
       error += _('You can not publish a template without questions in a section.  ')
       publishable = false
     end
diff --git a/app/policies/token_permission_type_policy.rb b/app/policies/token_permission_type_policy.rb
@@ -6,6 +6,6 @@ class TokenPermissionTypePolicy < ApplicationPolicy
   # NOTE: @user is the signed_in_user
 
   def index?
-    @user.can_use_api? && @user.org.token_permission_types.count.positive?
+    @user.can_use_api? && @user.org.token_permission_types.any?
   end
 end
diff --git a/spec/controllers/usage_controller_spec.rb b/spec/controllers/usage_controller_spec.rb
@@ -52,7 +52,7 @@
           it 'returns the expected data' do
             # Controller returns results in date ascending order so resort the
             # records after extracting the ones we want first
-            expected = @annual[0..months - 1].sort_by(&:date).map { |stat| obj_to_hash(obj: stat) }
+            expected = @annual[0..(months - 1)].sort_by(&:date).map { |stat| obj_to_hash(obj: stat) }
             expect(assigns(:plans_per_month)).to eql(expected.flatten)
           end
         end
diff --git a/spec/factories/contributors.rb b/spec/factories/contributors.rb
@@ -37,7 +37,7 @@
     end
 
     before(:create) do |contributor, evaluator|
-      (0..evaluator.roles_count - 1).each do |idx|
+      (0..(evaluator.roles_count - 1)).each do |idx|
         contributor.send(:"#{contributor.all_roles[idx]}=", true)
       end
     end
diff --git a/spec/factories/identifier_schemes.rb b/spec/factories/identifier_schemes.rb
@@ -28,7 +28,7 @@
     end
 
     after(:create) do |identifier_scheme, evaluator|
-      (0..evaluator.context_count - 1).each do |idx|
+      (0..(evaluator.context_count - 1)).each do |idx|
         identifier_scheme.update("#{identifier_scheme.all_context[idx]}": true)
       end
     end
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
@@ -86,14 +86,14 @@
         expect(results.include?(@by_facet)).to eql(true)
       end
       it 'returns repositories with subjects like the search term' do
-        results = described_class.search(@by_subject.name[1..@by_subject.name.length - 1])
+        results = described_class.search(@by_subject.name[1..(@by_subject.name.length - 1)])
         expect(results.include?(@never_found)).to eql(false)
         expect(results.include?(@by_type)).to eql(false)
         expect(results.include?(@by_subject)).to eql(true)
       end
       it 'returns repositories with name like the search term' do
         repo = create(:repository, name: [Faker::Lorem.word, @by_subject.name].join(' '))
-        results = described_class.search(@by_subject.name[1..@by_subject.name.length - 1])
+        results = described_class.search(@by_subject.name[1..(@by_subject.name.length - 1)])
         expect(results.include?(@never_found)).to eql(false)
         expect(results.include?(repo)).to eql(true)
       end
