ar-multidb 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d3b5f1dd51f93a8d3b055b6ff23598d9087d10714d4714ceed834681c10b0f0
-  data.tar.gz: 8d2bd4809db6dd21fcad38e5153323ffac7f9d25d4b1cb78d655c27b8a37b43c
+  metadata.gz: f198d581e4d1d0641b91ec64b79472987f90c8c69f717adc568caffbcaad148f
+  data.tar.gz: 33f6126cef8968a360f84fda234548687507f988beade03da58f092b8166cb13
 SHA512:
-  metadata.gz: 42c9edb156dcc3d5aa1900164386022512af54a0085d9a9c6a13a7d275fbf55857c06c924b280eeca53a2c157979fcde560018b69506d1acbae84178ec940faa
-  data.tar.gz: fbf05f4cd6eaf8ebd357fbeac7f66ba49ae20b6680ea078c6ccf3d6182977b9c78ec7f3170e80e03551997088c0c224107e0d768c3590b089d13225c15a86672
+  metadata.gz: ba852c8001cb41bd738f2fae94268b5c37c9ebf5e549dcf326243dbfbff4c7c00a76641c2500dcfb96b37469543fc370a362cecec9c04134c031c0e40cc0fc90
+  data.tar.gz: 041f8e4d3fdb4559b764c4189a81801d60c96ad71f71a431970a62a06cd6e603b96bf20b223ff7032180a149329ffad76ed4da70090658d241909332255f13e2

data/.github/workflows/prs.yml

@@ -16,26 +16,26 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-        - '2.5'
-        - '2.7'
         - '3.0'
+        - '3.1'
+        - '3.2'
+        - '3.3'
+        - '3.4'
         activerecord:
-        - '5.1'
-        - '5.2'
-        - '6.0'
-        - '6.1'
-        - '7.0'
+        - '7.1'
+        - '7.2'
+        - '8.0'
         exclude:
-        - ruby: '2.5'
-          activerecord: '7.0'
         - ruby: '3.0'
-          activerecord: '5.1'
+          activerecord: '7.2'
         - ruby: '3.0'
-          activerecord: '5.2'
+          activerecord: '8.0'
+        - ruby: '3.1'
+          activerecord: '8.0'
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}.gemfile"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -49,7 +49,7 @@ jobs:
       run: bundle exec rubocop
     - name: Coveralls Parallel
       if: "${{ !env.ACT }}"
-      uses: coverallsapp/github-action@master
+      uses: coverallsapp/github-action@v2
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"
         flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}
@@ -62,7 +62,7 @@ jobs:
     steps:
       - name: Coveralls Finished
         if: "${{ !env.ACT }}"
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           parallel-finished: true

data/.gitignore

@@ -1,7 +1,7 @@
 /pkg
 *~
 \.DS_Store
-*.sqlite
+*.sqlite*
 Gemfile.lock
 Gemfile.local
 gemfiles/*.lock

data/.rubocop.yml

@@ -1,14 +1,14 @@
-require:
+plugins:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   SuggestExtensions: false
   NewCops: disable
   Exclude:
     - '**/vendor/**/*'
 
-Gemspec/DateAssignment: # new in 1.10
+Gemspec/DeprecatedAttributeAssignment: # new in 1.30
   Enabled: true
 Gemspec/RequireMFA: # new in 1.23
   Enabled: true
@@ -27,9 +27,6 @@ Layout/SpaceBeforeBrackets: # new in 1.7
 
 Lint/AmbiguousAssignment: # new in 1.7
   Enabled: true
-Lint/AmbiguousBlockAssociation:
-  IgnoredMethods:
-    - change
 Lint/AmbiguousOperatorPrecedence: # new in 1.21
   Enabled: true
 Lint/AmbiguousRange: # new in 1.19
@@ -110,6 +107,8 @@ RSpec/MultipleExpectations:
   Enabled: false
 RSpec/NestedGroups:
   Max: 4
+RSpec/VerifiedDoubleReference: # new in 2.10
+  Enabled: false
 
 Security/CompoundHash: # new in 1.28
   Enabled: true

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## [0.8.0]
+### Changed
+- dropped support for Ruby < 3.0
+- dropped support for AR < 7.1
+- add support for Rails 7.2 and 8.0
+
+## [0.7.0]
+### Changed
+- add AR 7.1 support
+
 ## [0.6.0]
 ### Changed
 - dropped ruby 2.4 support

