octoshark 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08a9bf2ed4d65fbb159fc533e06faf1fee9bdc6b756d9ea291f1918240bddfab'
-  data.tar.gz: 7e8c1cd5604b308ce09c6b3227832eb42fc24b26591acf8a177817b679d98dc4
+  metadata.gz: 2de2a405dc31b45333b03a5786a6ea1139902a5da197675f56d5b6a645c2eae3
+  data.tar.gz: 68c38806668ee3fc1573b19ad08f6e6b66736d3632134ab773a1cb08548798f6
 SHA512:
-  metadata.gz: 721103095d5700ead78726a57a3e233212b523a80db732f5616b1151e61071f566a877fe30784ba4a6ab1b25b70b0041f6adc6136b5fed8185836e1f24b8af18
-  data.tar.gz: b8b939dd94e1bb789715501fbcf6502718cc029088f0915b157a0402efddcc0a3282a7da35a2d9d3f8dbb766300afb8633103564d3ef167c1101495369c0e8fb
+  metadata.gz: 1d15cbe8c2d345705284575ff7caa6082139c5274432b9a293035932788a3f156aa2002435dcb04f614ab7fd51a9ee5d0d85af5b04e5ff59f66eb74c4cf1a763
+  data.tar.gz: 2d971f5101357f0bf0dbba1efa1203f811b7707ab655d18ecef4999d726b943893e35132aa151ec6ec655d918284385facd0125a51cf5f5cb6d62def0804e19e

data/.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ROOT_PASSWORD: pass
         ports:
@@ -28,31 +28,35 @@ jobs:
     strategy:
       matrix:
         include:
-          - gemfile: rails5.0
-            ruby: 2.6
           - gemfile: rails5.1
-            ruby: 2.6
+            ruby: 3.1
+          - gemfile: rails5.1
+            ruby: 3.2
+
           - gemfile: rails5.2
-            ruby: 2.6
+            ruby: 3.1
           - gemfile: rails5.2
-            ruby: 3.0
+            ruby: 3.2
 
           - gemfile: rails6.0
-            ruby: 2.7
+            ruby: 3.1
+          - gemfile: rails6.0
+            ruby: 3.2
+
           - gemfile: rails6.1
-            ruby: 2.7
+            ruby: 3.2
           - gemfile: rails6.1
-            ruby: 3.0
+            ruby: 3.3
 
           - gemfile: rails7.0
-            ruby: 3.0
+            ruby: 3.2
           - gemfile: rails7.0
-            ruby: 3.1
+            ruby: 3.3
 
-          - gemfile: rails7.1
-            ruby: 3.1
           - gemfile: rails7.1
             ruby: 3.2
+          - gemfile: rails7.1
+            ruby: 3.3
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.4

data/Appraisals

@@ -1,23 +1,37 @@
 appraise "rails5.1" do
   gem "activerecord", "~> 5.1.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 appraise "rails5.2" do
   gem "activerecord", "~> 5.2.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 appraise "rails6.0" do
   gem "activerecord", "~> 6.0.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 appraise "rails6.1" do
   gem "activerecord", "~> 6.1.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 appraise "rails7.0" do
   gem "activerecord", "~> 7.0.0"
+  gem "mysql2", "~> 0.5.2"
+  gem "sqlite3", "~> 1.7.3"
 end
 
 appraise "rails7.1" do
   gem "activerecord", "~> 7.1.0"
 end
+
+appraise "rails7.2" do
+  gem "activerecord", "~> 7.2.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## 0.6.0 2024-09-04
+
+- Add support for Rails 7.2
+
+## 0.5.1 2024-04-22
+
+- Add kwargs argument to the ActiveRecordAbstractAdapter
+
 ## 0.5.0 2023-10-27
 
 - Add support for Rails 7.1

data/Gemfile

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

data/README.md

@@ -54,7 +54,6 @@ config = {
   password: 'pass',
   pool:     1,
   encoding: 'utf8',
-  reconnect: false
 }
 ```
 
@@ -110,21 +109,23 @@ To tell an ActiveRecord model to use the Octoshark connection we can override th
 
 ```ruby
 class Post < ActiveRecord::Base
