Merge pull request #187 from publify/dependabot/bundler/rubocop-tw-1.80.2

Update rubocop requirement from ~> 1.75.6 to ~> 1.80.2

Author: mvz

.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.57.2.
+# using RuboCop version 1.80.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
     - 'app/models/feedback.rb'
@@ -45,12 +45,22 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 19
 
-# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
-# NamePrefix: is_, has_, have_
-# ForbiddenPrefixes: is_, has_, have_
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'app/models/content_base.rb'
+    - 'app/models/trigger.rb'
+    - 'lib/sidebar_field.rb'
+    - 'lib/spam_protection.rb'
+
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
+# NamePrefix: is_, has_, have_, does_
+# ForbiddenPrefixes: is_, has_, have_, does_
 # AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Exclude:
     - 'app/helpers/authors_helper.rb'
     - 'app/models/article.rb'
@@ -60,15 +70,14 @@ Naming/PredicateName:
 
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'spec/controllers/authors_controller_spec.rb'
 
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
   Exclude:
-    - 'lib/tasks/manifest.rake'
     - 'spec/models/blog_spec.rb'
 
 RSpec/AnyInstance:
@@ -180,8 +189,6 @@ RSpec/VerifiedDoubles:
     - 'spec/helpers/base_helper_spec.rb'
     - 'spec/models/note_spec.rb'
 
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/CreateTableWithTimestamps:
   Exclude:
     - 'db/migrate/113_initial_schema.rb'
@@ -190,36 +197,27 @@ Rails/CreateTableWithTimestamps:
     - 'db/migrate/20190209160610_remove_text_filters.rb'
     - 'db/migrate/20221010092846_remove_page_caches_table.rb'
 
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
   Exclude:
     - 'app/models/content.rb'
     - 'app/models/tag.rb'
 
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/article.rb'
     - 'app/models/blog.rb'
     - 'app/models/user.rb'
 
-# Configuration parameters: Include.
-# Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/base_helper.rb'
 
-# Configuration parameters: IgnoreScopes, Include.
-# Include: app/models/**/*.rb
+# Configuration parameters: IgnoreScopes.
 Rails/InverseOf:
   Exclude:
     - 'app/models/blog.rb'
     - 'app/models/user.rb'
 
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/admin/base_controller.rb'
@@ -235,8 +233,6 @@ Rails/RedundantReceiverInWithOptions:
   Exclude:
     - 'app/controllers/content_controller.rb'
 
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/ThreeStateBooleanColumn:
   Exclude:
     - 'db/migrate/113_initial_schema.rb'

app/controllers/admin/base_controller.rb

@@ -18,7 +18,7 @@ def destroy_a(klass_to_destroy)
     @record = klass_to_destroy.find(params[:id])
     if @record.respond_to?(:access_by?) && !@record.access_by?(current_user)
       flash[:error] = I18n.t("admin.base.not_allowed")
-      return(redirect_to action: "index")
+      return redirect_to action: "index"
     end
     @record.destroy
     flash[:notice] = I18n.t("admin.base.successfully_deleted",

app/controllers/admin/users_controller.rb

@@ -38,7 +38,7 @@ def update
   end
 
   def destroy
-    @user.destroy if User.where("profile = ? and id != ?", User::ADMIN, @user.id).count > 1
+    @user.destroy if User.where("profile = ? and id != ?", User::ADMIN, @user.id).many?
     redirect_to admin_users_url
   end
 

app/controllers/articles_controller.rb

@@ -154,7 +154,7 @@ def set_index_title_and_description(blog, parameters)
   def verify_config
     if !this_blog.configured?
       redirect_to controller: "setup", action: "index"
-    elsif User.count == 0
+    elsif User.none?
       redirect_to new_user_registration_path
     else
       true

app/controllers/setup_controller.rb

@@ -25,7 +25,7 @@ def create
 
     sign_in @user
 
-    if User.count == 1
+    if User.one?
       create_first_post @user
       create_first_page @user
     end

app/controllers/users/registrations_controller.rb

@@ -2,6 +2,7 @@
 
 class Users::RegistrationsController < Devise::RegistrationsController
   include BlogHelper
+
   before_action :require_signup_allowed
 
   private

app/helpers/admin/base_helper.rb

@@ -43,7 +43,7 @@ def show_actions(item)
   end
 
   def display_pagination(collection, cols, _first = "", _last = "")
-    return if collection.count == 0
+    return if collection.none?
 
     tag.tr do
       tag.td(paginate(collection), class: "paginate", colspan: cols)

app/models/article.rb

@@ -155,7 +155,7 @@ def publication_month
 
   def self.publication_months
     result = select("published_at").where.not(published_at: nil).where(type: "Article")
-    result.map { |it| [it.publication_month] }.uniq
+    result.map { [_1.publication_month] }.uniq
   end
 
   # Finds one article which was posted on a certain date and matches the

app/models/resource.rb

@@ -5,6 +5,7 @@
 
 class Resource < ApplicationRecord
   include StringLengthLimit
+
   belongs_to :blog
   belongs_to :content, optional: true
 

app/models/user.rb

@@ -139,6 +139,6 @@ def has_twitter_configured?
   private
 
   def set_default_profile
-    self.profile ||= User.count.zero? ? "admin" : "contributor"
+    self.profile ||= User.none? ? "admin" : "contributor"
   end
 end