Browse Source

Maintenance: Activated rubocop Style/MethodCallWithoutArgsParentheses.

Thorsten Eckel 3 years ago
parent
commit
5243efbc25

+ 0 - 5
.rubocop/default.yml

@@ -91,11 +91,6 @@ Layout/LeadingCommentSpace:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-space'
   Enabled: false
 
-Style/MethodCallWithoutArgsParentheses:
-  Description: 'Do not use parentheses for method calls with no arguments.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
-  Enabled: false
-
 Layout/SpaceInsideReferenceBrackets:
   Description: 'Checks the spacing inside referential brackets.'
   Enabled: false

+ 1 - 1
app/controllers/application_controller/renders_models.rb

@@ -75,7 +75,7 @@ module ApplicationController::RendersModels
   def model_destroy_render(object, params)
     generic_object = object.find(params[:id])
     generic_object.destroy!
-    model_destroy_render_item()
+    model_destroy_render_item
   end
 
   def model_destroy_render_item()

+ 1 - 1
app/controllers/packages_controller.rb

@@ -5,7 +5,7 @@ class PackagesController < ApplicationController
 
   # GET /api/v1/packages
   def index
-    packages = Package.all().order('name')
+    packages = Package.all.order('name')
     render json: {
       packages: packages
     }

+ 1 - 1
app/jobs/communicate_telegram_job.rb

@@ -31,7 +31,7 @@ class CommunicateTelegramJob < ApplicationJob
       api = TelegramAPI.new(channel.options[:api_token])
       chat_id = ticket.preferences[:telegram][:chat_id]
       result = api.sendMessage(chat_id, article.body)
-      me = api.getMe()
+      me = api.getMe
       article.attachments.each do |file|
         parts = file.filename.split(%r{^(.*)(\..+?)$})
         t = Tempfile.new([parts[1], parts[2]])

+ 4 - 4
app/models/channel/driver/imap.rb

@@ -118,7 +118,7 @@ example
     timeout(check_type_timeout) do
       @imap = ::Net::IMAP.new(options[:host], port, ssl, nil, false)
       if starttls
-        @imap.starttls()
+        @imap.starttls
       end
     end
 
@@ -232,7 +232,7 @@ example
         Rails.logger.info " - verify email #{verify_string} found"
         timeout(600) do
           @imap.store(message_id, '+FLAGS', [:Deleted])
-          @imap.expunge()
+          @imap.expunge
         end
         disconnect
         return {
@@ -339,7 +339,7 @@ example
     if !keep_on_server
       begin
         timeout(EXPUNGE_TIMEOUT) do
-          @imap.expunge()
+          @imap.expunge
         end
       rescue Timeout::Error => e
         Rails.logger.error "Unable to expunge server (#{options[:host]}/#{options[:user]}): #{e.inspect}"
@@ -382,7 +382,7 @@ example
     return if !@imap
 
     timeout(1.minute) do
-      @imap.disconnect()
+      @imap.disconnect
     end
   end
 

+ 6 - 6
app/models/role.rb

@@ -118,7 +118,7 @@ returns
     permission_ids = Role.permission_ids_by_name(keys)
     Role.joins(:permissions_roles).joins(:permissions).where(
       'permissions_roles.permission_id IN (?) AND roles.active = ? AND permissions.active = ?', permission_ids, true, true
-    ).distinct()
+    ).distinct
   end
 
 =begin
@@ -142,7 +142,7 @@ returns
     permission_ids = Role.permission_ids_by_name(keys)
     return true if Role.joins(:permissions_roles).joins(:permissions).where(
       'roles.id = ? AND permissions_roles.permission_id IN (?) AND permissions.active = ?', id, permission_ids, true
-    ).distinct().count.nonzero?
+    ).distinct.count.nonzero?
 
     false
   end
@@ -192,7 +192,7 @@ returns
 
   def last_admin_check_admin_count
     admin_role_ids = Role.joins(:permissions).where(permissions: { name: ['admin', 'admin.user'], active: true }, roles: { active: true }).where.not(id: id).pluck(:id)
-    User.joins(:roles).where(roles: { id: admin_role_ids }, users: { active: true }).distinct().count
+    User.joins(:roles).where(roles: { id: admin_role_ids }, users: { active: true }).distinct.count
   end
 
   def validate_agent_limit_by_attributes