data/ar-multidb.gemspec

@@ -8,26 +8,27 @@ Gem::Specification.new do |s|
   s.version     = Multidb::VERSION
   s.authors     = ['Alexander Staubo', 'Edward Rudd']
   s.email       = %w[alex@bengler.no urkle@outoforder.cc]
-  s.homepage    = ''
+  s.homepage    = 'https://github.com/OutOfOrder/multidb'
   s.summary     = s.description = 'Multidb is an ActiveRecord extension for switching between multiple database connections, such as primary/replica setups.'
   s.license     = 'MIT'
   s.metadata['rubygems_mfa_required'] = 'true'
+  s.metadata['changelog_uri'] = 'https://github.com/OutOfOrder/multidb/blob/master/CHANGELOG.md'
+  s.metadata['source_code_uri'] = 'https://github.com/OutOfOrder/multidb'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'activerecord', '>= 5.1', '< 7.1'
-  s.add_runtime_dependency 'activesupport', '>= 5.1', '< 7.1'
+  s.add_runtime_dependency 'activerecord', '>= 7.1', '< 8.1'
+  s.add_runtime_dependency 'activesupport', '>= 7.1', '< 8.1'
 
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.8'
-  s.add_development_dependency 'rubocop', '~> 1.28.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.10.0'
-  s.add_development_dependency 'simplecov', '~> 0.21.2'
+  s.add_development_dependency 'rubocop', '~> 1.75.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 3.6.0'
+  s.add_development_dependency 'simplecov', '~> 0.22.0'
   s.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
-  s.add_development_dependency 'sqlite3', '~> 1.3'
+  s.add_development_dependency 'sqlite3', '~> 2'
 end

data/gemfiles/{activerecord-5.1.gemfile → activerecord-7.1.gemfile}

@@ -2,6 +2,6 @@
 
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.1.0'
+gem 'activerecord', '~> 7.1.0'
 
 gemspec path: '..'

data/gemfiles/{activerecord-5.2.gemfile → activerecord-7.2.gemfile}

@@ -2,6 +2,6 @@
 
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 5.2.0'
+gem 'activerecord', '~> 7.2.0'
 
 gemspec path: '..'

data/gemfiles/{activerecord-6.0.gemfile → activerecord-8.0.gemfile}

@@ -2,6 +2,6 @@
 
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 6.0.0'
+gem 'activerecord', '~> 8.0.0'
 
 gemspec path: '..'

data/lib/multidb/candidate.rb

@@ -2,19 +2,14 @@
 
 module Multidb
   class Candidate
-    USE_RAILS_61 = Gem::Version.new(::ActiveRecord::VERSION::STRING) >= Gem::Version.new('6.1')
-    SPEC_NAME = if USE_RAILS_61
-                  'ActiveRecord::Base'
-                else
-                  'primary'
-                end
+    SPEC_NAME = 'ActiveRecord::Base'
 
     def initialize(name, target)
       @name = name
 
       case target
       when Hash
-        target = target.merge(name: 'primary') unless USE_RAILS_61
+        target = target.merge(name: 'primary')
 
         @connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
         @connection_handler.establish_connection(target)

data/lib/multidb/log_subscriber.rb

@@ -8,11 +8,11 @@ module Multidb
       super
     end
 
-    def debug(msg)
+    def debug(msg = nil)
       name = Multidb.balancer.current_connection_name
       if name
         db = color("[DB: #{name}]", ActiveSupport::LogSubscriber::GREEN, true)
-        super(db + msg)
+        super(db + msg.to_s)
       else
         super
       end

data/lib/multidb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Multidb
-  VERSION = '0.6.0'
+  VERSION = '0.8.0'
 end

data/spec/lib/multidb/balancer_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Multidb::Balancer do
       end
 
       it 'sets fallback to false' do
-        expect(subject.fallback).to eq(false)
+        expect(subject.fallback).to be(false)
       end
 
       context 'when rails ENV is development' do
@@ -45,7 +45,7 @@ RSpec.describe Multidb::Balancer do
         end
 
         it 'sets fallback to true' do
-          expect(subject.fallback).to eq(true)
+          expect(subject.fallback).to be(true)
         end
       end
 
