legion-cache 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e74d63805b57a8da13750d3a281d1ef6b25989454bd7dfa385da9d0ba3087a0b
-  data.tar.gz: 2949f0b310c3653516e4dedd0f1def27e8cc9621baf1bace393fcb439c722ace
+  metadata.gz: 657e7afe142d9420c0414c416fdf612ef75456262c91165d545112960bf44e71
+  data.tar.gz: 137d4eb307b337bcda85f91db10fddc42319793a99cde3038fbf9799db960d78
 SHA512:
-  metadata.gz: 9f549b3501d9bdfe38e9a3fb19cb5afba9418be9676dfa6a1a0086f7d1f8dbfe6a9e9a64a19dc8a6f60be4282b91096cabcd404cff7a0938257073fdd224fbec
-  data.tar.gz: 7c2a1d4d2adf6357d619961f6bc02d4945a6d23b43807079f4c58ebaaf939b38128965f21934538cfaff64833892acb92f6b9bbe2b5ecacd9c8eb4e978c33698
+  metadata.gz: e167c6f650ad38373f8794f9cfc209857fd5053b9751375cf77f7ae9537eab23c40cd33947cc656c64dd77e7832f1312987739b4c95c1d2873b5cdf377aeff0d
+  data.tar.gz: 7e38075e7257b4b04fbdefb22de3da21d0055be631f8a6ca4f17d0c78f5669e153d0590aabd3742c05990f88c4e7c55d85409dfae90a5ec6741f36913af54f92

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.3.1] - 2026-03-20
+
+### Added
+- `Settings.normalize_driver` — maps `:memcached`, `:dalli`, `:redis` to internal gem names
+- `Settings.resolve_servers` — merges `server:` (string) and `servers:` (array), injects default port per driver (memcached: 11211, redis: 6379), deduplicates
+- `Settings::DEFAULT_PORTS` constant for driver default ports
+
+### Fixed
+- Redis driver now uses configured `server:`/`servers:` instead of hardcoded localhost
+- Memcached driver accepts `server:` (singular) in addition to `servers:` (plural)
+
+### Changed
+- `Settings.default` and `Settings.local` use `resolve_servers` for driver-aware server defaults
+- Driver selection in `cache.rb` and `local.rb` uses `normalize_driver` for consistent name handling
+
 ## [1.3.0] - 2026-03-16
 
 ### Added

data/CLAUDE.md

@@ -8,6 +8,7 @@
 Caching wrapper for the LegionIO framework. Provides a consistent interface for Memcached (via `dalli`) and Redis (via `redis` gem) with connection pooling. Driver selection is config-driven.
 
 **GitHub**: https://github.com/LegionIO/legion-cache
+**Version**: 1.3.0
 **License**: Apache-2.0
 
 ## Architecture

data/README.md

