bigrails-redis 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4fad4c4ad81fa365e20f3d168ea4ddd8043b121d88e7d46ccc875e139e7049c
-  data.tar.gz: ac86f0f454a81a3b040562c98dc74036c0b96f714b501dfd65a8df224870071f
+  metadata.gz: 7bcd1b5e5ed505a29938315709f56d36db7f5d5de17392657aa5c8371ab1d2c9
+  data.tar.gz: 9a51d0bc94aa4f0ead89243b9824afd94cb0e354edc8d43ca9833814944848fa
 SHA512:
-  metadata.gz: d130159d4ae34ac9c432dd554a7222fe0f2eb118f71ae1c6bc427a29cab4a1e5ed5b7f83c0410fe99a8977e685105567fba5387b9f04a8ac45ee67f6228a75b5
-  data.tar.gz: fe6b41f256a94205d9913a8faa00234b9ab105ce520875b3bccc6929274081788158da37a128efa0d91a38cba307c661a9e357d0fe7a8d596244db77c4d51799
+  metadata.gz: dd8ff8e9c4ee17ac8287f0d2da71be62ea36418ad6a4faa0841161402b7199ab870608d46df3d5a3e402343239a043fb211890136423ac800e5e68f9957c1730
+  data.tar.gz: ccdc2a87df4b34172c53b5038559c0a460b7bacba9bc2faf71ea69728522f1ef7dc5180de7c7e4ce63dcf23992a8746f0c46f39aa988bf1861aa4cfb17d70e2f

data/README.md

@@ -18,9 +18,15 @@ Create a redis configuration file:
 
 The configuration file (`config/redis.rb`) is just a plain Ruby file that will be evaluated when a connection is requested. Use the `connection` DSL method to declare your connections. The method will yield a block and you're expected to return a configuration hash.
 
-A configuration hash, by default, is passed to `ActiveSupport::Cache::RedisCacheStore.build_redis(...)`. This is a Rails supplied helper which allows for more options than demostrated above. You'll want to [check out its source](https://github.com/rails/rails/blob/main/activesupport/lib/active_support/cache/redis_cache_store.rb#L77-L100) to get a better idea of what it supports.
+The configuration hash is passed to the default `Builder`. You can customize the builder with your own object/proc that responds to `#call`.
 
 ```ruby
+# Change the default builder.
+Rails.application.redis.builder = ->(options) {
+  # options is the hash returned from the connection block.
+  Redis.new(...)
+}
+
 # Simple hardcoded example.
 connection(:default) do
   {

data/lib/big_rails/redis/builder.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "redis"
+require "redis/distributed"
+
+module BigRails
+  module Redis
+    class Builder
+      class << self
+        def call(options)
+          config = Configuration.new(options)
+
+          if config.pool_options.any?
+            ensure_connection_pool_added!
+
+            ::ConnectionPool.new(config.pool_options) { build(config) }
+          else
+            build(config)
+          end
+        end
+
+        private
+
+        def build(config)
+          if config.urls.size > 1
+            build_redis_distributed_client(urls: config.urls, **config.redis_options)
+          else
+            build_redis_client(url: config.urls.first, **config.redis_options)
+          end
+        end
+
+        def build_redis_distributed_client(urls:, **redis_options)
+          ::Redis::Distributed.new([], redis_options).tap do |dist|
+            urls.each { |u| dist.add_node(url: u) }
+          end
+        end
+
+        def build_redis_client(url:, **redis_options)
+          ::Redis.new(redis_options.merge(url: url))
+        end
+
+        def ensure_connection_pool_added!
+          require "connection_pool"
+        rescue LoadError
+          warn "You don't have connection_pool installed in your application. Please add it to your Gemfile and run bundle install"
+          raise
+        end
+      end
+    end
+  end
+end

data/lib/big_rails/redis/configuration.rb

@@ -5,24 +5,15 @@ module BigRails
     class Configuration
       attr_reader :redis_options
       attr_reader :pool_options
+      attr_reader :urls
 
       def initialize(redis_options)
         @redis_options = redis_options
+        @urls = Array(redis_options.delete(:url))
         @pool_options ||= {}.tap do |pool_options|
           pool_options[:size] = redis_options.delete(:pool_size) if redis_options[:pool_size]
           pool_options[:timeout] = redis_options.delete(:pool_timeout) if redis_options[:pool_timeout]
         end
-
-        ensure_connection_pool_added! if pool_options.any?
-      end
-
-      private
-
-      def ensure_connection_pool_added!
-        require "connection_pool"
-      rescue LoadError => e
-        warn "You don't have connection_pool installed in your application. Please add it to your Gemfile and run bundle install"
-        raise e
       end
     end
   end

data/lib/big_rails/redis/configuration_dsl.rb

@@ -28,7 +28,7 @@ module BigRails
           raise ArgumentError, "connection named '#{name}' already registered"
         end
 
-        @__configurations[name.to_s] = Configuration.new(yield)
+        @__configurations[name.to_s] = yield
       end
     end
   end

data/lib/big_rails/redis/registry.rb

@@ -14,11 +14,7 @@ module BigRails
       def initialize
         @connections = {}
         @wrapped_connections = {}
-
-        # Default redis builder.
-        @builder = ->(config) {
-          ActiveSupport::Cache::RedisCacheStore.build_redis(**config.redis_options)
-        }
+        @builder = Builder
       end
 
       def for(name, wrapped: false)
@@ -32,7 +28,7 @@ module BigRails
       end
 
       def config_for(name)
-        configurations[validate_name(name)]
+        configurations[validate_name(name)].deep_dup
       end
 
       def each(&block)
@@ -42,9 +38,9 @@ module BigRails
       def disconnect
         each do |connection|
           if connection.is_a?(::ConnectionPool)
-            connection.reload { |conn| conn.quit }
+            connection.reload { |conn| conn.close }
           else
-            connection.quit
+            connection.close
           end
         end
       end
@@ -70,13 +66,7 @@ module BigRails
       private
 
       def build_connection(name)
-        config = configurations.fetch(name)
-
-        if config.pool_options.any?
-          ::ConnectionPool.new(config.pool_options) { builder.call(config) }
-        else
-          builder.call(config)
-        end
+        builder.call(config_for(name))
       end
 
       def build_wrapped_connection(connection)

data/lib/big_rails/redis/version.rb

@@ -2,6 +2,6 @@
 
 module BigRails
   module Redis
-    VERSION = "0.4.0"
+    VERSION = "0.7.0"
   end
 end

data/lib/big_rails/redis.rb

@@ -8,8 +8,9 @@ module BigRails
     extend ActiveSupport::Autoload
 
     autoload :ApplicationExtension
-    autoload :ConfigurationDsl
+    autoload :Builder
     autoload :Configuration
+    autoload :ConfigurationDsl
     autoload :Registry
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bigrails-redis
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ngan Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-20 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
 description:
 email:
 - ngan@users.noreply.github.com
@@ -34,6 +48,7 @@ files:
 - README.md
 - lib/big_rails/redis.rb
 - lib/big_rails/redis/application_extension.rb
+- lib/big_rails/redis/builder.rb
 - lib/big_rails/redis/configuration.rb
 - lib/big_rails/redis/configuration_dsl.rb
 - lib/big_rails/redis/railtie.rb