fresh_connection 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42d31d4d7dd4dff53494ddcb9e0b79162c4b4e0dd21dcbb49f58de3eb16de8a
-  data.tar.gz: eeb1e26a61e73dc041b9e1e41722eb98bd509a0eac919033353c941a8a4fd7b0
+  metadata.gz: d21ad20eb5180bd0bfd7c7e4ec352328e73f4be954215aa49ea7056442738490
+  data.tar.gz: 0f7acb28bd1c0fb738491036aa617e43ea0d994fef71d7151d0b977bbd9a28e8
 SHA512:
-  metadata.gz: dad510ed81c9a392cdecad5d30a1183bf21df98d82be8b3f6a8828a5d88ea507cd0bcf0fe49d43ae00bb7d32ad9ebf027d759a2276c9561f45dc66bef6ee4533
-  data.tar.gz: a9983d1bb6cb5f71ca75da62d05d49a09ef1a2105ca07990a16a5a4b89bbdb7f7e27fc4ad068914e8c9f5ccff9d1b55f1dde2e78c9c734be234d8a1d3375663f
+  metadata.gz: 70d6f0fbb318ac1687e2ac2fe915c213fd25403f2938aa43037c0aa9bc618a29eaeb0806638390778b364ab7b8dde3488bd5f380cd31fd3ce68a04005793ddd8
+  data.tar.gz: 820751f83fb8f143c700ad6073a72ee2d7427a9e907984c7afe7ed970d90bee40d913550c5f95ce3baff6e1fc3efd3388d6ff93d49039fda7ff206cc0fa84f1c

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 gemfiles/*.lock
 log/*
 .*.sw[a-z]
+/bin/test_local

data/.travis.yml

@@ -2,22 +2,18 @@ language: ruby
 services:
   - mysql
   - postgresql
-before_script:
-  - bundle update
-  - cp test/config/database_postgresql.yml.travis test/config/database_postgresql.yml
-  - psql -c 'create database fresh_connection_test_master;' -U postgres
-  - psql -c 'create database fresh_connection_test_replica1;' -U postgres
-  - psql -c 'create database fresh_connection_test_replica2;' -U postgres
-cache: bundler
+before_install:
+  - gem update --system
+  - gem --version
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 gemfile:
-  - gemfiles/rails50.gemfile
-  - gemfiles/rails51.gemfile
   - gemfiles/rails52.gemfile
+  - gemfiles/rails60.gemfile
+script:
+  - "bin/test"
 matrix:
   fast_finish: true
 bundler_args: --jobs 3 --retry 3

data/Appraisals

@@ -1,20 +1,8 @@
-appraise "rails50" do
-  gem 'activerecord', '~> 5.0.0'
-  gem 'activesupport', '~> 5.0.0'
-  gem 'mysql2', '>= 0.3.18', '< 0.6.0'
-  gem 'pg', '>= 0.18', '< 2.0'
-end
-
-appraise "rails51" do
-  gem 'activerecord', '~> 5.1.0'
-  gem 'activesupport', '~> 5.1.0'
-  gem 'mysql2', '>= 0.3.18', '< 0.6.0'
-  gem 'pg', '>= 0.18', '< 2.0'
-end
-
 appraise "rails52" do
   gem 'activerecord', '~> 5.2.0'
-  gem 'activesupport', '~> 5.2.0'
-  gem 'mysql2', '>= 0.4.4', '< 0.6.0'
-  gem 'pg', '>= 0.18', '< 2.0'
+  gem 'mysql2', '>= 0.4.4', "< 0.6.0"
+end
+
+appraise "rails60" do
+  gem 'activerecord', '~> 6.0.0'
 end

data/README.md

@@ -29,8 +29,6 @@ FreshConnction connects one or more configured DB replicas, or with multiple rep
 - Write queries go to the DB master.
 - Within a transaction, all queries go to the DB master.
 
-If you wish to use multiple DB replicas on any given connection but do not have a load balancer (such as [`pgbouncer`](https://pgbouncer.github.io) for Posgres databases), you can use [EbisuConnection](https://github.com/tsukasaoishi/ebisu_connection).
-
 ### Failover
 FreshConnection assumes that there is a load balancer in front of multi replica servers.  
 When what happens one of the replicas is unreachable for any reason, FreshConnection will try three retries to access to a replica via a load balancer.  
@@ -80,8 +78,12 @@ old_article.destroy
 
 ## ActiveRecord Versions Supported
 
-- FreshConnection supports ActiveRecord version 5.0 or later.
-- If you are using Rails 4.2, you can use FreshConnection version 2.4.4 or before.
+- FreshConnection supports ActiveRecord version 5.2 or later.
+- If you are using Rails 5.1, you can use FreshConnection version 3.0.3 or before.
+
+### Not Support Multiple Database
+I haven't tested it in an environment using MultipleDB in Rails 6.
+I plan to enable use with MultipleDB in FreshConnection version 4.0 or later.
 
 ## Databases Supported
 FreshConnection currently supports MySQL and PostgreSQL.

data/Rakefile

@@ -1,20 +1,13 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
 
-desc 'Run mysql2 and postgresql tests'
+desc 'Run tests'
 task :test do
-  Rake::Task["test:mysql2"].invoke
-  Rake::Task["test:postgresql"].invoke
-end
-
-namespace :test do
-  %w(mysql2 postgresql).each do |test_name|
-    Rake::TestTask.new(test_name) do |t|
-      t.libs << "test"
-      t.libs << "lib"
-      t.test_files = FileList["test/config/prepare_#{test_name}", 'test/**/*_test.rb']
-      t.verbose = true
-    end
+  Rake::TestTask.new do |t|
+    t.libs << "test"
+    t.libs << "lib"
+    t.test_files = FileList['test/**/*_test.rb']
+    t.verbose = true
   end
 end
 

