Merge pull request #173 from publify/update-rubocop-dependencies

Update RuboCop dependencies and configuration and fix new offenses

Author: mvz

.rubocop.yml

@@ -4,12 +4,13 @@ inherit_mode:
   merge:
     - Exclude
 
-require:
+plugins:
   - rubocop-capybara
   - rubocop-factory_bot
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-rspec_rails
 
 AllCops:
   Exclude:
@@ -114,12 +115,12 @@ Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/*'
 
-RSpec/Capybara/FeatureMethods:
+RSpec/Dialect:
   Exclude:
     - 'spec/features/**_spec.rb'
 
 # Spec type inference is disabled, so this cop must be disabled too.
-RSpec/Rails/InferredSpecType:
+RSpecRails/InferredSpecType:
   Enabled: false
 
 # Allow the use of 'and' 'or' in control structures.

app/controllers/admin/seo_controller.rb

@@ -4,6 +4,8 @@ class Admin::SeoController < Admin::BaseController
   before_action :set_setting
   before_action :set_section
 
+  VALID_SECTIONS = %w(general titles permalinks).freeze
+
   def show
     if @setting.permalink_format != "/%year%/%month%/%day%/%title%" &&
         @setting.permalink_format != "/%year%/%month%/%title%" &&
@@ -37,8 +39,6 @@ def settings_keys
     @setting.settings_keys + [:custom_permalink]
   end
 
-  VALID_SECTIONS = %w(general titles permalinks).freeze
-
   def set_section
     section = params[:section]
     @section = VALID_SECTIONS.include?(section) ? section : "general"

app/controllers/admin/settings_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::SettingsController < Admin::BaseController
+  VALID_ACTIONS = %w(index write feedback display).freeze
+
   def index
     this_blog.base_url = blog_base_url if this_blog.base_url.blank?
     load_settings
@@ -33,8 +35,6 @@ def update
 
   private
 
-  VALID_ACTIONS = %w(index write feedback display).freeze
-
   def settings_params
     @settings_params ||= params.require(:setting).permit(@setting.settings_keys)
   end

app/models/article.rb

@@ -101,7 +101,7 @@ def self.last_draft(article_id)
 
   def self.search_with(params)
     params ||= {}
-    scoped = super(params)
+    scoped = super
     if %w(no_draft drafts published withdrawn pending).include?(params[:state])
       scoped = scoped.send(params[:state])
     end
@@ -145,7 +145,7 @@ def next
   end
 
   def previous
-    Article.where("published_at < ?", published_at).order("published_at desc")
+    Article.where(published_at: ...published_at).order("published_at desc")
       .limit(1).first
   end
 

app/models/config_manager.rb

@@ -69,9 +69,7 @@ def canonicalize(key, value)
     self.class.fields[key.to_s].canonicalize(value)
   end
 
-  def settings_keys
-    self.class.settings_keys
-  end
+  delegate :settings_keys, to: :class
 
   class Item
     VALID_TYPES = [:boolean, :integer, :string, :text].freeze

app/models/note.rb

@@ -21,7 +21,7 @@ class Note < Content
   after_create :set_permalink, :shorten_url
 
   scope :published, lambda {
-    where(state: "published").where("published_at <= ?", Time.zone.now).order(default_order)
+    where(state: "published").where(published_at: ..Time.zone.now).order(default_order)
   }
   default_scope { order("published_at DESC") }
 

app/models/sidebar.rb

@@ -97,9 +97,7 @@ def html_id
 
   def parse_request(_contents, _params); end
 
-  def fields
-    self.class.fields
-  end
+  delegate :fields, to: :class
 
   def fieldmap(field = nil)
     if field
@@ -109,17 +107,11 @@ def fieldmap(field = nil)
     end
   end
 
-  def description
-    self.class.description
-  end
+  delegate :description, to: :class
 
-  def short_name
-    self.class.short_name
-  end
+  delegate :short_name, to: :class
 
-  def display_name
-    self.class.display_name
-  end
+  delegate :display_name, to: :class
 
   def content_partial
     "/#{self.class.path_name}/content"

app/models/trigger.rb

@@ -11,7 +11,7 @@ def post_action(due_at, item, method = "came_due")
     end
 
     def fire
-      where("due_at <= ?", Time.zone.now).destroy_all
+      where(due_at: ..Time.zone.now).destroy_all
       true
     end
 

publify_core.gemspec

@@ -58,12 +58,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rails-controller-testing", "~> 1.0.1"
   s.add_development_dependency "rake-manifest", "~> 0.2.0"
   s.add_development_dependency "rspec-rails", "~> 6.0"
-  s.add_development_dependency "rubocop", "~> 1.59.0"
-  s.add_development_dependency "rubocop-capybara", "~> 2.21.0"
-  s.add_development_dependency "rubocop-factory_bot", "~> 2.24.0"
-  s.add_development_dependency "rubocop-performance", "~> 1.20.0"
-  s.add_development_dependency "rubocop-rails", "~> 2.23.0"
-  s.add_development_dependency "rubocop-rspec", "~> 2.25.0"
+  s.add_development_dependency "rubocop", "~> 1.75.6"
+  s.add_development_dependency "rubocop-capybara", "~> 2.22.1"
+  s.add_development_dependency "rubocop-factory_bot", "~> 2.27.1"
+  s.add_development_dependency "rubocop-performance", "~> 1.25.0"
+  s.add_development_dependency "rubocop-rails", "~> 2.32.0"
+  s.add_development_dependency "rubocop-rspec", "~> 3.6.0"
+  s.add_development_dependency "rubocop-rspec_rails", "~> 2.31.0"
   s.add_development_dependency "shoulda-matchers", "~> 6.0"
   s.add_development_dependency "simplecov", "~> 0.22.0"
   s.add_development_dependency "sqlite3", "~> 1.6"

spec/controllers/articles_controller_spec.rb

@@ -196,7 +196,7 @@
       end
 
       it "assigns @search the search string" do
-        expect(assigns[:search]).to be_equal(controller.params[:q])
+        expect(assigns[:search]).to equal(controller.params[:q])
       end
     end
   end