cache_stache 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d78eea9e2e19c6f95024644eaea2dc942993225c42ca636473e19e46fd6f449
-  data.tar.gz: 6156b5fe4adc1756b1ebf1fe92e413ab16bba3589557e26d17efe3ef2fa18dbf
+  metadata.gz: d75f242cecde072c5db6fe680a47fcb3b98165a4d12cf46738d64b0c0956c7ef
+  data.tar.gz: 86c3c5b676cb94ea1427cbed332f8fc97b2dac235ce22c031511a8ad1014d8b8
 SHA512:
-  metadata.gz: b976afa17c53451ea8b6aa57e6d15d88f097f9fd72bc8bd420b91911f06af686f7f7693eee76f9981fd1644b3abd3694c942c6a1e28e764ec97b4148a8062f47
-  data.tar.gz: d31764e21a67a0b2006a59593f1b4757f95a731817d3c8cf0d6af802bef0e7afcbc9e5d0b30f1069d77b6606b60a1f62b6f24315ee9fafb8b77e20a6c71a2ff1
+  metadata.gz: a4997e8c87c2cb1b974eeac87489b5ad6344adef9dd632d0c1f80429f4aae49edbe76ca4b70557d201a309575f8369a9f361207556c7bb6758630adf6240d174
+  data.tar.gz: 623d1edd5b5a304e7839133d9bc4ae9fc9d8f1d67ec76d893df77c6ff506e6c5322b37c657eac5f42d9cbe617f689def250b4974f150f0a0d668348f00766709

data/README.md

