New base standby with rails7

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: ci
+on: [pull_request, push]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "2.7"
+        rails_version:
+          - "7.0"
+          - "5.2"
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails${{ matrix.rails_version }}.gemfile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake

.gitignore

@@ -12,11 +12,8 @@ doc/
 lib/bundler/man
 pkg
 rdoc
+spec/db
 spec/reports
 test/tmp
 test/version_tmp
 tmp
-
-test_db
-test_standby_one
-test_standby_two

README.md

@@ -1,6 +1,6 @@
 # Standby - Read from standby databases for ActiveRecord (formerly Slavery)
 
-[![Build Status](https://travis-ci.org/kenn/standby.svg)](https://travis-ci.org/kenn/standby)
+![Build Status](https://github.com/kenn/standby/actions/workflows/ci.yml/badge.svg)
 
 Standby is a simple, easy to use gem for ActiveRecord that enables conservative reading from standby databases, which means it won't automatically redirect all SELECTs to standbys.
 

gemfiles/rails4.2.gemfile

@@ -1,5 +1,9 @@
 source "https://rubygems.org"
 
+gemspec name: 'standby', path: '../'
+
 gem 'activerecord', '~> 4.2'
 
-gemspec name: 'standby', path: '../'
+group :development, :test do
+  gem 'sqlite3', '~> 1.3.6'
+end

gemfiles/rails5.2.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem 'activerecord', '~> 5.2'
-
 gemspec name: 'standby', path: '../'
+
+gem 'activerecord', '~> 5.2'

gemfiles/rails7.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec name: 'standby', path: '../'
+
+gem 'activerecord', '~> 7.0'

lib/standby/active_record/log_subscriber.rb

@@ -1,12 +1,21 @@
+require 'standby/version'
+
 module ActiveRecord
   class LogSubscriber
 
     alias_method :debug_without_standby, :debug
 
     def debug(msg)
-      db = Standby.disabled ? "" : color("[#{Thread.current[:_standby] || "primary"}]", ActiveSupport::LogSubscriber::GREEN, true)
+      db = Standby.disabled ? '' : log_header
       debug_without_standby(db + msg)
     end
 
+    def log_header
+      if Standby.version_gte?('7.1')
+        color("[#{Thread.current[:_standby] || "primary"}]", ActiveSupport::LogSubscriber::GREEN, bold: true)
+      else
+        color("[#{Thread.current[:_standby] || "primary"}]", ActiveSupport::LogSubscriber::GREEN, true)
+      end
+    end
   end
 end

lib/standby/connection_holder.rb

@@ -5,8 +5,14 @@ class ConnectionHolder < ActiveRecord::Base
     class << self
       # for delayed activation
       def activate(target)
-        spec = ActiveRecord::Base.configurations["#{ActiveRecord::ConnectionHandling::RAILS_ENV.call}_#{target}"]
-        raise Error.new("Standby target '#{target}' is invalid!") if spec.nil?
+        env_name = "#{ActiveRecord::ConnectionHandling::RAILS_ENV.call}_#{target}"
+        if Standby.version_gte?('7.0')
+          spec = ActiveRecord::Base.configurations.find_db_config(env_name)&.configuration_hash
+        else
+          spec = ActiveRecord::Base.configurations[env_name]
+        end
+        raise Error, "Standby target '#{target}' is invalid!" if spec.nil?
+
         establish_connection spec
       end
     end
@@ -25,4 +31,4 @@ def connection_holder(target)
       end
     end
   end
-end
+end

lib/standby/version.rb

@@ -1,3 +1,8 @@
 module Standby
-  VERSION = '6.0.0.pd.1'
+  VERSION = '6.0.0.pd.2'
+  class << self
+    def version_gte?(version)
+      Gem::Version.new(ActiveRecord.version) >= Gem::Version.new(version)
+    end
+  end
 end

spec/configuration_spec.rb

@@ -4,7 +4,13 @@
   before do
     # Backup connection and configs
     @backup_conn = Standby.instance_variable_get :@standby_connections
-    @backup_config = ActiveRecord::Base.configurations.dup
+    if Standby.version_gte?('7.0')
+      @backup_config = ActiveRecord::Base.configurations.configs_for.map do |config|
+        [config.env_name, config.configuration_hash]
+      end.to_h
+    else
+      @backup_config = ActiveRecord::Base.configurations.dup
+    end
     @backup_disabled = Standby.disabled
     @backup_conn.each_key do |klass_name|
       Object.send(:remove_const, klass_name) if Object.const_defined?(klass_name)
@@ -20,13 +26,21 @@
   end
 
   it 'raises error if standby configuration not specified' do
-    ActiveRecord::Base.configurations['test_standby'] = nil
+    if Standby.version_gte?('7.0')
+      ActiveRecord::Base.configurations = @backup_config.merge({ 'test_standby' => {} })
+    else
+      ActiveRecord::Base.configurations['test_standby'] = nil
+    end
 
     expect { Standby.on_standby { User.count } }.to raise_error(Standby::Error)
   end
 
   it 'connects to primary if standby configuration is disabled' do
-    ActiveRecord::Base.configurations['test_standby'] = nil
+    if Standby.version_gte?('7.0')
+      ActiveRecord::Base.configurations = @backup_config.merge({ 'test_standby' => {} })
+    else
+      ActiveRecord::Base.configurations['test_standby'] = nil
+    end
     Standby.disabled = true
 
     expect(Standby.on_standby { User.count }).to be 2

spec/spec_helper.rb

@@ -6,9 +6,9 @@
 require 'standby'
 
 ActiveRecord::Base.configurations = {
-  'test'            =>  { 'adapter' => 'sqlite3', 'database' => 'test_db' },
-  'test_standby'      =>  { 'adapter' => 'sqlite3', 'database' => 'test_standby_one' },
-  'test_standby_two'  =>  { 'adapter' => 'sqlite3', 'database' => 'test_standby_two'},
+  'test'            =>  { 'adapter' => 'sqlite3', 'database' => 'spec/db/test_db' },
+  'test_standby'      =>  { 'adapter' => 'sqlite3', 'database' => 'spec/db/test_standby_one' },
+  'test_standby_two'  =>  { 'adapter' => 'sqlite3', 'database' => 'spec/db/test_standby_two'},
   'test_standby_url'  =>  'postgres://root:@localhost:5432/test_standby'
 }
 

standby.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.required_ruby_version = '>= 2.0'
 
-  gem.add_runtime_dependency 'activerecord', '>= 3.0.0'
+  gem.add_runtime_dependency 'activerecord', '>= 3.0.0', '< 8.0'
 
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'sqlite3'
 end