@@ -55,7 +55,7 @@ RSpec.describe Multidb::Balancer do
         end
 
         it 'sets fallback to true' do
-          expect(subject.fallback).to eq(true)
+          expect(subject.fallback).to be(true)
         end
       end
     end
@@ -78,7 +78,7 @@ RSpec.describe Multidb::Balancer do
       end
 
       it 'sets fallback to true' do
-        expect(subject.fallback).to eq(true)
+        expect(subject.fallback).to be(true)
       end
     end
 

data/spec/lib/multidb/candidate_spec.rb

@@ -17,16 +17,6 @@ RSpec.describe Multidb::Candidate do
         handler = subject.instance_variable_get(:@connection_handler)
         expect(handler).to an_instance_of(ActiveRecord::ConnectionAdapters::ConnectionHandler)
       end
-
-      it 'merges the name: primary into the hash', rails: '< 6.1' do
-        handler = instance_double('ActiveRecord::ConnectionAdapters::ConnectionHandler')
-        allow(ActiveRecord::ConnectionAdapters::ConnectionHandler).to receive(:new).and_return(handler)
-        allow(handler).to receive(:establish_connection)
-
-        subject
-
-        expect(handler).to have_received(:establish_connection).with(hash_including(name: 'primary'))
-      end
     end
 
     context 'when target is a connection handler' do

data/spec/lib/multidb/log_subscriber_extension_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe Multidb::LogSubscriberExtension do
       end
 
       it 'does not change the payload' do
-        expect { subject }.not_to change { event.payload }
+        expect { subject }.not_to(change { event.payload })
       end
     end
   end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'fileutils'
 $LOAD_PATH.unshift(File.expand_path('lib', __dir__))
 require 'multidb'
 
-Dir[File.join(__dir__, 'support', '**', '*.rb')].sort.each { |f| require f }
+Dir[File.join(__dir__, 'support', '**', '*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
   config.disable_monkey_patching!
@@ -39,7 +39,7 @@ RSpec.configure do |config|
   end
 
   config.before do
-    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.connection_handler.clear_all_connections!
     Multidb.reset!
   end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-multidb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexander Staubo
 - Edward Rudd
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,42 +84,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: 1.75.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: 1.75.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.2
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
@@ -141,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
 description: Multidb is an ActiveRecord extension for switching between multiple database
   connections, such as primary/replica setups.
 email:
@@ -168,11 +167,9 @@ files:
 - README.markdown
 - Rakefile
 - ar-multidb.gemspec
-- gemfiles/activerecord-5.1.gemfile
-- gemfiles/activerecord-5.2.gemfile
-- gemfiles/activerecord-6.0.gemfile
-- gemfiles/activerecord-6.1.gemfile
-- gemfiles/activerecord-7.0.gemfile
+- gemfiles/activerecord-7.1.gemfile
+- gemfiles/activerecord-7.2.gemfile
+- gemfiles/activerecord-8.0.gemfile
 - lib/ar-multidb.rb
 - lib/multidb.rb
 - lib/multidb/balancer.rb
@@ -190,12 +187,13 @@ files:
 - spec/spec_helper.rb
 - spec/support/have_database_matcher.rb
 - spec/support/helpers.rb
-homepage: ''
+homepage: https://github.com/OutOfOrder/multidb
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+  changelog_uri: https://github.com/OutOfOrder/multidb/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/OutOfOrder/multidb
 rdoc_options: []
 require_paths:
 - lib
@@ -203,25 +201,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Multidb is an ActiveRecord extension for switching between multiple database
   connections, such as primary/replica setups.
-test_files:
-- spec/lib/multidb/balancer_spec.rb
-- spec/lib/multidb/candidate_spec.rb
-- spec/lib/multidb/configuration_spec.rb
-- spec/lib/multidb/log_subscriber_extension_spec.rb
-- spec/lib/multidb/model_extensions_spec.rb
-- spec/lib/multidb_spec.rb
-- spec/spec_helper.rb
-- spec/support/have_database_matcher.rb
-- spec/support/helpers.rb
+test_files: []

data/gemfiles/activerecord-6.1.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 6.1.0'
-
-gemspec path: '..'

data/gemfiles/activerecord-7.0.gemfile

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 7.0.0'
-
-gemspec path: '..'