data/bin/setup

@@ -3,7 +3,8 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install --path .bundle
+bundle config set path '.bundle'
+bundle install
 bundle exec appraisal install
 
 # Do any other automated setup that you need to do here

data/bin/test

@@ -2,16 +2,23 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-for dbname in fresh_connection_test_master fresh_connection_test_replica1 fresh_connection_test_replica2 ; do
-  if ! psql $dbname -c '\q' 2>/dev/null ; then
-    if [[ -n "`psql -l | grep \"$dbname\"`" ]]; then
-      echo "Dropping database $dbname .."
-      dropdb $dbname
-    fi
-    echo "Creating database $dbname .."
-    createdb $dbname
-  fi
-done
-
 set -vx
-bundle exec appraisal rake test
+
+if [ -v DATABASE_URL ]; then
+  echo "[specified config]"
+  bundle exec rake test
+else
+  echo "[mysql]"
+  DATABASE_URL="mysql2://root@localhost/fresh_connection_test_master" \
+    DATABASE_REPLICA1_URL="mysql2://root@localhost/fresh_connection_test_replica1" \
+    DATABASE_REPLICA2_URL="mysql2://root@localhost/fresh_connection_test_replica2" \
+    DATABASE_FAKE_REPLICA_URL="mysql2://root@localhost/fresh_connection_test_master" \
+    bundle exec rake test
+
+  echo "[postgresql]"
+  DATABASE_URL="postgresql://localhost/fresh_connection_test_master" \
+    DATABASE_REPLICA1_URL="postgresql://localhost/fresh_connection_test_replica1" \
+    DATABASE_REPLICA2_URL="postgresql://localhost/fresh_connection_test_replica2" \
+    DATABASE_FAKE_REPLICA_URL="postgresql://localhost/fresh_connection_test_master" \
+    bundle exec rake test
+fi

data/fresh_connection.gemspec

@@ -19,16 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.2'
+  spec.add_dependency 'activerecord', '>= 5.2.0', '< 6.1'
 
