Update Rubocop to newest standards (#1043)

* updated rubocop

* fix Lint

* Update .rubocop.yml

* Update .rubocop.yml

* Update .rubocop.yml

Author: lodewiges

.rubocop.yml

@@ -1,14 +1,17 @@
-require:
+plugins:
+  - rubocop-factory_bot
+  - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
-  - rubocop-performance
+  - rubocop-rspec_rails
 
 AllCops:
   TargetRailsVersion: 7.1
   TargetRubyVersion: 3.3
   Exclude:
     - 'bin/**/*'
     - 'db/schema.rb'
+    - 'db/migrate/archive/**/*'
     - 'config/initializers/simple_form.rb'
     - 'config/initializers/simple_form_bootstrap.rb'
     - 'node_modules/**/*'
@@ -100,8 +103,5 @@ Style/StringMethods:
 Naming/MemoizedInstanceVariableName:
   Enabled: false
 
-RSpec/FilePath:
-  Enabled: false
-
-Rails/BulkChangeTable:
+RSpec/SpecFilePathFormat:
   Enabled: false

Gemfile

@@ -72,10 +72,12 @@ end
 
 group :test do
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop', '~> 1.75.1', require: false
-  gem 'rubocop-performance'
-  gem 'rubocop-rails'
-  gem 'rubocop-rspec'
+  gem 'rubocop', '~> 1.75.3', require: false
+  gem 'rubocop-factory_bot', '~> 2.27.1', require: false
+  gem 'rubocop-performance', '~> 1.25', require: false
+  gem 'rubocop-rails', '~> 2.31', require: false
+  gem 'rubocop-rspec', '~> 3.5', require: false
+  gem 'rubocop-rspec_rails', '~> 2.31', require: false
   gem 'simplecov', require: false
   gem 'simplecov-lcov', '~> 0.8.0', require: false
   gem 'terminal-notifier-guard'

Gemfile.lock

@@ -215,7 +215,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.10.2)
+    json (2.11.3)
     jwt (2.4.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -310,10 +310,10 @@ GEM
     paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.26.3)
+    parallel (1.27.0)
     paranoia (3.0.1)
       activerecord (>= 6, < 8.1)
-    parser (3.3.7.3)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
@@ -450,29 +450,40 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.0)
-    rubocop (1.75.1)
+    rubocop (1.75.3)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.43.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.43.0)
+    rubocop-ast (1.44.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
-    rubocop-performance (1.14.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.14.2)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.31.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rufus-scheduler (3.8.2)
@@ -550,7 +561,9 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uniform_notifier (1.16.0)
     validates_timeliness (7.1.0)
       activemodel (>= 7.0.0, < 8)
@@ -629,10 +642,12 @@ DEPENDENCIES
   redis-rails (~> 5.0.2)
   rest-client (~> 2.1.0)
   rspec-rails
-  rubocop (~> 1.75.1)
-  rubocop-performance
-  rubocop-rails
-  rubocop-rspec
+  rubocop (~> 1.75.3)
+  rubocop-factory_bot (~> 2.27.1)
+  rubocop-performance (~> 1.25)
+  rubocop-rails (~> 2.31)
+  rubocop-rspec (~> 3.5)
+  rubocop-rspec_rails (~> 2.31)
   sassc-rails (~> 2.1.2)
   sentry-rails (~> 5.23)
   sentry-ruby (~> 5.23)

README.md

@@ -22,6 +22,28 @@ def index
     @price_lists_json = PriceList.unarchived.to_json(only: %i[id name])
   end
 
+  def show # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    @activity = Activity.includes(:price_list,
+                                  { orders: [{ order_rows: :product }, :user, :created_by] }).find(params[:id])
+    authorize @activity
+
+    @price_list = @activity.price_list
+    @bartenders = @activity.bartenders
+    @orders = @activity.orders
+
+    @credit_mutations = @activity.credit_mutations
+    @credit_mutations_total = @activity.credit_mutations_total
+
+    @revenue_by_category = @activity.revenue_by_category
+    @revenue_with_cash = @activity.revenue_with_cash
+    @revenue_with_pin = @activity.revenue_with_pin
+    @revenue_with_credit = @activity.revenue_with_credit
+    @cash_total = @activity.cash_total
+    @revenue_total = @activity.revenue_total
+
+    @count_per_product = @activity.count_per_product
+  end
+
   def create
     @activity = Activity.new(permitted_attributes.merge(created_by: current_user))
     authorize @activity
@@ -61,28 +83,6 @@ def destroy
     redirect_to Activity
   end
 
-  def show # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    @activity = Activity.includes(:price_list,
-                                  { orders: [{ order_rows: :product }, :user, :created_by] }).find(params[:id])
-    authorize @activity
-
-    @price_list = @activity.price_list
-    @bartenders = @activity.bartenders
-    @orders = @activity.orders
-
-    @credit_mutations = @activity.credit_mutations
-    @credit_mutations_total = @activity.credit_mutations_total
-
-    @revenue_by_category = @activity.revenue_by_category
-    @revenue_with_cash = @activity.revenue_with_cash
-    @revenue_with_pin = @activity.revenue_with_pin
-    @revenue_with_credit = @activity.revenue_with_credit
-    @cash_total = @activity.cash_total
-    @revenue_total = @activity.revenue_total
-
-    @count_per_product = @activity.count_per_product
-  end
-
   def order_screen # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     authorize Activity
 

app/controllers/activities_controller.rb

@@ -3,7 +3,7 @@ class PaymentsController < ApplicationController
   after_action :verify_authorized, only: %i[index create add]
 
   def index
-    @payments = Payment.all.order(created_at: :desc)
+    @payments = Payment.order(created_at: :desc)
     authorize @payments
   end
 

app/controllers/payments_controller.rb

@@ -8,7 +8,7 @@ def index
     authorize PriceList
 
     price_lists = policy_scope(PriceList.order(created_at: :desc))
-    products = Product.all.order(:id).includes(:product_prices)
+    products = Product.order(:id).includes(:product_prices)
 
     @price_list = PriceList.new
 

app/controllers/price_lists_controller.rb

@@ -1,7 +1,7 @@
 class Invoice < ApplicationRecord
   has_secure_token
 
-  enum status: { pending: 0, sent: 1, paid: 3 }
+  enum :status, { pending: 0, sent: 1, paid: 3 }
 
   belongs_to :user
   belongs_to :activity

app/models/invoice.rb

@@ -6,7 +6,7 @@ class << self
     undef_method :open
   end
   # See: https://docs.mollie.com/payments/status-changes
-  enum status: { open: 0, pending: 1, paid: 2, failed: 3, canceled: 4, expired: 5 }
+  enum :status, { open: 0, pending: 1, paid: 2, failed: 3, canceled: 4, expired: 5 }
   COMPLETE_STATUSES = %w[paid failed canceled expired].freeze
 
   belongs_to :user, optional: true

app/models/payment.rb

@@ -1,6 +1,6 @@
 class Product < ApplicationRecord
-  enum category: { beer: 0, low_alcohol_beer: 9, craft_beer: 6, non_alcoholic: 1, distilled: 2, whiskey: 8, wine: 3, food: 4, tobacco: 5,
-                   donation: 7 }
+  enum :category, { beer: 0, low_alcohol_beer: 9, craft_beer: 6, non_alcoholic: 1, distilled: 2, whiskey: 8, wine: 3, food: 4, tobacco: 5,
+                    donation: 7 }
 
   has_many :product_prices, dependent: :destroy
   has_many :price_lists, through: :product_prices, dependent: :restrict_with_error