From cf7f67e1fbc4ae62690e35414e0232285076621b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Tue, 30 Sep 2025 15:20:44 +0200 Subject: [PATCH] Rubocop --- .rubocop.yml | 7 +------ app/validators/dmsf_file_extension_validator.rb | 4 ++-- app/validators/dmsf_folder_parent_validator.rb | 3 +-- app/validators/dmsf_max_file_size_validator.rb | 15 ++++++--------- lib/redmine_dmsf/hooks/views/issue_view_hooks.rb | 10 +++++----- test/helper_test.rb | 2 +- test/integration/webdav/dmsf_webdav_head_test.rb | 1 - test/integration/webdav/dmsf_webdav_lock_test.rb | 1 - test/integration_test.rb | 2 +- test/test_case.rb | 2 +- test/unit_test.rb | 2 +- 11 files changed, 19 insertions(+), 30 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 770b807d..ff20ea66 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,7 +18,6 @@ AllCops: TargetRubyVersion: 3.2 TargetRailsVersion: 7.1 - SuggestExtensions: false NewCops: enable @@ -26,10 +25,6 @@ AllCops: Exclude: - '**/vendor/**/*' -plugins: - - rubocop-performance - - rubocop-rails - # Rules for DMSF Layout/LineLength: Exclude: @@ -81,7 +76,7 @@ Naming/AccessorMethodName: Exclude: - lib/dav4rack/resource.rb -Naming/PredicateName: +Naming/PredicatePrefix: Exclude: - patches/attachable_patch.rb diff --git a/app/validators/dmsf_file_extension_validator.rb b/app/validators/dmsf_file_extension_validator.rb index 898fb14e..7f8cc851 100644 --- a/app/validators/dmsf_file_extension_validator.rb +++ b/app/validators/dmsf_file_extension_validator.rb @@ -22,10 +22,10 @@ class DmsfFileExtensionValidator < ActiveModel::EachValidator include Redmine::I18n def validate_each(record, attribute, value) - return true unless attribute.to_s == 'name' + return unless attribute.to_s == 'name' extension = File.extname(value) - return true if Attachment.valid_extension?(extension) + return if Attachment.valid_extension?(extension) record.errors.add(:base, l(:error_attachment_extension_not_allowed, extension: extension)) end diff --git a/app/validators/dmsf_folder_parent_validator.rb b/app/validators/dmsf_folder_parent_validator.rb index 7056325f..93ba6dfb 100644 --- a/app/validators/dmsf_folder_parent_validator.rb +++ b/app/validators/dmsf_folder_parent_validator.rb @@ -25,10 +25,9 @@ class DmsfFolderParentValidator < ActiveModel::EachValidator while folder if folder == record record.errors.add attribute, :invalid - return false + return end folder = folder.dmsf_folder end - true end end diff --git a/app/validators/dmsf_max_file_size_validator.rb b/app/validators/dmsf_max_file_size_validator.rb index 6fc64372..d9c9c470 100644 --- a/app/validators/dmsf_max_file_size_validator.rb +++ b/app/validators/dmsf_max_file_size_validator.rb @@ -22,14 +22,11 @@ class DmsfMaxFileSizeValidator < ActiveModel::EachValidator include Redmine::I18n def validate_each(record, attribute, value) - if value && (value > Setting.attachment_max_size.to_i.kilobytes) - record.errors.add attribute, - l(:error_attachment_too_big, max_size: ActiveSupport::NumberHelper.number_to_human_size( - Setting.attachment_max_size.to_i.kilobytes - )) - false - else - true - end + return unless value && (value > Setting.attachment_max_size.to_i.kilobytes) + + record.errors.add attribute, + l(:error_attachment_too_big, max_size: ActiveSupport::NumberHelper.number_to_human_size( + Setting.attachment_max_size.to_i.kilobytes + )) end end diff --git a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb index 159c1ec7..2d0e8b63 100644 --- a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb +++ b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb @@ -34,7 +34,7 @@ module RedmineDmsf html = +'' container = context[:container] # Radio buttons - if allowed_to_attach_documents(container) + if allowed_to_attach_documents?(container) html << '

' classes = +'inline' html << "