redis-session-store 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d849f844f92e7e968078cf93d5802c868613bad0bfcefce1b72dd89724f76e3c
-  data.tar.gz: 6c022fcdc3cdf7254ef738e7450530238fb813eed58b73055f7e851c8335fca4
+  metadata.gz: 90331bd500f283f691772c63fe0fd9800433c50aca9a380ff5bde853bf70fd19
+  data.tar.gz: 6d5b6f2f7017261c21f6265de114ac78d7febcfacfa50e308a56dcb15a4ae216
 SHA512:
-  metadata.gz: b6c00740b8272f8626e3e4f902b927cefb50901e9fa7981d4a4b4e291d2c2bbbe9ab5d60c0b44453a38d08777aee818f4ae7218a7bc7e221996e54f659add5e4
-  data.tar.gz: 6d39606e90215ecda6a7575231082da256381f765c457fc220a339a287618f820f8af44e3d2efb32fa160dc7351a51c92b4326afae5c670acd1b1292384aa5ec
+  metadata.gz: a7bb1ac24ac0cbc84f7d923047c8d05fdab9936c53bb1faa6b571617fc0b59706ca386527094aa5d2533cb9867dc00990404836b578077c4121805ee9eb4fce6
+  data.tar.gz: 50fa31bdfe84b874f97ee55e86eb8a575ad49eccd60f22b8315e23e1cf87e01940470b46ddf089ee9d5fc720112abf8010e1ae6983c85993baa20237c3380946

data/.github/workflows/ruby.yml

@@ -19,10 +19,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.5, 2.6, 2.7, head, jruby-9.2.20.1, jruby-head]
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - '3.0'
+          - 3.1
+          - head
+          - jruby-9.2.20.1
+          - jruby-head
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/AUTHORS.md

@@ -24,3 +24,4 @@ Redis Session Store authors
 - Peter Karman
 - Zach Margolis
 - Zachary Belzer
+- Yutaka Kamei

data/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ## [Unreleased]
 
+# [0.11.5] - 2022-11-27
+
+### Changed
+
+- Support redis 5
+- Actionpack more than or equal to 6
+
 ## [0.11.4] - 2022-01-29
 ### Fixed
 - Use AbstractSecureStore for security fix

data/README.md

@@ -32,7 +32,7 @@ See `lib/redis-session-store.rb` for a list of valid options.
 In your Rails app, throw in an initializer with the following contents:
 
 ``` ruby
-Rails.application.config.session_store :redis_session_store, {
+Rails.application.config.session_store :redis_session_store,
   key: 'your_session_key',
   redis: {
     expire_after: 120.minutes,  # cookie expiration
@@ -40,7 +40,6 @@ Rails.application.config.session_store :redis_session_store, {
     key_prefix: 'myapp:session:',
     url: 'redis://localhost:6379/0',
   }
-}
 ```
 
 ### Redis unavailability handling
@@ -49,13 +48,12 @@ If you want to handle cases where Redis is unavailable, a custom
 callable handler may be provided as `on_redis_down`:
 
 ``` ruby
-Rails.application.config.session_store :redis_session_store, {
+Rails.application.config.session_store :redis_session_store,
   # ... other options ...
   on_redis_down: ->(e, env, sid) { do_something_will_ya!(e) }
   redis: {
     # ... redis options ...
   }
-}
 ```
 
 ### Serializer
@@ -69,13 +67,12 @@ custom serializer:
 * `CustomClass` - You can just pass the constant name of any class that responds to `.load` and `.dump`
 
 ``` ruby
-Rails.application.config.session_store :redis_session_store, {
+Rails.application.config.session_store :redis_session_store,
   # ... other options ...
   serializer: :hybrid
   redis: {
     # ... redis options ...
   }
-}
 ```
 
 **Note**: Rails 4 is required for using the `:json` and `:hybrid` serializers
@@ -88,20 +85,19 @@ custom callable handler may be provided as `on_session_load_error` which
 will be given the error and the session ID.
 
 ``` ruby
-Rails.application.config.session_store :redis_session_store, {
+Rails.application.config.session_store :redis_session_store,
   # ... other options ...
   on_session_load_error: ->(e, sid) { do_something_will_ya!(e) }
   redis: {
     # ... redis options ...
   }
-}
 ```
 
 **Note** The session will *always* be destroyed when it cannot be loaded.
 
 ### Other notes
 
-It returns with_indifferent_access if ActiveSupport is defined
+It returns with_indifferent_access if ActiveSupport is defined.
 
 ## Rails 2 Compatibility
 

data/lib/redis-session-store.rb

@@ -3,7 +3,7 @@ require 'redis'
 # Redis session storage for Rails, and for Rails only. Derived from
 # the MemCacheStore code, simply dropping in Redis instead.
 class RedisSessionStore < ActionDispatch::Session::AbstractSecureStore
-  VERSION = '0.11.4'.freeze
+  VERSION = '0.11.5'.freeze
   # Rails 3.1 and beyond defines the constant elsewhere
   unless defined?(ENV_SESSION_OPTIONS_KEY)
     ENV_SESSION_OPTIONS_KEY = if Rack.release.split('.').first.to_i > 1
@@ -27,25 +27,23 @@ class RedisSessionStore < ActionDispatch::Session::AbstractSecureStore
   #
   # ==== Examples
   #
-  #     Rails.application.config.session_store :redis_session_store, {
+  #     Rails.application.config.session_store :redis_session_store,
   #       key: 'your_session_key',
   #       redis: {
   #         expire_after: 120.minutes,
   #         key_prefix: 'myapp:session:',
   #         url: 'redis://localhost:6379/0'
   #       },
-  #       on_redis_down: ->(*a) { logger.error("Redis down! #{a.inspect}") }
+  #       on_redis_down: ->(*a) { logger.error("Redis down! #{a.inspect}") },
   #       serializer: :hybrid # migrate from Marshal to JSON
-  #     }
   #
   def initialize(app, options = {})
     super
 
-    redis_options = options[:redis] || {}
-
     @default_options[:namespace] = 'rack:session'
-    @default_options.merge!(redis_options)
-    @redis = redis_options[:client] || Redis.new(redis_options)
+    @default_options.merge!(options[:redis] || {})
+    init_options = options[:redis]&.reject { |k, _v| %i[expire_after key_prefix].include?(k) } || {}
+    @redis = init_options[:client] || Redis.new(init_options)
     @on_redis_down = options[:on_redis_down]
     @serializer = determine_serializer(options[:serializer])
     @on_session_load_error = options[:on_session_load_error]

data/redis-session-store.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.version = File.read('lib/redis-session-store.rb')
                     .match(/^  VERSION = '(.*)'/)[1]
 
-  gem.add_runtime_dependency 'actionpack', '>= 3', '< 8'
-  gem.add_runtime_dependency 'redis', '>= 3', '< 5'
+  gem.add_runtime_dependency 'actionpack', '>= 6', '< 8'
+  gem.add_runtime_dependency 'redis', '>= 3', '< 6'
 
   gem.add_development_dependency 'fakeredis', '~> 0.8'
   gem.add_development_dependency 'rake', '~> 13'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-session-store
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Mathias Meyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-29 00:00:00.000000000 Z
+date: 2022-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -39,7 +39,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: fakeredis
   requirement: !ruby/object:Gem::Requirement