Skip to content

Commit 9df709c

Browse files
authored
support for redis-rb v5 (#137)
1 parent e9a7d80 commit 9df709c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

lib/redis-session-store.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ class RedisSessionStore < ActionDispatch::Session::AbstractSecureStore
4040
def initialize(app, options = {})
4141
super
4242

43-
redis_options = options[:redis] || {}
44-
4543
@default_options[:namespace] = 'rack:session'
46-
@default_options.merge!(redis_options)
47-
@redis = redis_options[:client] || Redis.new(redis_options)
44+
@default_options.merge!(options[:redis] || {})
45+
init_options = options[:redis]&.reject { |k, _v| %i[expire_after key_prefix].include?(k) } || {}
46+
@redis = init_options[:client] || Redis.new(init_options)
4847
@on_redis_down = options[:on_redis_down]
4948
@serializer = determine_serializer(options[:serializer])
5049
@on_session_load_error = options[:on_session_load_error]

redis-session-store.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
1616
.match(/^ VERSION = '(.*)'/)[1]
1717

1818
gem.add_runtime_dependency 'actionpack', '>= 6', '< 8'
19-
gem.add_runtime_dependency 'redis', '>= 3', '< 5'
19+
gem.add_runtime_dependency 'redis', '>= 3', '< 6'
2020

2121
gem.add_development_dependency 'fakeredis', '~> 0.8'
2222
gem.add_development_dependency 'rake', '~> 13'

0 commit comments

Comments
 (0)