switch_point 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4afa0b36c03b080fc4800b6237d223dc185c9128
-  data.tar.gz: 5c06160f5c593b5b0798535af848e925d74b1d67
+SHA256:
+  metadata.gz: 2e3915fe82c56723bcc2ac31421b8158cadde91d89378ff5769c846cba2899fd
+  data.tar.gz: c98d107a1108cbacb334823219e06d14cfafdc24ba9f4dc821f479d96b531987
 SHA512:
-  metadata.gz: d910ecf318574828396c4bfcf384dff8ee1f6282693ff19f000115ea92c3dea3df896271ea9b62e23ccbb5baab1ea8cd7337e337bbcbad5fb407bc019ef77195
-  data.tar.gz: 397bfbe529603a7f4d588c013e1e3ed75774559df8a377c33dd7330651e137741de7cd65337ca2d6b98a4276d02520f5cb5106d7ec75dc99f6f0521cdb7185a3
+  metadata.gz: 2eec3b0ca5d8d22b5fb9f302c0c9b7dfa71409c7e1d49a8bca4d760eda64f4b9bb1d4779284fa3cccfdebee734aa2d67bb66de315519f461de6d98c983aa7365
+  data.tar.gz: 2ed6d067c24d5642f5e92267014563898c4212fc5c2e31c6cf892e5846979f53c33c139a9528762a3f5058272ad13ea294a60e6158e7ea247c20600156e7168b

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+/gemfiles/*.lock

data/.rubocop.yml

@@ -1,48 +1,56 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
+  NewCops: enable
+  Exclude:
+    - gemfiles/*.gemfile
 
-Performance/RedundantBlockCall:
+Layout/ArgumentAlignment:
   Enabled: false
-
-Style/AlignParameters:
+Layout/LineLength:
+  Enabled: false
+Layout/ParameterAlignment:
   Enabled: false
 
+Naming/FileName:
+  Exclude:
+    - Appraisals
+
+Style/AccessModifierDeclarations:
+  Enabled: false
 Style/Alias:
   EnforcedStyle: prefer_alias_method
-
 Style/BlockDelimiters:
   Enabled: false
-
 Style/GuardClause:
   Enabled: false
-
 Style/HashSyntax:
   Exclude:
     - Rakefile
-
 Style/IfUnlessModifier:
   Enabled: false
-
 Style/Lambda:
   Enabled: false
-
 Style/Next:
   Enabled: false
-
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%w': '[]'
-
 Style/RaiseArgs:
   EnforcedStyle: compact
-
+Style/SafeNavigation:
+  Enabled: false
 Style/SignalException:
   Enabled: false
-
-Style/TrailingCommaInLiteral:
+Style/SoleNestedConditional:
   Enabled: false
-
 Style/TrailingCommaInArguments:
   Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+Metrics:
+  Enabled: false

data/.rubocop_todo.yml

@@ -1,17 +1,2 @@
-Metrics/AbcSize:
-  Enabled: false
-
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/CyclomaticComplexity:
-  Enabled: false
-
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/MethodLength:
-  Enabled: false
-
 Style/Documentation:
   Enabled: false

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - jruby-9.1.0.0
-  - jruby-head
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
   - ruby-head
 gemfile:
   - gemfiles/rails_3.2.gemfile
@@ -11,16 +10,21 @@ gemfile:
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_edge.gemfile
-sudo: false
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 after_script:
   - bundle exec rake benchmark
-matrix:
+jobs:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
-    - gemfile: gemfiles/rails_edge.gemfile
-    # Wait for activerecord-jdbcsqlite3-adapter's support
-    # https://github.com/jruby/activerecord-jdbc-adapter/labels/rails-5.x
-    - rvm: jruby-9.1.0.0
-      gemfile: gemfiles/rails_5.0.gemfile
+  exclude:
+  # Rails 3.2 - 4.2 doesn't support Ruby 2.7
+  - rvm: 2.7.2
+    gemfile: gemfiles/rails_3.2.gemfile
+  - rvm: 2.7.2
+    gemfile: gemfiles/rails_4.0.gemfile
+  - rvm: 2.7.2
+    gemfile: gemfiles/rails_4.1.gemfile
+  - rvm: 2.7.2
+    gemfile: gemfiles/rails_4.2.gemfile

data/Appraisals

@@ -1,79 +1,66 @@
+# frozen_string_literal: true
+
 appraise 'rails-3.2' do
-  gem 'activerecord', '~> 3.2'
+  gem 'activerecord', '~> 3.2.0'
 
   platforms :ruby do
-    gem 'sqlite3'
-  end
-
-  platforms :jruby do
-    gem 'json'
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'sqlite3', '~> 1.3.5'
   end
 end
 
 appraise 'rails-4.0' do
-  gem 'activerecord', '~> 4.0'
+  gem 'activerecord', '~> 4.0.0'
 
   platforms :ruby do
-    gem 'sqlite3'
-  end
-
-  platforms :jruby do
-    gem 'json'
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'sqlite3', '~> 1.3.6'
   end
 end
 
 appraise 'rails-4.1' do
-  gem 'activerecord', '~> 4.1'
+  gem 'activerecord', '~> 4.1.0'
 
   platforms :ruby do
-    gem 'sqlite3'
-  end
-
-  platforms :jruby do
-    gem 'json'
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'sqlite3', '~> 1.3.6'
   end
 end
 
 appraise 'rails-4.2' do
-  gem 'activerecord', '~> 4.2'
+  gem 'activerecord', '~> 4.2.0'
 
   platforms :ruby do
-    gem 'sqlite3'
-  end
-
-  platforms :jruby do
-    gem 'json'
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'sqlite3', '~> 1.3.6'
   end
 end
 
 appraise 'rails-5.0' do
-  gem 'activerecord', '>= 5.0.0.rc1'
+  gem 'activerecord', '~> 5.0.0'
 
   platforms :ruby do
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.6'
   end
+end
+
+appraise 'rails-5.1' do
+  gem 'activerecord', '~> 5.1.0'
 
-  platforms :jruby do
-    gem 'json'
-    gem 'activerecord-jdbcsqlite3-adapter'
+  platforms :ruby do
+    gem 'sqlite3'
   end
 end
 
-appraise 'rails-edge' do
-  gem 'activerecord', git: 'https://github.com/rails/rails'
-  gem 'arel', git: 'https://github.com/rails/arel'
+appraise 'rails-5.2' do
+  gem 'activerecord', '~> 5.2.0'
 
   platforms :ruby do
     gem 'sqlite3'
   end
+end
+
+appraise 'rails-6.0' do
+  gem 'activerecord', '~> 6.0.0'
 
-  platforms :jruby do
-    gem 'json'
-    gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
+  platforms :ruby do
+    gem 'sqlite3'
   end
 end
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.0 (2020-11-22)
+- Drop support for Ruby 2.2, 2.3 and 2.4
+- End support for upcoming ActiveRecord >= v6.1
+
 ## 0.8.0 (2016-06-06)
 - Drop Ruby 2.0.0 and 2.1 support
 - Add `AR::Base#with_readonly` and `AR::Base#with_writable`

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in switch_point.gemspec
@@ -6,8 +8,3 @@ gemspec
 platforms :ruby do
   gem 'sqlite3'
 end
-
-platforms :jruby do
-  gem 'json'
-  gem 'activerecord-jdbcsqlite3-adapter'
-end

data/README.md

@@ -6,6 +6,23 @@
 
 Switching database connection between readonly one and writable one.
 
+## Maintenance notice
+switch_point won't support upcoming ActiveRecord v6.1 or later.
+Developers should use the builtin multiple database feature introduced in ActiveRecord v6.0.
+https://guides.rubyonrails.org/active_record_multiple_databases.html
+Thus the supported ActiveRecord version is v3.2, v4.0, v4.1, v4.2, v5.0, v5.1, and v5.2.
+
+switch_point won't accept any new features. Bug fixes might be accepted.
+If you'd like to add a new feature (and/or support ActiveRecord >= v6.1), feel free to fork switch_point gem.
+
+### Migration from switch_point to ActiveRecord multiple database feature
+1. Upgrade your activerecord gem to v6.0
+    - ActiveRecord v6.0 is the only series which supports both builtin multiple database feature and switch_point.
+2. Change your application to use ActiveRecord multiple database feature
+    - If you'd like to keep the number of connections during this step, it would require some tricks.
+3. Remove switch_point gem from your Gemfile
+4. Upgrade your activerecord gem to v6.1 or later
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
-task :default => [:spec, :rubocop]
+task :default => %i[spec rubocop]
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)

data/benchmark/proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'benchmark/ips'
 require 'switch_point'
 require 'active_record'
@@ -32,7 +34,7 @@ ActiveRecord::Base.configurations = {
 ActiveRecord::Base.establish_connection(:default)
 
 Plain.connection.execute('CREATE TABLE plains (id integer primary key autoincrement)')
-[:readonly, :writable].each do |mode|
+%i[readonly writable].each do |mode|
   ProxyBase.public_send("with_#{mode}") do
     %w[proxy1s proxy2s].each do |table|
       ProxyBase.connection.execute("CREATE TABLE #{table} (id integer primary key autoincrement)")

data/gemfiles/rails_3.2.gemfile

@@ -2,15 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2"
+gem "activerecord", "~> 3.2.0"
 
 platforms :ruby do
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.5"
 end
 
-platforms :jruby do
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.0.gemfile

@@ -2,15 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.0"
+gem "activerecord", "~> 4.0.0"
 
 platforms :ruby do
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.6"
 end
 
-platforms :jruby do
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.1.gemfile

@@ -2,15 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.1"
+gem "activerecord", "~> 4.1.0"
 
 platforms :ruby do
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.6"
 end
 
-platforms :jruby do
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,15 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2"
+gem "activerecord", "~> 4.2.0"
 
 platforms :ruby do
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.6"
 end
 
-platforms :jruby do
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -2,15 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", ">= 5.0.0.rc1"
+gem "activerecord", "~> 5.0.0"
 
 platforms :ruby do
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.6"
 end
 
-platforms :jruby do
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+
+platforms :ruby do
+  gem "sqlite3"
+end
+
+gemspec path: "../"

data/lib/switch_point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/lazy_load_hooks'
 require 'switch_point/config'
 require 'switch_point/version'
@@ -13,7 +15,7 @@ module SwitchPoint
     end
 
     def readonly_all!
-      config.keys.each do |name|
+      config.each_key do |name|
         readonly!(name)
       end
     end
@@ -23,7 +25,7 @@ module SwitchPoint
     end
 
     def writable_all!
-      config.keys.each do |name|
+      config.each_key do |name|
         writable!(name)
       end
     end
@@ -64,7 +66,7 @@ ActiveSupport.on_load(:active_record) do
   require 'switch_point/model'
   require 'switch_point/query_cache'
 
-  ActiveRecord::Base.send(:include, SwitchPoint::Model)
+  ActiveRecord::Base.include SwitchPoint::Model
   ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
     prepend SwitchPoint::Connection
   end

data/lib/switch_point/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchPoint
   class Config
     attr_accessor :auto_writable
@@ -34,12 +36,17 @@ module SwitchPoint
       switch_points.keys
     end
 
+    def each_key(&block)
+      switch_points.each_key(&block)
+    end
+
     private
 
     def assert_valid_config!(config)
       unless config.key?(:readonly) || config.key?(:writable)
         raise ArgumentError.new(':readonly or :writable must be specified')
       end
+
       if config.key?(:readonly)
         unless config[:readonly].is_a?(Symbol)
           raise TypeError.new(":readonly's value must be Symbol")

data/lib/switch_point/connection.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'switch_point/error'
 require 'switch_point/proxy_repository'
 
 module SwitchPoint
   module Connection
     # See ActiveRecord::ConnectionAdapters::QueryCache
-    DESTRUCTIVE_METHODS = [:insert, :update, :delete].freeze
+    DESTRUCTIVE_METHODS = %i[insert update delete].freeze
 
     DESTRUCTIVE_METHODS.each do |method_name|
       define_method(method_name) do |*args, &block|
@@ -26,6 +28,7 @@ module SwitchPoint
           if switch_point[:mode] != :writable
             raise Error.new("ActiveRecord::Base's switch_points must be writable, but #{switch_point[:name]} is #{switch_point[:mode]}")
           end
+
           purge_readonly_query_cache(proxy)
         end
       end

data/lib/switch_point/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchPoint
   class Error < StandardError
   end

data/lib/switch_point/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switch_point/error'
 require 'switch_point/proxy_repository'
 

data/lib/switch_point/proxy.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'switch_point/error'
 
 module SwitchPoint
   class Proxy
     attr_reader :initial_name
 
-    AVAILABLE_MODES = [:writable, :readonly].freeze
+    AVAILABLE_MODES = %i[writable readonly].freeze
     DEFAULT_MODE = :readonly
 
     def initialize(name)
@@ -28,7 +30,7 @@ module SwitchPoint
         # Re-use writable connection
         Proxy.const_get(SwitchPoint.config.model_name(name, :writable))
       else
-        Class.new(ActiveRecord::Base)
+        ActiveRecord::Base
       end
     end
 
@@ -38,6 +40,7 @@ module SwitchPoint
         if mode != :writable
           raise Error.new("ActiveRecord::Base's switch_points must be writable, but #{name} is #{mode}")
         end
+
         switch_points = pool.spec.config[:switch_points] || []
         switch_points << switch_point
         pool.spec.config[:switch_points] = switch_points
@@ -97,6 +100,7 @@ module SwitchPoint
       unless AVAILABLE_MODES.include?(new_mode)
         raise ArgumentError.new("Unknown mode: #{new_mode}")
       end
+
       saved_mode = thread_local_mode
       self.thread_local_mode = new_mode
       block.call

data/lib/switch_point/proxy_repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 require 'switch_point/proxy'
 

data/lib/switch_point/query_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchPoint
   class QueryCache
     def initialize(app, names = nil)

data/lib/switch_point/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchPoint
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.0'
 end

data/spec/models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SwitchPoint.configure do |config|
   config.define_switch_point :main,
     readonly: :main_readonly,
@@ -30,8 +32,7 @@ class Book < ActiveRecord::Base
 
   private
 
-  def do_after_save
-  end
+  def do_after_save; end
 end
 
 class Book2 < ActiveRecord::Base
@@ -91,7 +92,7 @@ base =
   else
     { adapter: 'sqlite3' }
   end
-ActiveRecord::Base.configurations = {
+databases = {
   'main_readonly' => base.merge(database: 'main_readonly.sqlite3'),
   'main_writable' => base.merge(database: 'main_writable.sqlite3'),
   'main2_readonly' => base.merge(database: 'main2_readonly.sqlite3'),
@@ -100,8 +101,15 @@ ActiveRecord::Base.configurations = {
   'user' => base.merge(database: 'user.sqlite3'),
   'comment_readonly' => base.merge(database: 'comment_readonly.sqlite3'),
   'comment_writable' => base.merge(database: 'comment_writable.sqlite3'),
-  'default' => base.merge(database: 'default.sqlite3')
+  'default' => base.merge(database: 'default.sqlite3'),
 }
+ActiveRecord::Base.configurations =
+  # ActiveRecord.gem_version was introduced in ActiveRecord 4.0
+  if ActiveRecord.respond_to?(:gem_version) && ActiveRecord.gem_version >= Gem::Version.new('5.1.0')
+    { 'test' => databases }
+  else
+    databases
+  end
 ActiveRecord::Base.establish_connection(:default)
 
 # XXX: Check connection laziness

data/spec/spec_helper.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] ||= 'test'
+
 require 'coveralls'
 require 'simplecov'
 
@@ -57,8 +61,14 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    ActiveRecord::Base.configurations.each_value do |c|
-      FileUtils.rm_f(c[:database])
+    if ActiveRecord::Base.configurations.respond_to?(:configs_for)
+      ActiveRecord::Base.configurations.configs_for.each do |c|
+        FileUtils.rm_f(c.config['database'])
+      end
+    else
+      ActiveRecord::Base.configurations.each_value do |c|
+        FileUtils.rm_f(c[:database])
+      end
     end
   end
 

data/spec/switch_point/model_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe SwitchPoint::Model do
   describe '.use_switch_point' do
     after do
@@ -436,7 +438,7 @@ RSpec.describe SwitchPoint::Model do
       end
       expect(Book.with_writable { Book.count }).to eq(1)
 
-      expect { book.transaction_with(Book3) {} }.to raise_error(SwitchPoint::Error)
+      expect { book.transaction_with(Book3) {} }.to raise_error(SwitchPoint::Error) # rubocop:disable Lint/EmptyBlock
     end
   end
 

data/spec/switch_point/query_cache_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rack'
 
@@ -23,6 +25,16 @@ RSpec.describe SwitchPoint::QueryCache do
   end
 
   describe '#call' do
+    before do
+      # Ensure the connection is established.
+      # The query cache is enabled only when connected.
+      # https://github.com/rails/rails/commit/25fc1f584def4c1bc36be805833194d8aee55b3a
+      [Nanika1, Nanika2].each do |model|
+        model.with_readonly { model.connection }
+        model.with_writable { model.connection }
+      end
+    end
+
     it 'enables query cache of all models' do
       env = {}
       expect(app.call(env)).to eq(:result)
@@ -35,7 +47,7 @@ RSpec.describe SwitchPoint::QueryCache do
     context 'when names are specified' do
       let(:app) do
         Rack::Builder.new do
-          use SwitchPoint::QueryCache, [:main, :nanika1]
+          use SwitchPoint::QueryCache, %i[main nanika1]
           run TestApp.new
         end
       end

data/spec/switch_point_spec.rb

@@ -1,4 +1,50 @@
+# frozen_string_literal: true
+
 RSpec.describe SwitchPoint do
+  describe '.writable_all!' do
+    after do
+      SwitchPoint.readonly_all!
+    end
+
+    it 'changes connection globally' do
+      expect(Book).to connect_to('main_readonly.sqlite3')
+      expect(Book3).to connect_to('main2_readonly.sqlite3')
+      expect(Comment).to connect_to('comment_readonly.sqlite3')
+      expect(User).to connect_to('user.sqlite3')
+      expect(BigData).to connect_to('main_readonly_special.sqlite3')
+      SwitchPoint.writable_all!
+      expect(Book).to connect_to('main_writable.sqlite3')
+      expect(Book3).to connect_to('main2_writable.sqlite3')
+      expect(Comment).to connect_to('comment_writable.sqlite3')
+      expect(User).to connect_to('user.sqlite3')
+      expect(BigData).to connect_to('main_writable.sqlite3')
+    end
+
+    it 'affects thread-globally' do
+      SwitchPoint.writable_all!
+      Thread.start do
+        expect(Book).to connect_to('main_writable.sqlite3')
+        expect(Book3).to connect_to('main2_writable.sqlite3')
+        expect(Comment).to connect_to('comment_writable.sqlite3')
+        expect(User).to connect_to('user.sqlite3')
+        expect(BigData).to connect_to('main_writable.sqlite3')
+      end.join
+    end
+
+    context 'within with block' do
+      it 'changes the current mode' do
+        SwitchPoint.writable_all!
+        Book.with_readonly do
+          expect(Book).to connect_to('main_readonly.sqlite3')
+        end
+        expect(Book).to connect_to('main_writable.sqlite3')
+        Book.with_writable do
+          expect(Book).to connect_to('main_writable.sqlite3')
+        end
+      end
+    end
+  end
+
   describe '.writable!' do
     after do
       SwitchPoint.readonly!(:main)

data/switch_point.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'switch_point/version'
 
@@ -17,16 +18,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.2.0'
+  spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'benchmark-ips'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'coveralls', '>= 0.8.22'
   spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0'
-  spec.add_development_dependency 'rubocop', '>= 0.37.0'
-  spec.add_development_dependency 'simplecov', '>= 0.9.0'
-  spec.add_dependency 'activerecord', '>= 3.2.0'
+  spec.add_development_dependency 'rubocop', '>= 0.50.0'
+  spec.add_development_dependency 'simplecov', '~> 0.16.1'  # XXX: The latest coveralls still depends on old version
+  spec.add_dependency 'activerecord', '>= 3.2.0', '< 6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switch_point
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Kohei Suzuki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.22
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,6 +153,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 description: Switching database connection between readonly one and writable one.
 email:
 - eagletmt@gmail.com
@@ -175,7 +181,9 @@ files:
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
-- gemfiles/rails_edge.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/switch_point.rb
 - lib/switch_point/config.rb
 - lib/switch_point/connection.rb
@@ -195,7 +203,7 @@ homepage: https://github.com/eagletmt/switch_point
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,16 +211,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Switching database connection between readonly one and writable one.
 test_files:

data/gemfiles/rails_edge.gemfile

@@ -1,17 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", :git => "https://github.com/rails/rails"
-gem "arel", :git => "https://github.com/rails/arel"
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "json"
-  gem "activerecord-jdbcsqlite3-adapter", :git => "https://github.com/jruby/activerecord-jdbc-adapter", :branch => "master"
-end
-
-gemspec :path => "../"