replica_pools 2.5.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5266f3b52cb6ff8d9e54175b60ee4938a2765ac08fc5c1a09af659b8a93d61f4
-  data.tar.gz: ad735b62e57f38f238941e579b106f744c41db7b2985d9a7044fd4fa3f738227
+  metadata.gz: da0145ee587f2856d0ba448914437caf148e8825abc9e2b31a853e8c6585ffdb
+  data.tar.gz: 26ffb29f8c44dcaefa6f0ba16452ab4af4757c46e1f660d76f6e3906cc2edb06
 SHA512:
-  metadata.gz: a8a5292802eab9a70512d8e91b6838556614f35c43efd3d277c54b838e913168980bfbab0dedfd961ab55e4a0dc1b65f5422ee0cb3f4afddacc923d3a75b26e7
-  data.tar.gz: 9c7e5fa395316788a77e836a82a83a1e6141df829ea573539421e95e8d4b3ade55e6588afd85990dbbc2101fc519006312c022f1ad1524e1f74dc4e25a19fa2d
+  metadata.gz: 70883d9c60ccfc07230b262af71c476d2944321e371a6bbdc4ba873eefe17e49e9185ac1bae7a95b30f51f6874b2a8d313fe2b35dc3b9c3253918b590d8a5798
+  data.tar.gz: c47b4975d6bbc30e44602ed51a60ea9d827624b3dabf726ad54d21524691e8acbf78545d7b1afecf5322d5122fce2a908b0461a68f6411a0f16e058354356c64

data/lib/replica_pools/connection_proxy.rb

@@ -64,8 +64,8 @@ module ReplicaPools
       end
     end
 
-    def transaction(*args, &block)
-      with_leader { leader.transaction(*args, &block) }
+    def transaction(...)
+      with_leader { leader.transaction(...) }
     end
 
     def next_replica!
@@ -86,9 +86,9 @@ module ReplicaPools
     # Proxies any unknown methods to leader.
     # Safe methods have been generated during `setup!`.
     # Creates a method to speed up subsequent calls.
-    def method_missing(method, *args, &block)
-      self.class.define_method(method) do |*args, &block|
-        route_to(leader, method, *args, &block).tap do
+    def method_missing(method, *args, **kwargs, &block)
+      self.class.define_method(method) do |*args, **kwargs, &block|
+        route_to(leader, method, *args, **kwargs, &block).tap do
           if %i[insert delete update].include?(method)
             leader.retrieve_connection.clear_query_cache
           end

data/lib/replica_pools/pools.rb

@@ -34,18 +34,20 @@ module ReplicaPools
     end
 
     def config_hash
-      if ActiveRecord::VERSION::MAJOR > 6
-        # in Rails = 7, ActiveRecord::Base.configurations.to_h has been deprecated
-        ActiveRecord::Base.configurations.configs_for.map do |c|
-          [c.env_name, c.configuration_hash.transform_keys(&:to_s)]
-        end.to_h
-      elsif ActiveRecord::VERSION::MAJOR == 6
-        # in Rails = 6, `configurations` is an instance of ActiveRecord::DatabaseConfigurations
-        ActiveRecord::Base.configurations.to_h
-      else
+      if ActiveRecord::VERSION::MAJOR < 6
         # in Rails < 6, it's just a hash
-        ActiveRecord::Base.configurations
+        return ActiveRecord::Base.configurations
       end
+
+      if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR < 1
+        # in Rails = 6.0, `configurations` is an instance of ActiveRecord::DatabaseConfigurations
+        return ActiveRecord::Base.configurations.to_h
+      end
+
+      # in Rails >= 6.1, ActiveRecord::Base.configurations.to_h has been deprecated
+      ActiveRecord::Base.configurations.configs_for.map do |c|
+        [c.env_name, c.configuration_hash.transform_keys(&:to_s)]
+      end.to_h
     end
 
     # generates a unique ActiveRecord::Base subclass for a single replica

data/lib/replica_pools/query_cache.rb

@@ -18,11 +18,11 @@ module ReplicaPools
     # select_all is trickier. it needs to use the leader
     # connection for cache logic, but ultimately pass its query
     # through to whatever connection is current.
-    def select_all(*args)
+    def select_all(*args, **kwargs)
       relation, name, raw_binds = args
 
       if !query_cache_enabled || locked?(relation)
-        return route_to(current, :select_all, *args)
+        return route_to(current, :select_all, *args, **kwargs)
       end
 
       # duplicate binds_from_relation behavior introduced in 4.2.
@@ -38,9 +38,9 @@ module ReplicaPools
       args[2] = binds
 
       if Gem::Version.new(ActiveRecord.version) < Gem::Version.new('5.1')
-        cache_sql(sql, binds) { route_to(current, :select_all, *args) }
+        cache_sql(sql, binds) { route_to(current, :select_all, *args, **kwargs) }
       else
-        cache_sql(sql, name, binds) { route_to(current, :select_all, *args) }
+        cache_sql(sql, name, binds) { route_to(current, :select_all, *args, **kwargs) }
       end
     end
 

data/lib/replica_pools/version.rb

@@ -1,3 +1,3 @@
 module ReplicaPools
-  VERSION = "2.5.0"
+  VERSION = "2.6.1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Dan Drabik
 - Lance Ivy
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,7 +143,7 @@ homepage: https://github.com/kickstarter/replica_pools
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -151,21 +151,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Connection proxy for ActiveRecord for leader / replica setups.
 test_files:
-- spec/config/test_model.rb
-- spec/connection_proxy_spec.rb
+- spec/spec_helper.rb
 - spec/pool_spec.rb
-- spec/query_cache_spec.rb
 - spec/slave_pools_spec.rb
-- spec/spec_helper.rb
+- spec/config/test_model.rb
+- spec/query_cache_spec.rb
+- spec/connection_proxy_spec.rb