-  spec.add_dependency 'activerecord', '>= 5.0.0', '< 5.3'
-  spec.add_dependency 'activesupport', '>= 5.0.0', '< 5.3'
-  spec.add_dependency 'concurrent-ruby', '~> 1.0'
-
-  spec.add_development_dependency 'mysql2', '>= 0.3.18', '< 0.6.0'
+  spec.add_development_dependency 'mysql2', '>= 0.4.4'
   spec.add_development_dependency 'pg', '>= 0.18', '< 2.0'
-  spec.add_development_dependency "bundler", ">= 1.3.0", "< 2.0"
-  spec.add_development_dependency "rake", ">= 0.8.7"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency "minitest", "~> 5.10.0"
   spec.add_development_dependency "minitest-reporters"

data/gemfiles/rails52.gemfile

@@ -3,8 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.2.0"
-gem "activesupport", "~> 5.2.0"
 gem "mysql2", ">= 0.4.4", "< 0.6.0"
-gem "pg", ">= 0.18", "< 2.0"
 
 gemspec path: "../"

data/gemfiles/rails60.gemfile

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

data/lib/fresh_connection.rb

@@ -15,10 +15,6 @@ module FreshConnection
       FreshConnection::ReplicaConnectionHandler.instance.refresh_all
       @connection_manager = mgr
     end
-
-    def rails_52?
-      [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [5, 2]
-    end
   end
 end
 

data/lib/fresh_connection/connection_specification.rb

@@ -16,7 +16,7 @@ module FreshConnection
     private
 
     def resolver
-      ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(@spec_name => build_config)
+      ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(build_config)
     end
 
     def build_config
@@ -26,7 +26,12 @@ module FreshConnection
       config = config.merge(s_config) if s_config
 
       config = config.merge(@modify_spec) if defined?(@modify_spec)
-      config
+
+      if defined?(ActiveRecord::DatabaseConfigurations)
+        ActiveRecord::DatabaseConfigurations.new(@spec_name => config)
+      else
+        { @spec_name => config }
+      end
     end
 
     def replica_config(config)

data/lib/fresh_connection/extend.rb

@@ -2,6 +2,10 @@
 require 'active_support'
 
 ActiveSupport.on_load(:active_record) do
+  if respond_to?(:connection_handlers) && connection_handlers.empty?
+    self.connection_handlers = { writing_role => ActiveRecord::Base.default_connection_handler }
+  end
+
   require 'fresh_connection/extend/ar_base'
   require 'fresh_connection/extend/ar_relation'
   require 'fresh_connection/extend/ar_relation_merger'

data/lib/fresh_connection/extend/ar_statement_cache.rb

@@ -3,14 +3,8 @@
 module FreshConnection
   module Extend
     module ArStatementCache
-      if FreshConnection.rails_52?
-        def execute(params, connection, &block)
-          klass.all.manage_access { super }
-        end
-      else
-        def execute(params, klass, connection, &block)
-          klass.all.manage_access { super }
-        end
+      def execute(params, connection, &block)
+        klass.all.manage_access { super }
       end
     end
   end

data/lib/fresh_connection/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module FreshConnection
-  VERSION = "3.0.3"
+  VERSION = "3.1.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fresh_connection
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Tsukasa OISHI
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,74 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.18
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -104,40 +64,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -214,9 +154,8 @@ files:
 - bin/setup
 - bin/test
 - fresh_connection.gemspec
-- gemfiles/rails50.gemfile
-- gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - lib/fresh_connection.rb
 - lib/fresh_connection/abstract_connection_manager.rb
 - lib/fresh_connection/access_control.rb
@@ -248,15 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: FreshConnection supports connections with configured replica servers.

data/gemfiles/rails50.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-gem "activesupport", "~> 5.0.0"
-gem "mysql2", ">= 0.3.18", "< 0.6.0"
-gem "pg", ">= 0.18", "< 2.0"
-
-gemspec path: "../"

data/gemfiles/rails51.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.0"
-gem "activesupport", "~> 5.1.0"
-gem "mysql2", ">= 0.3.18", "< 0.6.0"
-gem "pg", ">= 0.18", "< 2.0"
-
-gemspec path: "../"