replica_pools 2.1.3 → 2.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a65839a4e55ab8f54a0c58a84ce6f36aff3c7f21
-  data.tar.gz: 82d711298a69f81da31b2557412ad2ec17efaf7d
+SHA256:
+  metadata.gz: aba6d5a57bda0c33f6531172ff1f8a9e735168a94688318c09388032063ca637
+  data.tar.gz: 10677ab3c419b42fa1a8ebe8367204a42ff87bbdc01a1a986575a70f12cb3925
 SHA512:
-  metadata.gz: f7d70729b702cc1a23b5103e12b5fe048fe064d1deae02a0ab822b678934cf2b7982aca1edd41db2ed8aa55a5db5cb0e21518e0e380863915c721b6be43336a3
-  data.tar.gz: 1377e2d4ded4c12ab215d7e2841349da404a30578905c5653f3f8c89292f856fae8d52161a60209ff959018bfea47e6d55f9582cce1301eaf345b7bc0faacd3a
+  metadata.gz: 3c0bd1e057eb02a547d33792d8d3bbc7b378c7cc49574a8635a885c0ce9668fe90c1dc880435a0a3eabd8d3322d5f89970c1809b0d8c98ddbe538289232c7b61
+  data.tar.gz: 42b3bc14c121185c8df5c7de20c556d3604576878ea6f3deaddf9e8ad1a0b726e99c12f23bbb1ca9d104e757dc18d04f3848c3bf86304a49efa54b3ae259dc63

data/lib/replica_pools/engine.rb

@@ -21,7 +21,7 @@ module ReplicaPools
             :select_rows, :select, :verify!, :raw_connection, :active?, :reconnect!,
             :disconnect!, :reset_runtime, :log
           ]
-        elsif ActiveRecord::VERSION::MAJOR == 5
+        elsif [5, 6].include?(ActiveRecord::VERSION::MAJOR)
           [
            :select_all, :select_one, :select_value, :select_values,
            :select_rows, :select, :select_prepared, :verify!, :raw_connection,

data/lib/replica_pools/pools.rb

@@ -27,12 +27,22 @@ module ReplicaPools
 
     # finds valid pool configs
     def pool_configurations
-      ActiveRecord::Base.configurations.map do |name, config|
+      config_hash.map do |name, config|
         next unless name.to_s =~ /#{ReplicaPools.config.environment}_pool_(.*)_name_(.*)/
         [name, $1, $2]
       end.compact
     end
 
+    def config_hash
+      if ActiveRecord::VERSION::MAJOR >= 6
+        # in Rails >= 6, `configurations` is an instance of ActiveRecord::DatabaseConfigurations
+        ActiveRecord::Base.configurations.to_h
+      else
+        # in Rails < 6, it's just a hash
+        ActiveRecord::Base.configurations
+      end
+    end
+
     # generates a unique ActiveRecord::Base subclass for a single replica
     def connection_class(pool_name, replica_name, connection_name)
       class_name = "#{pool_name.camelize}#{replica_name.camelize}"

data/lib/replica_pools/version.rb

@@ -1,3 +1,3 @@
 module ReplicaPools
-  VERSION = "2.1.3"
+  VERSION = "2.2.0.beta1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: replica_pools
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0.beta1
 platform: ruby
 authors:
 - Dan Drabik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Connection proxy for ActiveRecord for leader / replica setups.