Merge pull request #42 from dalibor/rails_7.1

Add support for Rails 7.1

.github/workflows/build.yml

@@ -9,63 +9,6 @@ on:
       - master
 
 jobs:
-  legacy:
-    runs-on: ubuntu-18.04
-    services:
-      mysql:
-        image: mysql:5.5
-        env:
-          MYSQL_ROOT_PASSWORD: pass
-        ports:
-          - "3306:3306"
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
-
-    name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
-    strategy:
-      matrix:
-        include:
-          - gemfile: rails3.0
-            ruby: 2.4
-          - gemfile: rails3.1
-            ruby: 2.4
-          - gemfile: rails3.2
-            ruby: 2.4
-
-          - gemfile: rails4.0
-            ruby: 2.4
-          - gemfile: rails4.1
-            ruby: 2.4
-          - gemfile: rails4.2
-            ruby: 2.4
-
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
-      BUNDLE_PATH_RELATIVE_TO_CWD: true
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler: default
-          bundler-cache: true
-
-      - name: Set up database
-        run: |
-          cp spec/support/config.yml.github spec/support/config.yml
-          bundle exec rake db:create
-
-      - name: Run tests
-        run: |
-          bundle exec rspec spec
-
-
   latest:
     runs-on: ubuntu-latest
     services:
@@ -101,10 +44,15 @@ jobs:
           - gemfile: rails6.1
             ruby: 3.0
 
-          - gemfile: rails7.0
-            ruby: 2.7
           - gemfile: rails7.0
             ruby: 3.0
+          - gemfile: rails7.0
+            ruby: 3.1
+
+          - gemfile: rails7.1
+            ruby: 3.1
+          - gemfile: rails7.1
+            ruby: 3.2
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

.ruby-version

@@ -1 +1 @@
-3.0.2
+3.2.2

Appraisals

@@ -1,29 +1,23 @@
 appraise "rails5.1" do
   gem "activerecord", "~> 5.1.0"
-  gem "mysql2", "~> 0.5.2"
-  gem "sqlite3",  "~> 1.4.1"
 end
 
 appraise "rails5.2" do
   gem "activerecord", "~> 5.2.0"
-  gem "mysql2", "~> 0.5.2"
-  gem "sqlite3",  "~> 1.4.1"
 end
 
 appraise "rails6.0" do
   gem "activerecord", "~> 6.0.0"
-  gem "mysql2", "~> 0.5.2"
-  gem "sqlite3",  "~> 1.4.1"
 end
 
 appraise "rails6.1" do
   gem "activerecord", "~> 6.1.0"
-  gem "mysql2", "~> 0.5.2"
-  gem "sqlite3",  "~> 1.4.1"
 end
 
 appraise "rails7.0" do
   gem "activerecord", "~> 7.0.0"
-  gem "mysql2", "~> 0.5"
-  gem "sqlite3", "~> 1.4"
+end
+
+appraise "rails7.1" do
+  gem "activerecord", "~> 7.1.0"
 end

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 0.5.0 2023-10-27
+
+- Add support for Rails 7.1
+- Drop legacy test job because ubuntu-18.04 build node is not available anymore
+
 ## 0.4.0 2022-02-12
 
 - Add support for Rails 7.0

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.1.0"
 
 # Specify your gem's dependencies in octoshark.gemspec
 gemspec

gemfiles/rails5.1.gemfile

@@ -3,7 +3,5 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.0"
-gem "mysql2", "~> 0.5.2"
-gem "sqlite3", "~> 1.4.1"
 
 gemspec path: "../"

gemfiles/rails5.2.gemfile

@@ -3,7 +3,5 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.2.0"
-gem "mysql2", "~> 0.5.2"
-gem "sqlite3", "~> 1.4.1"
 
 gemspec path: "../"

gemfiles/rails6.0.gemfile

@@ -3,7 +3,5 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.0.0"
-gem "mysql2", "~> 0.5.2"
-gem "sqlite3", "~> 1.4.1"
 
 gemspec path: "../"

gemfiles/rails6.1.gemfile

@@ -3,7 +3,5 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.0"
-gem "mysql2", "~> 0.5.2"
-gem "sqlite3", "~> 1.4.1"
 
 gemspec path: "../"

gemfiles/rails7.0.gemfile

@@ -3,7 +3,5 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
-gem "mysql2", "~> 0.5"
-gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

gemfiles/rails3.0.gemfile → gemfiles/rails7.1.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.0.0"
-gem "mysql2", "< 0.3"
-gem "sqlite3", "~> 1.3.13"
+gem "activerecord", "~> 7.1.0"
 
 gemspec path: "../"

lib/octoshark/connection_pools_manager.rb

@@ -81,6 +81,7 @@ def create_connection_pool(name, config)
     def build_connection_pool_spec(name, config)
       if active_record_6_1_or_7?
         env_name = defined?(Rails) ? Rails.env : nil
+        require "active_record/database_configurations"
         db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, name, config)
 
         pool_config_class = ActiveRecord::ConnectionAdapters::PoolConfig

lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

octoshark.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activerecord", ">= 3.0"
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec",    "~> 3.7.0"
+  spec.add_development_dependency "rspec",    "~> 3.12.0"
   spec.add_development_dependency "sqlite3",  "~> 1.4.1"
   spec.add_development_dependency "mysql2",   "~> 0.5.2"
   spec.add_development_dependency "appraisal"

spec/support/config.yml.github

@@ -1,7 +1,6 @@
 db1:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: octoshark_db1
   pool: 5
   username: root
@@ -12,7 +11,6 @@ db1:
 db2:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: octoshark_db2
   pool: 5
   username: root

spec/support/config.yml.template

@@ -1,7 +1,6 @@
 db1:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: octoshark_db1
   pool: 5
   username: root
@@ -12,7 +11,6 @@ db1:
 db2:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: octoshark_db2
   pool: 5
   username: root