Update CI config, fix specs and code style

Author: Envek

.github/workflows/lint.yml

@@ -15,10 +15,10 @@ jobs:
     name: RuboCop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Lint Ruby code with RuboCop
         run: |

.github/workflows/test.yml

@@ -16,13 +16,11 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     name: 'Ruby ${{ matrix.ruby }} × AR ${{ matrix.activerecord }} × Yabeda ${{ matrix.yabeda }}'
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.optional || false }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - ruby: '2.7'
-            activerecord: '6.0'
-            yabeda: '0.11'
           - ruby: '2.7'
             activerecord: '6.1'
             yabeda: '0.11'
@@ -31,30 +29,28 @@ jobs:
             yabeda: '0.11'
           - ruby: '3.1'
             activerecord: '7.1'
-            yabeda: '0.11'
+            yabeda: '0.12'
           - ruby: '3.2'
+            activerecord: '7.2'
+            yabeda: '0.13'
+          - ruby: '3.3'
+            activerecord: '8.0'
+            yabeda: '0.14'
+          - ruby: '3.4'
+            activerecord: '8.0'
+            yabeda: '0.14'
+          - ruby: 'head'
             activerecord: 'HEAD'
             yabeda: 'HEAD'
-    container:
-      image: ruby:${{ matrix.ruby }}
-      env:
-        CI: true
-        YABEDA_VERSION: ${{ matrix.yabeda }}
-        ACTIVERECORD_VERSION: ${{ matrix.activerecord }}
+            optional: true
+    env:
+      YABEDA_VERSION: ${{ matrix.yabeda }}
+      ACTIVERECORD_VERSION: ${{ matrix.activerecord }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
-            bundle-${{ matrix.ruby }}-
-      - name: Upgrade Bundler to 2.x (mostly for Rubies older than 2.7)
-        run: gem install bundler -v '~> 2.0' -v '!= 2.2.10'
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle update
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Run RSpec
         run: bundle exec rspec

Gemfile

@@ -27,7 +27,11 @@ else
   gem "activerecord", activerecord_version
 end
 
-gem "sqlite3"
+if activerecord_version.match(/\d+\.\d+/)&.then(&Gem::Version.method(:new))&.< Gem::Version.new("8.0")
+  gem "sqlite3", "~> 1.4"
+else
+  gem "sqlite3", "~> 2.0"
+end
 
 gem "rake", "~> 13.0"
 

Gemfile.lock

@@ -15,8 +15,7 @@ class Error < StandardError; end
       0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, # standard (from Prometheus)
       30, 60, 120, 300, 1800, 3600, 21_600, # Well, sometime queries can execute way too long
     ].freeze
-    
-    
+
     # rubocop: disable Layout/LineLength
     Yabeda.configure do
       config = ::Yabeda::ActiveRecord::Config.new

lib/yabeda/active_record.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'anyway'
+require "anyway"
 
 module Yabeda
   module ActiveRecord

lib/yabeda/active_record/config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "bundler/setup"
+require "logger"
 require "yabeda/activerecord"
 require "yabeda/rspec"
 

spec/spec_helper.rb

@@ -17,7 +17,7 @@
     ActiveRecord::Base.configurations
   end
 
-database_config.each do |_name, config|
+database_config.each_value do |config|
   next unless config["adapter"] == "sqlite3"
   next if config["database"] == ":memory:" || !File.exist?(config["database"])
 

spec/support/database.rb

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", ">= 6.0"
-  spec.add_dependency "yabeda", "~> 0.6"
   spec.add_dependency "anyway_config", ">= 1.3", "< 3.0"
+  spec.add_dependency "yabeda", "~> 0.6"
 end