@@ -63,9 +63,9 @@ All settings go in `config/initializers/cache_stache.rb`:
 
 ```ruby
 CacheStache.configure do |config|
-  # Redis connection for storing cache metrics
-  # Falls back to ENV["REDIS_URL"] if not set
-  config.redis_url = ENV.fetch("CACHE_STACHE_REDIS_URL", ENV["REDIS_URL"])
+  # Redis connection for storing cache metrics.
+  # Can be a String (URL), Proc, or Redis-compatible object.
+  config.redis = ENV.fetch("CACHE_STACHE_REDIS_URL", ENV["REDIS_URL"])
 
   # Time bucket size
   config.bucket_seconds = 5.minutes
@@ -99,7 +99,7 @@ end
 
 | Setting | Default | What it does |
 |---------|---------|--------------|
-| `redis_url` | `ENV["CACHE_STACHE_REDIS_URL"]` or `ENV["REDIS_URL"]` | Redis connection URL |
+| `redis` | `ENV["CACHE_STACHE_REDIS_URL"]` or `ENV["REDIS_URL"]` | Redis connection (String URL, Proc, or Redis object) |
 | `redis_pool_size` | 5 | Size of the Redis connection pool |
 | `bucket_seconds` | 5 minutes | Size of each time bucket |
 | `retention_seconds` | 7 days | How long to keep data |

data/lib/cache_stache/cache_client.rb

@@ -26,7 +26,7 @@ module CacheStache
     def initialize(config = CacheStache.configuration)
       @config = config
       @pool = ConnectionPool.new(size: @config.redis_pool_size) do
-        Redis.new(url: @config.redis_url)
+        @config.build_redis
       end
     end
 

data/lib/cache_stache/configuration.rb

@@ -5,8 +5,10 @@ require "active_support/core_ext/numeric/time"
 
 module CacheStache
   class Configuration
+    DEFAULT_REDIS_OPTIONS = {reconnect_attempts: 0}.freeze
+
     attr_accessor :bucket_seconds, :retention_seconds, :sample_rate, :enabled,
-      :redis_url, :redis_pool_size, :use_rack_after_reply, :max_buckets
+      :redis, :redis_pool_size, :use_rack_after_reply, :max_buckets
     attr_reader :keyspaces
 
     def initialize
@@ -15,13 +17,33 @@ module CacheStache
       @sample_rate = 1.0
       @enabled = rails_env != "test"
       @use_rack_after_reply = false
-      @redis_url = ENV.fetch("CACHE_STACHE_REDIS_URL") { ENV.fetch("REDIS_URL", "redis://localhost:6379/0") }
+      @redis = ENV.fetch("CACHE_STACHE_REDIS_URL") { ENV.fetch("REDIS_URL", "redis://localhost:6379/0") }
       @redis_pool_size = 5
       @max_buckets = 288
       @keyspaces = []
       @keyspace_cache = {}
     end
 
+    # Factory method to create a new Redis instance.
+    #
+    # Handles three options:
+    #
+    #   Option  Class       Result
+    #   :redis  Proc    ->  redis.call
+    #   :redis  String  ->  Redis.new(url: redis)
+    #   :redis  Object  ->  redis (assumed to be a Redis-compatible client)
+    #
+    def build_redis
+      case redis
+      when Proc
+        redis.call
+      when String
+        ::Redis.new(DEFAULT_REDIS_OPTIONS.merge(url: redis))
+      else
+        redis
+      end
+    end
+
     def keyspace(name, &block)
       ks = Keyspace.new(name)
       builder = KeyspaceBuilder.new(ks)
@@ -43,8 +65,9 @@ module CacheStache
     def validate!
       raise Error, "bucket_seconds must be positive" unless bucket_seconds.to_i.positive?
       raise Error, "retention_seconds must be positive" unless retention_seconds.to_i.positive?
+      raise Error, "redis must be configured" if redis.nil?
+      raise Error, "redis must be a Proc, String (URL), or Redis-compatible object" unless valid_redis_option?
       raise Error, "redis_pool_size must be positive" unless redis_pool_size.to_i.positive?
-      raise Error, "redis_url must be configured" if redis_url.to_s.strip.empty?
       raise Error, "sample_rate must be between 0 and 1" unless sample_rate&.between?(0, 1)
       raise Error, "max_buckets must be positive" unless max_buckets.to_i.positive?
 
@@ -64,6 +87,12 @@ module CacheStache
 
     private
 
+    def valid_redis_option?
+      return true if redis.is_a?(Proc)
+      return redis.to_s.strip.length > 0 if redis.is_a?(String)
+      true # Assume other objects are Redis-compatible clients
+    end
+
     def key_digest(key)
       # Use last 4 chars of a simple hash as cache key
       Digest::MD5.hexdigest(key.to_s)[-4..]

data/lib/cache_stache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CacheStache
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/generators/cache_stache/templates/cache_stache.rb

@@ -4,9 +4,15 @@
 # This file configures the CacheStache cache hit rate monitoring system.
 
 CacheStache.configure do |config|
-  # Redis connection for storing cache metrics
-  # Falls back to ENV["REDIS_URL"] if not set
-  config.redis_url = ENV.fetch("CACHE_STACHE_REDIS_URL", ENV["REDIS_URL"])
+  # Redis connection for storing cache metrics.
+  # Can be a String (URL), Proc, or Redis-compatible object.
+  #
+  # Examples:
+  #   config.redis = "redis://localhost:6379/0"
+  #   config.redis = -> { Redis.new(url: ENV["REDIS_URL"]) }
+  #   config.redis = ConnectionPool.new { Redis.new }
+  #
+  config.redis = ENV.fetch("CACHE_STACHE_REDIS_URL", ENV["REDIS_URL"])
 
   # Size of time buckets for aggregation (default: 5 minutes)
   config.bucket_seconds = 5.minutes

data/spec/cache_stache_helper.rb

@@ -50,7 +50,7 @@ module CacheStacheTestHelpers
   # Build a test configuration with common defaults
   def build_test_config(keyspaces: {}, **options)
     CacheStache::Configuration.new.tap do |c|
-      c.redis_url = CACHE_STACHE_TEST_REDIS_URL
+      c.redis = CACHE_STACHE_TEST_REDIS_URL
       c.bucket_seconds = options.fetch(:bucket_seconds, 300)
       c.retention_seconds = options.fetch(:retention_seconds, 3600)
       c.sample_rate = options.fetch(:sample_rate, 1.0)
@@ -87,7 +87,7 @@ RSpec.configure do |config|
   config.before do
     # Configure CacheStache to use test Redis
     CacheStache.configure do |c|
-      c.redis_url = CACHE_STACHE_TEST_REDIS_URL
+      c.redis = CACHE_STACHE_TEST_REDIS_URL
       c.redis_pool_size = 1
       c.enabled = true
     end

data/spec/unit/configuration_spec.rb

@@ -19,11 +19,38 @@ RSpec.describe CacheStache::Configuration do
     it { expect(config.sample_rate).to eq(1.0) }
     it { expect(config.enabled).to be(true) }
     it { expect(config.use_rack_after_reply).to be(false) }
-    it { expect(config.redis_url).to eq(default_redis_url) }
+    it { expect(config.redis).to eq(default_redis_url) }
     it { expect(config.redis_pool_size).to eq(5) }
     it { expect(config.keyspaces).to eq([]) }
   end
 
+  describe "#build_redis" do
+    it "calls the proc when redis is a Proc" do
+      redis_instance = instance_double(Redis)
+      config.redis = -> { redis_instance }
+
+      expect(config.build_redis).to eq(redis_instance)
+    end
+
+    it "creates a Redis instance when redis is a String URL" do
+      config.redis = "redis://localhost:6379/1"
+
+      expect(Redis).to receive(:new).with(
+        hash_including(url: "redis://localhost:6379/1")
+      ).and_call_original
+
+      result = config.build_redis
+      expect(result).to be_a(Redis)
+    end
+
+    it "returns the object directly when redis is an Object" do
+      redis_instance = instance_double(Redis)
+      config.redis = redis_instance
+
+      expect(config.build_redis).to eq(redis_instance)
+    end
+  end
+
   describe "#keyspace" do
     it "adds a keyspace with the given name" do
       config.keyspace(:views) do
@@ -135,12 +162,27 @@ RSpec.describe CacheStache::Configuration do
 
   describe "#validate!" do
     before do
-      config.redis_url = "redis://localhost:6379/0"
+      config.redis = "redis://localhost:6379/0"
+    end
+
+    it "requires redis" do
+      config.redis = nil
+      expect { config.validate! }.to raise_error(CacheStache::Error, /redis must be configured/)
+    end
+
+    it "rejects empty string for redis" do
+      config.redis = "   "
+      expect { config.validate! }.to raise_error(CacheStache::Error, /redis must be a Proc, String/)
     end
 
-    it "requires redis_url" do
-      config.redis_url = nil
-      expect { config.validate! }.to raise_error(CacheStache::Error, /redis_url must be configured/)
+    it "accepts a Proc for redis" do
+      config.redis = -> { Redis.new }
+      expect { config.validate! }.not_to raise_error
+    end
+
+    it "accepts an Object for redis" do
+      config.redis = instance_double(Redis)
+      expect { config.validate! }.not_to raise_error
     end
 
     it "requires redis_pool_size to be positive" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_stache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - CacheStache contributors