@@ -2,7 +2,7 @@
 
 Caching wrapper for the [LegionIO](https://github.com/LegionIO/LegionIO) framework. Provides a consistent interface for Memcached (via `dalli`) and Redis (via `redis` gem) with connection pooling. Driver selection is config-driven.
 
-**Version**: 1.3.0
+**Version**: 1.3.1
 
 ## Installation
 
@@ -80,6 +80,24 @@ Local uses a separate namespace (`legion_local`) and independent connection pool
 
 The driver is auto-detected at load time: prefers `dalli` (Memcached) if available, falls back to `redis`. Override with `"driver": "redis"` and update `servers` to point at your Redis instance.
 
+### Driver Names
+
+Supported driver names: `memcached` (or `dalli`), `redis`. All names are normalized internally — `"memcached"` and `"dalli"` are equivalent.
+
+### Server Resolution
+
+Both `server` (singular string) and `servers` (array) are accepted and merged. Default ports are injected per driver when omitted: 11211 for memcached, 6379 for redis. Duplicates are removed.
+
+```json
+{
+  "cache": {
+    "driver": "memcached",
+    "server": "10.0.0.5",
+    "servers": ["10.0.0.6", "10.0.0.7:22122"]
+  }
+}
+```
+
 ### Memcached notes
 
 - `value_max_bytes` defaults to **8MB**. Dalli enforces a 1MB client-side limit by default, which silently rejects large values. This default overrides that. Your Memcached server should also be started with `-I 8m` to match.

data/lib/legion/cache/local.rb

@@ -94,7 +94,7 @@ module Legion
         private
 
         def build_driver(driver_name)
-          case driver_name
+          case Legion::Cache::Settings.normalize_driver(driver_name)
           when 'redis'
             require 'legion/cache/redis'
             Legion::Cache::Redis.dup

data/lib/legion/cache/memcached.rb

@@ -9,18 +9,25 @@ module Legion
       include Legion::Cache::Pool
       extend self # rubocop:disable Style/ModuleFunction
 
-      def client(servers: Legion::Settings[:cache][:servers], **opts)
+      def client(server: nil, servers: nil, **opts)
         return @client unless @client.nil?
 
-        @pool_size = opts.key?(:pool_size) ? opts[:pool_size] : Legion::Settings[:cache][:pool_size] || 10
-        @timeout = opts.key?(:timeout) ? opts[:timeout] : Legion::Settings[:cache][:timeout] || 5
+        settings = defined?(Legion::Settings) ? Legion::Settings[:cache] : {}
+        servers ||= settings[:servers] || []
+
+        @pool_size = opts.key?(:pool_size) ? opts[:pool_size] : settings[:pool_size] || 10
+        @timeout = opts.key?(:timeout) ? opts[:timeout] : settings[:timeout] || 5
+
+        resolved = Legion::Cache::Settings.resolve_servers(
+          driver: 'memcached', server: server, servers: Array(servers)
+        )
 
         Dalli.logger = Legion::Logging
-        cache_opts = Legion::Settings[:cache].merge(opts)
+        cache_opts = settings.merge(opts)
         cache_opts[:value_max_bytes] ||= 8 * 1024 * 1024
 
         @client = ConnectionPool.new(size: pool_size, timeout: timeout) do
-          Dalli::Client.new(servers, cache_opts)
+          Dalli::Client.new(resolved, cache_opts)
         end
 
         @connected = true

data/lib/legion/cache/redis.rb

@@ -2,6 +2,7 @@
 
 require 'redis'
 require 'legion/cache/pool'
+require 'legion/cache/settings'
 
 module Legion
   module Cache
@@ -9,14 +10,19 @@ module Legion
       include Legion::Cache::Pool
       extend self # rubocop:disable Style/ModuleFunction
 
-      def client(pool_size: 20, timeout: 5, **)
+      def client(pool_size: 20, timeout: 5, server: nil, servers: [], **)
         return @client unless @client.nil?
 
         @pool_size = pool_size
         @timeout = timeout
 
+        resolved = Legion::Cache::Settings.resolve_servers(
+          driver: 'redis', server: server, servers: servers
+        )
+        host, port = resolved.first.split(':')
+
         @client = ConnectionPool.new(size: pool_size, timeout: timeout) do
-          ::Redis.new
+          ::Redis.new(host: host, port: port.to_i)
         end
         @connected = true
         @client

data/lib/legion/cache/settings.rb

@@ -14,7 +14,7 @@ module Legion
       def self.default
         {
           driver:     driver,
-          servers:    ['127.0.0.1:11211'],
+          servers:    resolve_servers(driver: driver),
           connected:  false,
           enabled:    true,
           namespace:  'legion',
@@ -32,7 +32,7 @@ module Legion
       def self.local
         {
           driver:     driver,
-          servers:    ['127.0.0.1:11211'],
+          servers:    resolve_servers(driver: driver),
           connected:  false,
           enabled:    true,
           namespace:  'legion_local',
@@ -47,6 +47,27 @@ module Legion
         }
       end
 
+      DEFAULT_PORTS = { 'dalli' => 11_211, 'redis' => 6379 }.freeze
+
+      def self.resolve_servers(driver:, server: nil, servers: [], port: nil)
+        gem_driver = normalize_driver(driver)
+        port ||= DEFAULT_PORTS.fetch(gem_driver, 11_211)
+
+        all = Array(servers) + Array(server)
+        all = ["127.0.0.1:#{port}"] if all.empty?
+
+        all.map! { |s| s.include?(':') ? s : "#{s}:#{port}" }
+        all.uniq
+      end
+
+      def self.normalize_driver(name)
+        case name.to_s
+        when 'redis' then 'redis'
+        when 'memcached', 'dalli' then 'dalli'
+        else name.to_s
+        end
+      end
+
       def self.driver(prefer = 'dalli')
         secondary = prefer == 'dalli' ? 'redis' : 'dalli'
         if Gem::Specification.find_all_by_name(prefer).any?

data/lib/legion/cache/version.rb

@@ -2,6 +2,6 @@
 
 module Legion
   module Cache
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/lib/legion/cache.rb

@@ -9,7 +9,7 @@ require 'legion/cache/local'
 
 module Legion
   module Cache
-    if Legion::Settings[:cache][:driver] == 'redis'
+    if Legion::Cache::Settings.normalize_driver(Legion::Settings[:cache][:driver]) == 'redis'
       extend Legion::Cache::Redis
     else
       extend Legion::Cache::Memcached

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: legion-cache
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Esity