octoshark 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743be64d2aeb897827aec871dfd86150ea1ca7ce6505839cea1caf16e85676bc
-  data.tar.gz: a801773571a7388fed3d16179be6006d10a6e060fb514813a2e21ba3532816ee
+  metadata.gz: 73492e9db9cf09a361e5be45ffd95b3557e2bfa70ddb102c60631d72ffa69ad2
+  data.tar.gz: f12275deb8e0e43ccc0f8b4b91975fa84808d2481ffb5e6698b55fd888d72bda
 SHA512:
-  metadata.gz: 2fa8e793d0eae00f5d99420e1f3b5bc6218b9b5a5b8c27b0c63dbbde080265d5797cc4d56cbce049cd25459e0f8961228f0acb5d677f35f1de45a42fbd82f610
-  data.tar.gz: 16f82b5d43d619ff5d8691229a8377189c10ef3b9d20752649d2e63725bff171afe9f232d2300916b573bff7260ff63d92be08bae567934ff7751285d6240728
+  metadata.gz: 03751f458070db1b198c4c5cf9820d1269308758fc950fc42126d5f75c321e77b411a1959d2da0de69432b5c5d35cbdeb8ec7f78f378fcc1e39c7220179937b2
+  data.tar.gz: 5d2f7ff3902769fcd8b838215e40f0b9bc53dc8333c57fb88588b79732f11bd186a6f711f621d56ae00b955f8a4adf3ec52fc6698813569fdd14e87279a6b2ae

data/.github/workflows/build.yml

@@ -0,0 +1,130 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - master
+
+jobs:
+  legacy:
+    runs-on: ubuntu-18.04
+    services:
+      mysql:
+        image: mysql:5.5
+        env:
+          MYSQL_ROOT_PASSWORD: pass
+        ports:
+          - "3306:3306"
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
+    strategy:
+      matrix:
+        include:
+          - gemfile: rails3.0
+            ruby: 2.4
+          - gemfile: rails3.1
+            ruby: 2.4
+          - gemfile: rails3.2
+            ruby: 2.4
+
+          - gemfile: rails4.0
+            ruby: 2.4
+          - gemfile: rails4.1
+            ruby: 2.4
+          - gemfile: rails4.2
+            ruby: 2.4
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: default
+          bundler-cache: true
+
+      - name: Set up database
+        run: |
+          cp spec/support/config.yml.github spec/support/config.yml
+          bundle exec rake db:create
+
+      - name: Run tests
+        run: |
+          bundle exec rspec spec
+
+
+  latest:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: pass
+        ports:
+          - "3306:3306"
+        options: >-
+          --health-cmd="mysqladmin ping"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+
+    name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
+    strategy:
+      matrix:
+        include:
+          - gemfile: rails5.0
+            ruby: 2.6
+          - gemfile: rails5.1
+            ruby: 2.6
+          - gemfile: rails5.2
+            ruby: 2.6
+          - gemfile: rails5.2
+            ruby: 3.0
+
+          - gemfile: rails6.0
+            ruby: 2.7
+          - gemfile: rails6.1
+            ruby: 2.7
+          - gemfile: rails6.1
+            ruby: 3.0
+
+          - gemfile: rails7.0
+            ruby: 2.7
+          - gemfile: rails7.0
+            ruby: 3.0
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: default
+          bundler-cache: true
+
+      - name: Set up database
+        run: |
+          cp spec/support/config.yml.github spec/support/config.yml
+          bundle exec rake db:create
+
+      - name: Run tests
+        run: |
+          bundle exec rspec spec

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.0.2

data/Appraisals

@@ -1,9 +1,3 @@
-appraise "rails5.0" do
-  gem "activerecord", "~> 5.0.0"
-  gem "mysql2", "~> 0.5.2"
-  gem "sqlite3",  "~> 1.3.13"
-end
-
 appraise "rails5.1" do
   gem "activerecord", "~> 5.1.0"
   gem "mysql2", "~> 0.5.2"
