From 88652ae6a33009c92421936d462b66a4a139139f Mon Sep 17 00:00:00 2001
From: Kirill Usanov <kirill.usanov.dev@gmail.com>
Date: Sat, 22 Nov 2025 20:21:46 +0300
Subject: [PATCH 1/2] Bump Ruby versions and fix Rubocop offenses

---
 .github/workflows/main.yml                           | 9 +++++----
 .rubocop.yml                                         | 7 ++-----
 README.md                                            | 1 -
 spec/tiny_filter/generators/filter_generator_spec.rb | 2 +-
 tiny_filter.gemspec                                  | 3 ++-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8786e28..94afedc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,9 +16,10 @@ jobs:
         - '2.6.10'
         - '2.7.8'
         - '3.0.7'
-        - '3.1.5'
-        - '3.2.4'
-        - '3.3.1'
+        - "3.1.7"
+        - "3.2.9"
+        - "3.3.10"
+        - "3.4.7"
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -41,7 +42,7 @@ jobs:
     - name: Install Ruby and gems
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3.1
+        ruby-version: 3.4.7
         bundler-cache: true
 
     - name: Run Rubocop
diff --git a/.rubocop.yml b/.rubocop.yml
index 90496b9..2679e9d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-performance
   - rubocop-rails
   - rubocop-rake
@@ -9,7 +9,7 @@ inherit_gem:
   rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 3.3
+  TargetRubyVersion: 3.4
   NewCops: enable
 
 Layout/EmptyLinesAroundAccessModifier:
@@ -49,8 +49,5 @@ Rails/ApplicationRecord:
 Rails/Date:
   Enabled: false
 
-RSpec/FilePath:
-  Enabled: false
-
 RSpec/SpecFilePathFormat:
   Enabled: false
diff --git a/README.md b/README.md
index 8faa464..b5cb5fc 100644
--- a/README.md
+++ b/README.md
@@ -166,7 +166,6 @@ and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/lassoid/tiny_filter.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
diff --git a/spec/tiny_filter/generators/filter_generator_spec.rb b/spec/tiny_filter/generators/filter_generator_spec.rb
index 5c60087..0625ff7 100644
--- a/spec/tiny_filter/generators/filter_generator_spec.rb
+++ b/spec/tiny_filter/generators/filter_generator_spec.rb
@@ -20,7 +20,7 @@ def expected_file_content(model_name, keys = [])
       # frozen_string_literal: true
 
       class #{class_from_model_name(model_name)}Filter < ::ApplicationFilter
-      #{keys.any? ? expected_filter_body(keys) : nil}
+      #{expected_filter_body(keys) if keys.any?}
       end
     CONTENT
   end
diff --git a/tiny_filter.gemspec b/tiny_filter.gemspec
index 9c55b18..f692f9e 100644
--- a/tiny_filter.gemspec
+++ b/tiny_filter.gemspec
@@ -37,11 +37,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-factory_bot"
   spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "rubocop-rails"
   spec.add_development_dependency "rubocop-rake"
   spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "rubocop-shopify"
   spec.add_development_dependency "sequel"
-  spec.add_development_dependency "sqlite3", "~> 1.4" # AR doesn't support 2+
+  spec.add_development_dependency "sqlite3"
 end

From 36098a141caa8d8dc3b8af7f611eefaad6564236 Mon Sep 17 00:00:00 2001
From: Kirill Usanov <kirill.usanov.dev@gmail.com>
Date: Sat, 22 Nov 2025 20:32:51 +0300
Subject: [PATCH 2/2] Remove to old Ruby versions from CI matrix

---
 .github/workflows/main.yml | 3 ---
 .rubocop.yml               | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94afedc..97b4367 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,9 +13,6 @@ jobs:
     strategy:
       matrix:
         ruby:
-        - '2.6.10'
-        - '2.7.8'
-        - '3.0.7'
         - "3.1.7"
         - "3.2.9"
         - "3.3.10"
diff --git a/.rubocop.yml b/.rubocop.yml
index 2679e9d..5386606 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,9 +37,6 @@ RSpec/NestedGroups:
 RSpec/ExampleLength:
   Max: 10
 
-RSpec/ContextWording:
-  Enabled: false
-
 RSpec/MultipleExpectations:
   Enabled: false
 
@@ -48,6 +45,3 @@ Rails/ApplicationRecord:
 
 Rails/Date:
   Enabled: false
-
-RSpec/SpecFilePathFormat:
-  Enabled: false