redcord 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c8f566eb89b44bd73c4a444deb313af1004a342a703a0e9f504364aa96df40
-  data.tar.gz: e77507ef1ebb3a1d2a6ba9f0fc654d25355f5bc685b05e4bc07368957bdc7ec3
+  metadata.gz: 9f33907b35b938f14be13d1d20f89f1530d72a28cb55e7e38a53f61743a2bfe5
+  data.tar.gz: 1297ac81f293f35572a0015782aa621b1d5ba0e3e691ea86abadbdde26ca094a
 SHA512:
-  metadata.gz: 27d9afec9f1a663516b65096439312bdc313aed672c6476bcf38d0ce98cd9178bebf3b5a46341d69ad6fc6f3f4268655956c6e5170af2f7da8489d68e343dee5
-  data.tar.gz: 1b011be75251942091acc209189f33d72ff289496a07f5700c140a06916f83ad310e1e804fc3bd60d77815f89b57fd6a66b9efe2d7fabd81d32dfca7f281b7d6
+  metadata.gz: f4d23f458c6f6de224293010b60f19d7c07199c66eb382e5bd5a7917a429900658bfd42202107c3e72ace588ea526bcf3edb6b56dfeaa7a6b58f3eea4b91dc81
+  data.tar.gz: d1aa8dedf1dccad372489072405725fe51e3712b634524c73c574130ab8473bab1fefdedfbd47466c956ab7e96e121153798f08a4250b30e7dc30d33039bf801

data/lib/redcord/connection_pool.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require 'connection_pool'
+require_relative 'redis'
+
+class Redcord::ConnectionPool
+  def initialize(pool_size:, timeout:, **client_options)
+    @connection_pool = ::ConnectionPool.new(size: pool_size, timeout: timeout) do
+      # Construct a new client every time the block gets called
+      Redcord::Redis.new(**client_options, logger: Redcord::Logger.proxy)
+    end
+  end
+
+  # Avoid method_missing when possible for better performance
+  methods = Set.new(Redcord::Redis.instance_methods(false) + Redis.instance_methods(false))
+  methods.each do |method_name|
+    define_method method_name do |*args, &blk|
+      @connection_pool.with do |redis|
+        redis.send(method_name, *args, &blk)
+      end
+    end
+  end
+
+  def method_missing(method_name, *args, &blk)
+    @connection_pool.with do |redis|
+      redis.send(method_name, *args, &blk)
+    end
+  end
+end

data/lib/redcord/redis_connection.rb

@@ -6,11 +6,14 @@ require 'rails'
 
 require 'redcord/lua_script_reader'
 require 'redcord/redis'
+require 'redcord/connection_pool'
 
 module Redcord::RedisConnection
   extend T::Sig
   extend T::Helpers
 
+  RedcordClientType = T.type_alias { T.any(Redcord::Redis, Redcord::ConnectionPool) }
+
   @connections = T.let(nil, T.nilable(T::Hash[String, T.untyped]))
   @procs_to_prepare = T.let([], T::Array[Proc])
 
@@ -29,17 +32,17 @@ module Redcord::RedisConnection
       (env_config[name.underscore] || env_config['default']).symbolize_keys
     end
 
-    sig { returns(Redcord::Redis) }
+    sig { returns(RedcordClientType) }
     def redis
       Redcord::RedisConnection.connections[name.underscore] ||= prepare_redis!
     end
 
-    sig { returns(Redcord::Redis) }
+    sig { returns(RedcordClientType) }
     def establish_connection
       Redcord::RedisConnection.connections[name.underscore] = prepare_redis!
     end
 
-    sig { params(redis: Redis).returns(Redcord::Redis) }
+    sig { params(redis: Redis).returns(RedcordClientType) }
     def redis=(redis)
       Redcord::RedisConnection.connections[name.underscore] =
         prepare_redis!(redis)
@@ -50,20 +53,21 @@ module Redcord::RedisConnection
     # definitions in each Redis query.
     #
     # TODO: Replace this with Redcord migrations
-    sig { params(client: T.nilable(Redis)).returns(Redcord::Redis) }
+    sig { params(client: T.nilable(Redis)).returns(RedcordClientType) }
     def prepare_redis!(client = nil)
-      return client if client.is_a?(Redcord::Redis)
-
-      client = Redcord::Redis.new(
-        **(
-          if client.nil?
-            connection_config
-          else
-            client.instance_variable_get(:@options)
-          end
-        ),
-        logger: Redcord::Logger.proxy,
-      )
+      return client if client.is_a?(Redcord::Redis) || client.is_a?(Redcord::ConnectionPool)
+
+      options = client.nil? ? connection_config : client.instance_variable_get(:@options)
+      client =
+        if options[:pool]
+          Redcord::ConnectionPool.new(
+            pool_size: options[:pool],
+            timeout: options[:connection_timeout] || 1.0,
+            **options
+          )
+        else
+          Redcord::Redis.new(**options, logger: Redcord::Logger.proxy)
+        end
 
       client.ping
       client
@@ -73,7 +77,7 @@ module Redcord::RedisConnection
   module InstanceMethods
     extend T::Sig
 
-    sig { returns(Redcord::Redis) }
+    sig { returns(RedcordClientType) }
     def redis
       self.class.redis
     end

data/lib/redcord/relation.rb

@@ -248,7 +248,7 @@ class Redcord::Relation
     end
   end
 
-  sig { returns(Redcord::Redis) }
+  sig { returns(Redcord::RedisConnection::RedcordClientType) }
   def redis
     model.redis
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcord
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Chan Zuckerberg Initiative
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +176,7 @@ files:
 - lib/redcord/attribute.rb
 - lib/redcord/base.rb
 - lib/redcord/configurations.rb
+- lib/redcord/connection_pool.rb
 - lib/redcord/logger.rb
 - lib/redcord/lua_script_reader.rb
 - lib/redcord/migration.rb