@@ -27,3 +21,9 @@ appraise "rails6.1" do
   gem "mysql2", "~> 0.5.2"
   gem "sqlite3",  "~> 1.4.1"
 end
+
+appraise "rails7.0" do
+  gem "activerecord", "~> 7.0.0"
+  gem "mysql2", "~> 0.5"
+  gem "sqlite3", "~> 1.4"
+end

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 0.4.0 2022-02-12
+
+- Add support for Rails 7.0
+- Fix `establish_connection` for Ruby 3
+
 ## 0.3.0 2021-07-20
 
 - Add support for Rails 6.1

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem "activerecord", "~> 6.1.0"
+gem "activerecord", "~> 7.0.0"
 
 # Specify your gem's dependencies in octoshark.gemspec
 gemspec

data/gemfiles/rails7.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+gem "mysql2", "~> 0.5"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

data/lib/octoshark/active_record_extensions.rb

@@ -1,5 +1,22 @@
 module Octoshark
   module ConnectionHandler
+    # def establish_connection(owner, spec)                        # Rails 3.x
+    # def establish_connection(config_or_env = nil)                # Rails 4.x - 6.1
+    # def establish_connection(config, owner_name:, role:, shard:) # Rails 6.2+
+    def establish_connection(*args, **kwargs)
+      Octoshark::ConnectionPoolsManager.reset_connection_managers!
+
+      if kwargs.empty?
+        # For backward compatibility with older versions of Rails on Ruby 3
+        # that separates positional (args) and keyword arguments (kwargs).
+        super(*args)
+      else
+        super(*args, **kwargs)
+      end
+    end
+  end
+
+  module ConnectionHandlerRails3
     def establish_connection(*args)
       Octoshark::ConnectionPoolsManager.reset_connection_managers!
       super(*args)
@@ -19,13 +36,10 @@ module Octoshark
   end
 end
 
-if defined?(ActiveRecord::ConnectionAdapters::ConnectionHandler)
-  # Rails 3.2, 4.0, 4.1, 4.2, 5.0
-  ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:prepend, Octoshark::ConnectionHandler)
-else
-  # Rails 3.0 and 3.1 does not lazy load
+# Rails 3.0 and 3.1 does not lazy load
+unless defined?(ActiveRecord::ConnectionAdapters::ConnectionHandler)
   require 'active_record/connection_adapters/abstract_adapter'
-  ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:prepend, Octoshark::ConnectionHandler)
 end
 
+ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:prepend, Octoshark::ConnectionHandler)
 ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, Octoshark::ActiveRecordAbstractAdapter)

data/lib/octoshark/connection_pools_manager.rb

@@ -71,27 +71,58 @@ module Octoshark
     end
 
     def create_connection_pool(name, config)
-      spec =
-        if defined?(ActiveRecord::ConnectionAdapters::PoolConfig)
-          env_name = defined?(Rails) ? Rails.env : nil
-          db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, name, config)
-          ActiveRecord::ConnectionAdapters::PoolConfig.new(owner_name = ActiveRecord::Base, db_config)
+      spec = build_connection_pool_spec(name, config)
+
+      ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
+    end
+
+    private
+
+    def build_connection_pool_spec(name, config)
+      if active_record_6_1_or_7?
+        env_name = defined?(Rails) ? Rails.env : nil
+        db_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(env_name, name, config)
+
+        pool_config_class = ActiveRecord::ConnectionAdapters::PoolConfig
+
+        if pool_config_class.instance_method(:initialize).arity == 2
+          # ActiveRecord 6.1
+          pool_config_class.new(owner_name = ActiveRecord::Base, db_config)
         else
