ar-multidb 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e055c742a6029415524f28349e3241360013adc1184666609ed854273b0bd0af
-  data.tar.gz: dad603f9c611e867dfba0a83f2253cedbcfa5b20b75459d645105d9ed57c8faf
+  metadata.gz: ffcc496d5d9335e9f71ad121e3ae6eaa4be56a0fc0d28b95b8ec9316b52f6d99
+  data.tar.gz: ce582565fa33aacb84c073f870034a2fb04d6a629f0c311d0d95d8548a31e817
 SHA512:
-  metadata.gz: 80653278f75c95b67e5813c0307b26ff63e5796dd9371228911200ed532711370d7e48e6ec7d841ca59ba820e14843d15a7603099d5f20a451d3f03e3a4c54a9
-  data.tar.gz: 11feb31f0e7aed8f9059a91a1da11393df366da7c7d3960a68704ae078dca92e520524a4f23eec7754210a09fac407bb5b449dca1b9dcf449d3b447590f6eb40
+  metadata.gz: 1b023104b3d3f4a50c5db4aa1ffb0a68bcef8af7eca53be1e2c05e7d9eb65213cf8cb25f82cec3dbb4ffe11844fd20da09642f32912580906b929a6d505e2f3c
+  data.tar.gz: 75a697a0f62a8c7219a721d5a0b2390d94521f5c7b48676c17ff8bee958632c8d1f3abf96e2950b69c4a489cb8348136a853f6f2f02522f8b358f6a3aaacdec8

data/.gitignore

@@ -4,4 +4,7 @@
 *.sqlite
 Gemfile.lock
 Gemfile.local
+gemfiles/*.lock
+.ruby-version
+.ruby-gemset
 .rspec

data/.rubocop.yml

@@ -0,0 +1,64 @@
+AllCops:
+  TargetRubyVersion: 2.4
+  SuggestExtensions: false
+  NewCops: disable
+  Exclude:
+    - '**/vendor/**/*'
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Layout/LineLength:
+  Exclude:
+    - 'ar-multidb.gemspec'
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/DuplicateElsifCondition:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Naming/FileName:
+  Exclude:
+    - 'lib/ar-multidb.rb'
+Metrics:
+  Enabled: false
+Style/AccessorGrouping:
+  Enabled: true
+Style/ArrayCoercion:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
+Style/CaseLikeIf:
+  Enabled: true
+Style/Documentation:
+  Enabled: false
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashAsLastArrayItem:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashLikeCase:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
+

data/.travis.yml

@@ -1,10 +1,17 @@
 sudo: false
 language: ruby
+cache: bundler
+
+script:
+  - bundle exec rubocop
+  - bundle exec rspec
 
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.5.0
+    - rvm: 2.5
       gemfile: gemfiles/activerecord51.gemfile
-    - rvm: 2.5.0
+    - rvm: 2.5
       gemfile: gemfiles/activerecord52.gemfile