@@ -202,8 +202,8 @@ returns
     return true if !with_permission?('ticket.agent')
 
     ticket_agent_role_ids = Role.joins(:permissions).where(permissions: { name: 'ticket.agent', active: true }, roles: { active: true }).pluck(:id)
-    currents = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct().pluck(:id)
-    news = User.joins(:roles).where(roles: { id: id }, users: { active: true }).distinct().pluck(:id)
+    currents = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct.pluck(:id)
+    news = User.joins(:roles).where(roles: { id: id }, users: { active: true }).distinct.pluck(:id)
     count = currents.concat(news).uniq.count
     raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit').to_i
 
@@ -218,7 +218,7 @@ returns
 
     ticket_agent_role_ids = Role.joins(:permissions).where(permissions: { name: 'ticket.agent' }, roles: { active: true }).pluck(:id)
     ticket_agent_role_ids.push(id)
-    count = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct().count
+    count = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct.count
     raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit').to_i
 
     true

+ 1 - 1
app/models/scheduler.rb

@@ -288,7 +288,7 @@ class Scheduler < ApplicationModel
     )
 
     logger.info "execute #{job.method} (try_count #{try_count})..."
-    eval job.method() # rubocop:disable Security/Eval
+    eval job.method # rubocop:disable Security/Eval
     took = Time.zone.now - started_at
     logger.info "ended #{job.method} took: #{took} seconds."
   rescue => e

+ 4 - 4
app/models/user.rb

@@ -459,7 +459,7 @@ returns
       end
       next if permission_ids.blank?
 
-      Role.joins(:permissions_roles).joins(:permissions).where('permissions_roles.permission_id IN (?) AND roles.active = ? AND permissions.active = ?', permission_ids, true, true).distinct().pluck(:id).each do |role_id|
+      Role.joins(:permissions_roles).joins(:permissions).where('permissions_roles.permission_id IN (?) AND roles.active = ? AND permissions.active = ?', permission_ids, true, true).distinct.pluck(:id).each do |role_id|
         role_ids.push role_id
       end
       total_role_ids.push role_ids
@@ -1058,7 +1058,7 @@ raise 'Minimum one user need to have admin permissions'
 
   def last_admin_check_admin_count
     admin_role_ids = Role.joins(:permissions).where(permissions: { name: ['admin', 'admin.user'], active: true }, roles: { active: true }).pluck(:id)
-    User.joins(:roles).where(roles: { id: admin_role_ids }, users: { active: true }).distinct().count - 1
+    User.joins(:roles).where(roles: { id: admin_role_ids }, users: { active: true }).distinct.count - 1
   end
 
   def validate_agent_limit_by_attributes
@@ -1068,7 +1068,7 @@ raise 'Minimum one user need to have admin permissions'
     return true if !permissions?('ticket.agent')
 
     ticket_agent_role_ids = Role.joins(:permissions).where(permissions: { name: 'ticket.agent', active: true }, roles: { active: true }).pluck(:id)
-    count                 = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct().count + 1
+    count                 = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct.count + 1
     raise Exceptions::UnprocessableEntity, 'Agent limit exceeded, please check your account settings.' if count > Setting.get('system_agent_limit').to_i
 
     true
@@ -1081,7 +1081,7 @@ raise 'Minimum one user need to have admin permissions'
     return true if !role.with_permission?('ticket.agent')
 
     ticket_agent_role_ids = Role.joins(:permissions).where(permissions: { name: 'ticket.agent', active: true }, roles: { active: true }).pluck(:id)
-    count                 = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct().count
+    count                 = User.joins(:roles).where(roles: { id: ticket_agent_role_ids }, users: { active: true }).distinct.count
 
     # if new added role is a ticket.agent role
     if ticket_agent_role_ids.include?(role.id)

+ 1 - 1
lib/auth/ldap.rb

@@ -6,7 +6,7 @@ class Auth
     def valid?(user, password)
       return false if !Setting.get('ldap_integration')
 
-      ldap_user = ::Ldap::User.new()
+      ldap_user = ::Ldap::User.new
 
       # get from config or fallback to login
       # for a list of user attributes which should

+ 1 - 1
lib/ldap.rb

@@ -64,7 +64,7 @@ class Ldap
   # @return [true] Returns always true
   def search(filter, base: nil, scope: nil, attributes: nil, &block)
 
-    base  ||= base_dn()
+    base  ||= base_dn
     scope ||= Net::LDAP::SearchScope_WholeSubtree
 
     connection.search(

Some files were not shown because too many files changed in this diff