-          adapter_method = "#{config[:adapter]}_connection"
-          if defined?(ActiveRecord::ConnectionAdapters::ConnectionSpecification)
-            spec_class = ActiveRecord::ConnectionAdapters::ConnectionSpecification
-
-            if spec_class.instance_method(:initialize).arity == 3
-              spec_class.new(name, config, adapter_method)
-            else
-              spec_class.new(config, adapter_method)
-            end
+          # ActiveRecord 7.0
+          pool_config_class.new(
+            owner_name = ActiveRecord::Base,
+            db_config,
+            role = ActiveRecord::Base.current_role,
+            shard = ActiveRecord::Base.current_shard
+          )
+        end
+      else
+        adapter_method = "#{config[:adapter]}_connection"
+
+        if active_record_4_or_5_or_6?
+          spec_class = ActiveRecord::ConnectionAdapters::ConnectionSpecification
+
+          if spec_class.instance_method(:initialize).arity == 3
+            # ActiveRecord 5.x and 6.0
+            spec_class.new(name, config, adapter_method)
           else
-            ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
+            # ActiveRecord 4.x
+            spec_class.new(config, adapter_method)
           end
+        else
+          # ActiveRecord 3.x
+          ActiveRecord::Base::ConnectionSpecification.new(config, adapter_method)
         end
+      end
+    end
 
-      ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec)
+    def active_record_6_1_or_7?
+      defined?(ActiveRecord::ConnectionAdapters::PoolConfig)
+    end
+
+    def active_record_4_or_5_or_6?
+      defined?(ActiveRecord::ConnectionAdapters::ConnectionSpecification)
     end
   end
 end

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dalibor Nasevic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,8 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci-legacy.yml"
-- ".github/workflows/ci.yml"
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -123,6 +122,7 @@ files:
 - gemfiles/rails5.2.gemfile
 - gemfiles/rails6.0.gemfile
 - gemfiles/rails6.1.gemfile
+- gemfiles/rails7.0.gemfile
 - lib/octoshark.rb
 - lib/octoshark/active_record_extensions.rb
 - lib/octoshark/connection_manager.rb
@@ -143,7 +143,7 @@ homepage: https://github.com/dalibor/octoshark
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -158,8 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Octoshark is an ActiveRecord connection switcher
 test_files:

data/.github/workflows/ci-legacy.yml

@@ -1,66 +0,0 @@
-name: Build Legacy
-
-on:
-  pull_request:
-    branches:
-      - "*"
-  push:
-    branches:
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-16.04
-    services:
-     mysql:
-        image: mysql:5.5
-        env:
-          MYSQL_ROOT_PASSWORD: pass
-        ports:
-          - "3306:3306"
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
-
-    name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
-    strategy:
-      matrix:
-        include:
-          - gemfile: rails3.0
-            ruby: 2.2
-          - gemfile: rails3.1
-            ruby: 2.2
-          - gemfile: rails3.2
-            ruby: 2.2
-
-          - gemfile: rails4.0
-            ruby: 2.4
-          - gemfile: rails4.1
-            ruby: 2.4
-          - gemfile: rails4.2
-            ruby: 2.4
-
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
-      BUNDLE_PATH_RELATIVE_TO_CWD: true
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler: default
-          bundler-cache: true
-
-      - name: Set up database
-        run: |
-          cp spec/support/config.yml.github spec/support/config.yml
-          bundle exec rake db:create
-
-      - name: Run tests
-        run: |
-          bundle exec rspec spec

data/.github/workflows/ci.yml

@@ -1,64 +0,0 @@
-name: Build
-
-on:
-  pull_request:
-    branches:
-      - "*"
-  push:
-    branches:
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    services:
-     mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ROOT_PASSWORD: pass
-        ports:
-          - "3306:3306"
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
-
-    name: ruby-${{ matrix.ruby }} ${{ matrix.gemfile }}
-    strategy:
-      matrix:
-        include:
-          - gemfile: rails5.0
-            ruby: 2.6
-          - gemfile: rails5.1
-            ruby: 2.6
-          - gemfile: rails5.2
-            ruby: 2.6
-
-          - gemfile: rails6.0
-            ruby: 2.7
-          - gemfile: rails6.1
-            ruby: 2.7
-
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
-      BUNDLE_PATH_RELATIVE_TO_CWD: true
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler: default
-          bundler-cache: true
-
-      - name: Set up database
-        run: |
-          cp spec/support/config.yml.github spec/support/config.yml
-          bundle exec rake db:create
-
-      - name: Run tests
-        run: |
-          bundle exec rspec spec