+    - rvm: 2.5
+      gemfile: gemfiles/activerecord60.gemfile

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+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.5.1]
+### Fixed
+- corrected licenses
+### Changed
+- updated to newer rubocop
+
+## [0.5.0]
+### Changed
+- added rails 6 support
+
+## [0.4.2]
+### Changed
+- adjust rails restriction to exclude untested rails 6
+- adjust minimum ruby version to 2.4
+- add rubocop
+
+## [0.4.1]
+### Added
+- Added support for database aliases ( PR #26 )
+

data/Gemfile

@@ -1,9 +1,11 @@
-source "http://rubygems.org"
+# frozen_string_literal: true
+
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in ar-multidb.gemspec
 gemspec
 
-local_gemfile = "Gemfile.local"
+local_gemfile = 'Gemfile.local'
 
 if File.exist?(local_gemfile)
   eval(File.read(local_gemfile)) # rubocop:disable Security/Eval

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 [name of plugin creator]
+Copyright (c) 2011 Alexander Staubo
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -2,9 +2,9 @@
 
 # Multidb
 
-A simple, no-nonsense ActiveRecord extension which allows the application to switch between multiple database connections, such as in a master/slave environment. For example:
+A simple, no-nonsense ActiveRecord extension which allows the application to switch between multiple database connections, such as in a primary/replica environment. For example:
 
-    Multidb.use(:slave) do
+    Multidb.use(:replica) do
       @posts = Post.all
     end
 
@@ -14,7 +14,7 @@ Randomized balancing of multiple connections within a group is supported. In the
 
 ## Requirements
 
-* Ruby 2.2 or later.
+* Ruby 2.4 or later.
 * ActiveRecord 5.1 or later.
 
 ## Older releases
@@ -32,10 +32,10 @@ Compared to other, more full-featured extensions such as Octopus and Seamless Da
 
 **Orthogonal**. Unlike Octopus, for example, connections follow context:
 
-    Multidb.use(:master) do
+    Multidb.use(:primary) do
       @post = Post.find(1)
-      Multidb.use(:slave) do
-        @post.authors  # This will use the slave
+      Multidb.use(:replica) do
+        @post.authors  # This will use the replica
       end
     end
 
@@ -60,8 +60,8 @@ All that is needed is to set up your `database.yml` file:
       host: db1
       multidb:
         databases:
-          slave:
-            host: db-slave
+          replica:
+            host: db-replica
 
 Each database entry may be a hash or an array. So this also works:
 
@@ -73,24 +73,41 @@ Each database entry may be a hash or an array. So this also works:
       host: db1
       multidb:
         databases:
-          slave:
-            - host: db-slave1
-            - host: db-slave2
+          replica:
+            - host: db-replica1
+            - host: db-replica2
 
 If multiple elements are specified, Multidb will use the list to pick a random candidate connection.
 
 The database hashes follow the same format as the top-level adapter configuration. In other words, each database connection may override the adapter, database name, username and so on.
 
+You may also add an "alias" record to the configuration to support more than one name for a given database configuration.
+
+    production:
+      adapter: postgresql
+      database: myapp_production
+      username: ohoh
+      password: mymy
+      host: db1
+      multidb:
+        databases:
+          main_db:
+            host: db1-a
+          secondary_db:
+            alias: main_db
+
+With the above, `Multidb.use(:main_db)` and `Multidb.use(:secondary_db)` will work identically. This can be useful to support naming scheme migrations transparently: once your application is updated to use `secondary_db` where necessary, you can swap out the configuration.
+
 To use the connection, modify your code by wrapping database access logic in blocks:
 
-    Multidb.use(:slave) do
+    Multidb.use(:replica) do
       @posts = Post.all
     end
 
 To wrap entire controller requests, for example:
 
     class PostsController < ApplicationController
-      around_filter :run_using_slave, only: [:index]
+      around_filter :run_using_replica, only: [:index]
 
       def index
         @posts = Post.all
@@ -100,22 +117,22 @@ To wrap entire controller requests, for example:
         # Won't be wrapped
       end
 
-      def run_using_slave(&block)
-        Multidb.use(:slave, &block)
+      def run_using_replica(&block)
+        Multidb.use(:replica, &block)
       end
     end
 
 You can also set the current connection for the remainder of the thread's execution:
 
-    Multidb.use(:slave)
+    Multidb.use(:replica)
     # Do work
-    Multidb.use(:master)
+    Multidb.use(:primary)
 
 Note that the symbol `:default` will (unless you override it) refer to the default top-level ActiveRecord configuration.
 
 ## Development mode
 
-In development you will typically want `Multidb.use(:slave)` to still work, but you probably don't want to run multiple databases on your development box. To make `use` silently fall back to using the default connection, Multidb can run in fallback mode.
+In development you will typically want `Multidb.use(:replica)` to still work, but you probably don't want to run multiple databases on your development box. To make `use` silently fall back to using the default connection, Multidb can run in fallback mode.
 
 If you are using Rails, this will be automatically enabled in `development` and `test` environments. Otherwise, simply set `fallback: true` in `database.yml`:
 

data/Rakefile

@@ -1,26 +1,27 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task default: :spec
 
 desc 'Bump version'
 task :bump do
-  if `git status -uno -s --porcelain | wc -l`.to_i > 0
-    abort "You have uncommitted changed."
-  end
+  abort 'You have uncommitted changed.' if `git status -uno -s --porcelain | wc -l`.to_i.positive?
+
   text = File.read('lib/multidb/version.rb')
   if text =~ /VERSION = '(.*)'/
-    old_version = $1
+    old_version = Regexp.last_match(1)
     version_parts = old_version.split('.')
     version_parts[-1] = version_parts[-1].to_i + 1
     new_version = version_parts.join('.')
     text.gsub!(/VERSION = '(.*)'/, "VERSION = '#{new_version}'")
     File.open('lib/multidb/version.rb', 'w') { |f| f << text }
-    (system("git add lib/multidb/version.rb") and
-      system("git commit -m 'Bump to #{new_version}.'")) or abort "Failed to commit."
+    (system('git add lib/multidb/version.rb') &&
+      system("git commit -m 'Bump to #{new_version}.'")) || abort('Failed to commit.')
   else
-    abort "Could not find version number"
+    abort 'Could not find version number'
   end
 end

data/ar-multidb.gemspec

@@ -1,26 +1,29 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "multidb/version"
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'multidb/version'
 
 Gem::Specification.new do |s|
-  s.name        = "ar-multidb"
+  s.name        = 'ar-multidb'
   s.version     = Multidb::VERSION
-  s.authors     = ["Alexander Staubo"]
-  s.email       = ["alex@bengler.no"]
-  s.homepage    = ""
-  s.summary     = s.description = %q{Multidb is an ActiveRecord extension for switching between multiple database connections, such as master/slave setups.}
-
-  s.rubyforge_project = "ar-multidb"
+  s.authors     = ['Alexander Staubo', 'Edward Rudd']
+  s.email       = ['alex@bengler.no', 'urkle@outoforder.cc']
+  s.homepage    = ''
+  s.summary     = s.description = 'Multidb is an ActiveRecord extension for switching between multiple database connections, such as primary/replica setups.'
+  s.license     = 'MIT'
 
   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.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+
+  s.required_ruby_version = '>= 2.4.0'
 
-  s.add_runtime_dependency 'activesupport', '>= 5.1', '<= 6.0'
-  s.add_runtime_dependency 'activerecord', '>= 5.1', '<= 6.0'
+  s.add_runtime_dependency 'activerecord', '>= 5.1', '< 6.1'
+  s.add_runtime_dependency 'activesupport', '>= 5.1', '< 6.1'
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 12.0'
+  s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'rubocop', '~> 1.12.1'
+  s.add_development_dependency 'sqlite3', '~> 1.3'
 end

data/gemfiles/activerecord51.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'activerecord', '~> 5.1.0'

data/gemfiles/activerecord52.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'activerecord', '~> 5.2.0'

data/gemfiles/activerecord60.gemfile

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

data/lib/ar-multidb.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'multidb'

data/lib/multidb/balancer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Multidb
   class Balancer
     attr_accessor :fallback
@@ -6,29 +8,33 @@ module Multidb
       @candidates = {}.with_indifferent_access
       @default_configuration = configuration
 
-      if @default_configuration
+      return unless @default_configuration
 
-        append(@default_configuration.raw_configuration[:databases] || {})
+      append(@default_configuration.raw_configuration[:databases] || {})
 
-        if @default_configuration.raw_configuration.include?(:fallback)
-          @fallback = @default_configuration.raw_configuration[:fallback]
-        elsif defined?(Rails)
-          @fallback = %w(development test).include?(Rails.env)
-        else
-          @fallback = false
-        end
-        @default_candidate = Candidate.new('default', @default_configuration.default_handler)
-        unless @candidates.include?(:default)
-          @candidates[:default] = [@default_candidate]
-        end
-      end
+      @fallback = if @default_configuration.raw_configuration.include?(:fallback)
+                    @default_configuration.raw_configuration[:fallback]
+                  elsif defined?(Rails)
+                    %w[development test].include?(Rails.env)
+                  else
+                    false
+                  end
+
+      @default_candidate = Candidate.new('default', @default_configuration.default_handler)
+
+      @candidates[:default] = [@default_candidate] unless @candidates.include?(:default)
     end
 
     def append(databases)
       databases.each_pair do |name, config|
         configs = config.is_a?(Array) ? config : [config]
-        configs.each do |config|
-          candidate = Candidate.new(name, @default_configuration.default_adapter.merge(config))
+        configs.each do |cfg|
+          if cfg['alias']
+            @candidates[name] = @candidates[cfg['alias']]
+            next
+          end
+
+          candidate = Candidate.new(name, @default_configuration.default_adapter.merge(cfg))
           @candidates[name] ||= []
           @candidates[name].push(candidate)
         end
@@ -39,16 +45,18 @@ module Multidb
       @candidates.values.flatten.each(&:disconnect!)
     end
 
-    def get(name, &block)
+    def get(name, &_block)
       candidates = @candidates[name]
       candidates ||= @fallback ? @candidates[:default] : []
+
       raise ArgumentError, "No such database connection '#{name}'" if candidates.empty?
-      candidate = candidates.respond_to?(:sample) ?
-        candidates.sample : candidates[rand(candidates.length)]
+
+      candidate = candidates.respond_to?(:sample) ? candidates.sample : candidates[rand(candidates.length)]
+
       block_given? ? yield(candidate) : candidate
     end
 
-    def use(name, &block)
+    def use(name, &_block)
       result = nil
       get(name) do |candidate|
         if block_given?
@@ -110,7 +118,5 @@ module Multidb
         Multidb.balancer.disconnect!
       end
     end
-
   end
-
 end

data/lib/multidb/candidate.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 module Multidb
   class Candidate
     def initialize(name, target)
       @name = name
 
-      if target.is_a?(Hash)
+      case target
+      when Hash
         @connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
         @connection_handler.establish_connection(target.merge(name: 'primary'))
-      elsif target.is_a?(ActiveRecord::ConnectionAdapters::ConnectionHandler)
+      when ActiveRecord::ConnectionAdapters::ConnectionHandler
         @connection_handler = target
       else
         raise ArgumentError, 'Connection handler not passed to target'
       end
-
     end
 
     def connection(&block)
@@ -28,4 +30,4 @@ module Multidb
 
     attr_reader :name
   end
-end
+end

data/lib/multidb/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Multidb
   class << self
     delegate :use, :get, :disconnect!, to: :balancer
@@ -5,17 +7,14 @@ module Multidb
 
   def self.init(config)
     activerecord_config = config.dup.with_indifferent_access
-    default_adapter, configuration_hash = activerecord_config, activerecord_config.delete(:multidb)
+    default_adapter = activerecord_config
+    configuration_hash = activerecord_config.delete(:multidb)
 
     @balancer = Balancer.new(Configuration.new(default_adapter, configuration_hash || {}))
   end
 
   def self.balancer
-    if @balancer
-      @balancer
-    else
-      raise NotInitializedError, "Balancer not initialized. You need to run Multidb.init first"
-    end
+    @balancer || raise(NotInitializedError, 'Balancer not initialized. You need to run Multidb.init first')
   end
 
   def self.reset!
@@ -31,8 +30,6 @@ module Multidb
       @raw_configuration = configuration_hash
     end
 
-    attr_reader :default_handler
-    attr_reader :default_adapter
-    attr_reader :raw_configuration
+    attr_reader :default_handler, :default_adapter, :raw_configuration
   end
-end
+end

data/lib/multidb/log_subscriber.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module Multidb
   module LogSubscriberExtension
     def sql(event)
-      if name = Multidb.balancer.current_connection_name
-        event.payload[:db_name] = name
-      end
+      name = Multidb.balancer.current_connection_name
+      event.payload[:db_name] = name if name
       super
     end
 
     def debug(msg)
-      if name = Multidb.balancer.current_connection_name
+      name = Multidb.balancer.current_connection_name
+      if name
         db = color("[DB: #{name}]", ActiveSupport::LogSubscriber::GREEN, true)
         super(db + msg)
       else

data/lib/multidb/model_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record/base'
 
 module Multidb

data/lib/multidb/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Multidb
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
 end

data/lib/multidb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 
 require 'active_support/core_ext/module/delegation'

data/spec/balancer_spec.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require_relative 'spec_helper'
 
 describe 'Multidb.balancer' do
-
   context 'with no configuration' do
     it 'raises exception' do
       -> { Multidb.balancer }.should raise_error(Multidb::NotInitializedError)
@@ -10,7 +11,7 @@ describe 'Multidb.balancer' do
 
   context 'with configuration' do
     before do
-      ActiveRecord::Base.establish_connection(configuration_with_slaves)
+      ActiveRecord::Base.establish_connection(configuration_with_replicas)
     end
 
     it 'returns balancer' do
@@ -28,30 +29,30 @@ describe 'Multidb.balancer' do
     end
 
     it 'returns default connection name for default connection' do
-      conn = ActiveRecord::Base.connection
+      ActiveRecord::Base.connection
 
       Multidb.balancer.current_connection_name.should eq :default
     end
-  
+
     context 'with additional configurations' do
       before do
-        additional_configuration = {slave4: { database: 'spec/test-slave4.sqlite' }}
+        additional_configuration = { replica4: { database: 'spec/test-replica4.sqlite' } }
         Multidb.balancer.append(additional_configuration)
       end
 
       it 'makes the new database available' do
-        Multidb.use(:slave4) do
+        Multidb.use(:replica4) do
           conn = ActiveRecord::Base.connection
           conn.should eq Multidb.balancer.current_connection
           list = conn.execute('pragma database_list')
           list.length.should eq 1
-          File.basename(list[0]['file']).should eq 'test-slave4.sqlite'
+          File.basename(list[0]['file']).should eq 'test-replica4.sqlite'
         end
       end
 
       it 'returns the connection name' do
-        Multidb.use(:slave4) do
-          Multidb.balancer.current_connection_name.should eq :slave4
+        Multidb.use(:replica4) do
+          Multidb.balancer.current_connection_name.should eq :replica4
         end
       end
     end
@@ -60,12 +61,12 @@ describe 'Multidb.balancer' do
   describe '#use' do
     context 'with configuration' do
       before do
-        ActiveRecord::Base.establish_connection(configuration_with_slaves)
+        ActiveRecord::Base.establish_connection(configuration_with_replicas)
       end
 
       context 'undefined connection' do
         it 'raises exception' do
-          -> {
+          lambda {
             Multidb.use(:something) do
             end
           }.should raise_error(ArgumentError)
@@ -73,7 +74,7 @@ describe 'Multidb.balancer' do
       end
 
       it 'returns default connection on :default' do
-        conn = ActiveRecord::Base.connection
+        ActiveRecord::Base.connection
         Multidb.use(:default) do
           conn2 = ActiveRecord::Base.connection
           conn2.should eq Multidb.balancer.current_connection
@@ -84,71 +85,77 @@ describe 'Multidb.balancer' do
         end
       end
 
-      it 'returns slave connection' do
-        Multidb.use(:slave1) do
+      it 'returns replica connection' do
+        Multidb.use(:replica1) do
           conn = ActiveRecord::Base.connection
           conn.should eq Multidb.balancer.current_connection
           list = conn.execute('pragma database_list')
           list.length.should eq 1
-          File.basename(list[0]['file']).should eq 'test-slave1.sqlite'
+          File.basename(list[0]['file']).should eq 'test-replica1.sqlite'
         end
       end
 
       it 'returns results instead of relation' do
-        class FooBar < ActiveRecord::Base; end
-        res = Multidb.use(:slave1) do
+        foobar_class = Class.new(ActiveRecord::Base) do
+          self.table_name = 'foo_bars'
+        end
+        res = Multidb.use(:replica1) do
           ActiveRecord::Migration.verbose = false
           ActiveRecord::Schema.define(version: 1) { create_table :foo_bars }
-          FooBar.where(id: 42)
+          foobar_class.where(id: 42)
         end
         res.should eq []
       end
 
-      it 'returns supports nested slave connection' do
-        Multidb.use(:slave1) do
-          Multidb.use(:slave2) do
+      it 'returns supports nested replica connection' do
+        Multidb.use(:replica1) do
+          Multidb.use(:replica2) do
             conn = ActiveRecord::Base.connection
             conn.should eq Multidb.balancer.current_connection
             list = conn.execute('pragma database_list')
             list.length.should eq 1
-            File.basename(list[0]['file']).should eq 'test-slave2.sqlite'
+            File.basename(list[0]['file']).should eq 'test-replica2.sqlite'
           end
         end
       end
 
       it 'returns preserves state when nesting' do
-        Multidb.use(:slave1) do
-          Multidb.use(:slave2) do
+        Multidb.use(:replica1) do
+          Multidb.use(:replica2) do
             conn = ActiveRecord::Base.connection
             conn.should eq Multidb.balancer.current_connection
             list = conn.execute('pragma database_list')
             list.length.should eq 1
-            File.basename(list[0]['file']).should eq 'test-slave2.sqlite'
+            File.basename(list[0]['file']).should eq 'test-replica2.sqlite'
           end
 
           conn = ActiveRecord::Base.connection
           conn.should eq Multidb.balancer.current_connection
           list = conn.execute('pragma database_list')
           list.length.should eq 1
-          File.basename(list[0]['file']).should eq 'test-slave1.sqlite'
+          File.basename(list[0]['file']).should eq 'test-replica1.sqlite'
         end
       end
 
+      it 'returns the parent connection for aliases' do
+        Multidb.use(:replica1).should_not eq Multidb.use(:replica_alias)
+        Multidb.use(:replica2).should eq Multidb.use(:replica_alias)
+      end
+
       it 'returns random candidate' do
         names = []
         100.times do
-          Multidb.use(:slave3) do
+          Multidb.use(:replica3) do
             list = ActiveRecord::Base.connection.execute('pragma database_list')
             list.length.should eq 1
             names.push(File.basename(list[0]['file']))
           end
         end
         names.sort.uniq.should eq [
-          'test-slave3-1.sqlite',
-          'test-slave3-2.sqlite'
+          'test-replica3-1.sqlite',
+          'test-replica3-2.sqlite'
         ]
       end
     end
   end
-
-end
+end

data/spec/helpers.rb

@@ -1,20 +1,23 @@
-module Helpers
+# frozen_string_literal: true
 
-  def configuration_with_slaves
-    return YAML.load(<<-end)
-adapter: sqlite3
-database: spec/test.sqlite
-encoding: utf-8
-multidb:
-  databases:
-    slave1:
-      database: spec/test-slave1.sqlite
-    slave2:
-      database: spec/test-slave2.sqlite
-    slave3:
-      - database: spec/test-slave3-1.sqlite
-      - database: spec/test-slave3-2.sqlite
-end
+module Helpers
+  def configuration_with_replicas
+    YAML.safe_load(<<~YAML)
+      adapter: sqlite3
+      database: spec/test.sqlite
+      encoding: utf-8
+      multidb:
+        databases:
+          replica1:
+            database: spec/test-replica1.sqlite
+          replica2:
+            database: spec/test-replica2.sqlite
+          replica3:
+            - database: spec/test-replica3-1.sqlite
+            - database: spec/test-replica3-2.sqlite
+          replica_alias:
+            database: spec/test-replica2.sqlite
+            alias: replica2
+    YAML
   end
-
-end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
-environment = ENV['RACK_ENV'] ||= 'test'
+# frozen_string_literal: true
+
+ENV['RACK_ENV'] ||= 'test'
 
 require 'rspec'
 require 'yaml'
 require 'active_record'
 require 'fileutils'
 
-$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
+$LOAD_PATH.unshift(File.expand_path('lib', __dir__))
 require 'multidb'
 
 require_relative 'helpers'
@@ -18,7 +20,7 @@ RSpec.configure do |config|
     Multidb.reset!
   end
   config.after :each do
-    Dir.glob(File.expand_path('../test*.sqlite', __FILE__)).each do |f|
+    Dir.glob(File.expand_path('test*.sqlite', __dir__)).each do |f|
       FileUtils.rm(f)
     end
   end

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: ar-multidb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Alexander Staubo
-autorequire: 
+- Edward Rudd
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,19 +28,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,61 +48,78 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
-    - - "<="
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: Multidb is an ActiveRecord extension for switching between multiple database
-  connections, such as master/slave setups.
+  connections, such as primary/replica setups.
 email:
 - alex@bengler.no
+- urkle@outoforder.cc
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.markdown
@@ -109,6 +127,7 @@ files:
 - ar-multidb.gemspec
 - gemfiles/activerecord51.gemfile
 - gemfiles/activerecord52.gemfile
+- gemfiles/activerecord60.gemfile
 - lib/ar-multidb.rb
 - lib/multidb.rb
 - lib/multidb/balancer.rb
@@ -121,9 +140,10 @@ files:
 - spec/helpers.rb
 - spec/spec_helper.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,19 +151,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ar-multidb
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Multidb is an ActiveRecord extension for switching between multiple database
-  connections, such as master/slave setups.
+  connections, such as primary/replica setups.
 test_files:
 - spec/balancer_spec.rb
 - spec/helpers.rb