knockoff 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22fb5337ef43e286ab938ab8d6e4905529607979266b8bb7673eccdba23c5d3c
-  data.tar.gz: 9990634bf328df85fe419cbb3aea20b591d4a9c94420184f89012a15649ac2af
+  metadata.gz: 955ed88bdcc6efad21cc49e650e41b7f8be0090bcfb39c58b7445c58724f03f6
+  data.tar.gz: 2780acc35a3c2e45341677238e705aaae346eb258d7696de9092b894fc1fd138
 SHA512:
-  metadata.gz: d7e7d9f11f4a7ea199d48e98c322d66b75db01eb2659b5218ea3928c586e1cab1d4087e3c7eb2aa1c54bdce744beb4f5c46fd2e4b43dc3972c1d735c6762acbf
-  data.tar.gz: 4a6d620cffa48322560e060e1b500704791216d9daf6a3f6f81e90adaec25546012dbf0a55ca66c427265b87f42d3f0a1818f2aa93fbb84292a89ff7cd816bd2
+  metadata.gz: 31a78e1d5d861aa232411597f0dffc02b1283c7c3f0ce7ef5df07f81dc88f8b8f081b5842df8e8e7e51e570fae0325db617e4a6f8e70743884b8e648f08eccc4
+  data.tar.gz: 10677caed4bb00ebbd243af6131b3054324ea7218abbeef2ce0db0285410d1f3a91fcda5b06403177a88d441a6a3be3d064ee1de57016dfa6b044a5ad5dc4f70

data/.github/workflows/ruby.yml

@@ -9,14 +9,13 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['2.4.0', '2.5.1', '2.6.6', '2.7.2']
+        ruby-version: ['2.6.10', '2.7.8', '3.0.6', '3.1.4']
 
     steps:
       # Pin to this commit: v2
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Set up Ruby
-        # Lock to this commit, v1.82.0
-        uses: ruby/setup-ruby@5e4f0a10bfc39c97cd5358121291e27e5d97e09b
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+2.7.8

data/knockoff.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activerecord', '>= 4.0.0', '< 6.1'
-  spec.add_runtime_dependency 'activesupport', '>= 4.0.0', '< 6.1'
+  spec.add_runtime_dependency 'activerecord', '>= 6', '< 7'
+  spec.add_runtime_dependency 'activesupport', '>= 6', '< 7'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/knockoff/config.rb

@@ -34,9 +34,12 @@ module Knockoff
     end
 
     def update_replica_configs(new_configs)
-      ActiveRecord::Base.configurations['knockoff_replicas'].merge(new_configs) if ActiveRecord::Base.configurations['knockoff_replicas'].present?
+      if ActiveRecord::Base.configurations.configs_for(env_name: 'knockoff_replicas').present?
+        updated_config = new_configs.deep_dup.merge!(ActiveRecord::Base.configurations.configs_for(env_name: 'knockoff_replicas').first.config)
+      end
+
       @replicas_configurations.each do |key, _config|
-        update_replica_config(key, new_configs)
+        update_replica_config(key, updated_config)
       end
     end
 
@@ -49,9 +52,10 @@ module Knockoff
 
     private
 
-    def update_replica_config(key, new_configs)
-      @replicas_configurations[key].merge!(new_configs)
-      ActiveRecord::Base.configurations[key].merge!(new_configs)
+    def update_replica_config(key, updated_config)
+      merged_config = @replicas_configurations[key].config.deep_dup.merge!(updated_config)
+      @replicas_configurations[key] = ActiveRecord::DatabaseConfigurations::HashConfig.new(key, key, merged_config)
+      ActiveRecord::Base.configurations.configurations << @replicas_configurations[key]
     end
 
     def set_replica_configs
@@ -63,56 +67,11 @@ module Knockoff
       # and don't add the uri to the final list if it can't be parsed
       replica_env_keys.map.with_index(0) do |env_key, index|
         begin
-          uri = URI.parse(ENV[env_key])
 
           # Configure parameters such as prepared_statements, pool, reaping_frequency for all replicas.
-          replica_config = ActiveRecord::Base.configurations['knockoff_replicas'] || {}
-
-          adapter =
-            if uri.scheme == "postgres"
-              'postgresql'
-            else
-              uri.scheme
-            end
-
-          # Base config from the ENV uri. Sqlite is a special case
-          # and all others follow 'normal' config
-          uri_config =
-            if uri.scheme == 'sqlite3'
-              {
-                'adapter' => adapter,
-                'database' => uri.to_s.split(':')[1]
-              }
-            else
-              {
-                'adapter' => adapter,
-                'database' => (uri.path || "").split("/")[1],
-                'username' => uri.user,
-                'password' => uri.password,
-                'host' => uri.host,
-                'port' => uri.port
-              }
-            end
-
-          # Store the hash in configuration and use it when we establish the connection later.
-          # TODO: In ActiveRecord >= 6, this is a deprecated way to set a configuration. However
-          # there appears to be an issue when calling `ActiveRecord::Base.configurations.to_h` in
-          # version 6.0.4.8 where
-          # multi-database setup is being ignored / dropped. For example if a database.yml setup
-          # has something like..
-          #
-          # development:
-          #   primary:
-          #     ...
-          #   other:
-          #     ...
-          #
-          # then the 'other' database configuration is being dropped.
-          key = "knockoff_replica_#{index}"
-          config = replica_config.merge(uri_config)
-          ActiveRecord::Base.configurations[key] = config
-
-          @replicas_configurations[key] = config
+          to_copy = ActiveRecord::Base.configurations.configs_for(env_name: 'knockoff_replicas')&.first&.config || {}
+          register_replica_copy(index, env_key, to_copy)
+
         rescue URI::InvalidURIError
           Rails.logger.info "LOG NOTIFIER: Invalid URL specified in follower_env_keys. Not including URI, which may result in no followers used." # URI is purposely not printed to logs
           # Return a 'nil' which will be removed from
@@ -122,5 +81,35 @@ module Knockoff
         end
       end.compact
     end
+
+    def register_replica_copy(index, env_key, configuration_hash)
+      key = "knockoff_replica_#{index}"
+      new_config = create_replica_copy(env_key, key, configuration_hash.deep_dup)
+      ActiveRecord::Base.configurations.configurations << new_config
+      @replicas_configurations[key] = new_config
+    end
+
+    def create_replica_copy(env_key, key, replica_config_hash)
+      uri = URI.parse(ENV[env_key])
+
+      replica_config_hash[:adapter] =
+        if uri.scheme == "postgres"
+          'postgresql'
+        else
+          uri.scheme
+        end
+
+      if uri.scheme == 'sqlite3'
+        replica_config_hash[:database] = uri.to_s.split(':')[1]
+      else
+        replica_config_hash[:database] = (uri.path || "").split("/")[1]
+        replica_config_hash[:username] = uri.user
+        replica_config_hash[:password] = uri.password
+        replica_config_hash[:host] = uri.host
+        replica_config_hash[:port] = uri.port
+      end
+
+      ActiveRecord::DatabaseConfigurations::HashConfig.new(key, key, replica_config_hash)
+    end
   end
 end

data/lib/knockoff/replica_connection_pool.rb

@@ -52,7 +52,7 @@ module Knockoff
         class #{class_name} < ActiveRecord::Base
           self.abstract_class = true
           establish_connection :#{config_key}
-          def self.connection_config
+          def self.connection_db_config
             configurations[#{config_key.to_s.inspect}]
           end
         end

data/lib/knockoff/version.rb

@@ -1,3 +1,3 @@
 module Knockoff
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knockoff
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A gem for easily using read replicas