-  def self.connection
-    CONN_MANAGER.current_connection
-  end
-end
-```
+  class << self
+    def connection
+      CONN_MANAGER.current_connection
+    end
 
-Alternatively, we can extract it as a module and include in multiple models.
+    # For Rails 7.2+ we need to override the following methods too:
 
-```ruby
-module ShardingModel
-  extend ActiveSupport::Concern
+    def lease_connection
+      connection
+    end
 
-  module ClassMethods
-    def connection
-      CONN_MANAGER.current_connection
+    def with_connection
+      yield connection
+    end
+
+    def schema_cache
+      connection.schema_cache
     end
   end
 end

data/gemfiles/rails5.1.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.7.3"
 
 gemspec path: "../"

data/gemfiles/rails5.2.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.2.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.7.3"
 
 gemspec path: "../"

data/gemfiles/rails6.0.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.0.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.7.3"
 
 gemspec path: "../"

data/gemfiles/rails6.1.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.7.3"
 
 gemspec path: "../"

data/gemfiles/rails7.0.gemfile

@@ -3,5 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
+gem "mysql2", "~> 0.5.2"
+gem "sqlite3", "~> 1.7.3"
 
 gemspec path: "../"

data/gemfiles/{rails5.0.gemfile → rails7.2.gemfile}

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
-gem "mysql2", "~> 0.5.2"
-gem "sqlite3", "~> 1.3.13"
+gem "activerecord", "~> 7.2.0"
 
 gemspec path: "../"

data/lib/octoshark/active_record_extensions.rb

@@ -26,12 +26,24 @@ module Octoshark
   module ActiveRecordAbstractAdapter
     attr_accessor :connection_name, :database_name
 
-    def log(sql, name = "SQL", *other_args, &block)
+    def log(sql, name = "SQL", *other_args, **kwargs, &block)
       if connection_name || database_name
         name = "[Octoshark: #{[connection_name, database_name].compact.join(' ')}] #{name}"
       end
 
-      super(sql, name, *other_args, &block)
+      super(sql, name, *other_args, **kwargs, &block)
+    end
+  end
+
+  module ConnectionPool
+    # Handle Rails 8.0 ConnectionPool#connection deprecation
+    def connection
+      if respond_to?(:lease_connection)
+        # Rails 7.2+
+        lease_connection
+      else
+        super
+      end
     end
   end
 end
@@ -43,3 +55,4 @@ end
 
 ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:prepend, Octoshark::ConnectionHandler)
 ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, Octoshark::ActiveRecordAbstractAdapter)
+ActiveRecord::ConnectionAdapters::ConnectionPool.send(:prepend, Octoshark::ConnectionPool)

data/lib/octoshark/connection_manager.rb

@@ -3,9 +3,15 @@ module Octoshark
     include CurrentConnection
 
     def with_connection(config, connection_name: nil, &block)
-      connection_method = "#{config[:adapter]}_connection"
+      connection =
+        if ActiveRecord::ConnectionAdapters.respond_to?(:resolve)
+          # Rails 7.2+
+          ActiveRecord::ConnectionAdapters.resolve(config[:adapter]).new(config)
+        else
+          connection_method = "#{config[:adapter]}_connection"
+          ActiveRecord::Base.send(connection_method, config)
+        end
 
-      connection = ActiveRecord::Base.send(connection_method, config)
       connection.connection_name = connection_name
       connection.database_name = config[:database] if config[:database]
 

data/lib/octoshark/version.rb

@@ -1,3 +1,3 @@
 module Octoshark
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/octoshark.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activerecord", ">= 3.0"
 
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec",    "~> 3.12.0"
-  spec.add_development_dependency "sqlite3",  "~> 1.4.1"
-  spec.add_development_dependency "mysql2",   "~> 0.5.2"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "activerecord", "~> 7.2.0"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "mysql2"
   spec.add_development_dependency "appraisal"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoshark
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dalibor Nasevic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -40,46 +40,60 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 7.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -111,13 +125,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails5.0.gemfile
 - gemfiles/rails5.1.gemfile
 - gemfiles/rails5.2.gemfile
 - gemfiles/rails6.0.gemfile
 - gemfiles/rails6.1.gemfile
 - gemfiles/rails7.0.gemfile
 - gemfiles/rails7.1.gemfile
+- gemfiles/rails7.2.gemfile
 - lib/octoshark.rb
 - lib/octoshark/active_record_extensions.rb
 - lib/octoshark/connection_manager.rb
@@ -153,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Octoshark is an ActiveRecord connection switcher