redis-session-store 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 197d2120a9c333b43c5c563a89ed0fcc96a6444918d0aa49207e3d74cc1c0fe3
-  data.tar.gz: 6946c195bdb70317a7e2e06c84643401a4e8b520dde2191c48c97e7399a39e7e
+  metadata.gz: ea830a6f15b8fd1ccb1310ab77e2abc54f3b6e70dcef137d81da0929e2e74319
+  data.tar.gz: '013008f119003c119e66226c929da60cd824aab20560cbca017233e1f4e2847e'
 SHA512:
-  metadata.gz: c830641d881e1ebcc7d472f98ca55e9ded617a869e7a5de87a7bd96c09cf23d5ef9244d8978aa7fe8747ba9179bc5e575a9914d2aafb2248b988d79b4e18a9c2
-  data.tar.gz: 086ff62e30cdb9b08b9845f5f9581ad20a05e38aadb868b1dc4ee08d07402ac6571936142c9f775e8c4ed38bdaa6825b9cda5ee7155444fe903e5af907fe70b8
+  metadata.gz: 69360bd3de339d129ed3fd2863c1880e7030cac9a3edf6ebf6834c8b0c330d0f3062bc70fa53237d7b1318f9c5f309a6dc333da0d943d98fc6762ea996db7a32
+  data.tar.gz: e9bf6c72b4e9175d248bb9306ae6728107ec9675642c3309cb14dcd436e7faaa634ce711da37507932abe115655e4acd1b5d1d78cdeeea5e42cdcea1462f68f9

data/.rubocop.yml

@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 AllCops:
   DisplayCopNames: true
   Exclude:
@@ -19,6 +17,9 @@ Metrics/BlockLength:
 Metrics/LineLength:
   Max: 100
 
+Metrics/ClassLength:
+  Max: 120
+
 Security/MarshalLoad:
   Enabled: false
 

data/.travis.yml

@@ -2,11 +2,13 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-- 2.3.1
-- jruby-9.1.15.0
+- 2.3.7
+- 2.4.4
+- 2.5.1
+- jruby-9.2.0.0
 matrix:
   allow_failures:
-  - rvm: jruby-9.1.15.0
+  - rvm: jruby-9.2.0.0
 notifications:
   email: false
 deploy:

data/AUTHORS.md

@@ -20,3 +20,4 @@ Redis Session Store authors
 - Nicolas Rodriguez
 - Sergey Nebolsin
 - Anton Kolodii
+- Peter Karman

data/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 ## [Unreleased]
 
+## [0.11.0] - 2018-08-13
+### Changed
+- JRuby to jruby-9.2.0.0
+- Travis Ruby support: 2.3.7, 2.4.4, 2.5.1
+
+### Added
+- :ttl configuration option
+
 ## [0.10.0] - 2018-04-14
 ### Changed
 - JRuby to jruby-9.1.15.0
@@ -216,7 +224,10 @@
 ### Added
 - first working version
 
-[Unreleased]: https://github.com/roidrage/redis-session-store/compare/v0.9.1...HEAD
+[Unreleased]: https://github.com/roidrage/redis-session-store/compare/v0.11.0...HEAD
+[0.11.0]: https://github.com/roidrage/redis-session-store/compare/v0.10.0...v0.11.0
+[0.10.0]: https://github.com/roidrage/redis-session-store/compare/v0.9.2...v0.10.0
+[0.9.2]: https://github.com/roidrage/redis-session-store/compare/v0.9.1...v0.9.2
 [0.9.1]: https://github.com/roidrage/redis-session-store/compare/v0.9.0...v0.9.1
 [0.9.0]: https://github.com/roidrage/redis-session-store/compare/v0.8.1...v0.9.0
 [0.8.1]: https://github.com/roidrage/redis-session-store/compare/v0.8.0...v0.8.1

data/README.md

@@ -33,12 +33,13 @@ 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
-My::Application.config.session_store :redis_session_store, {
+Rails.application.config.session_store :redis_session_store, {
   key: 'your_session_key',
   redis: {
-    expire_after: 120.minutes,
+    expire_after: 120.minutes,  # cookie expiration
+    ttl: 120.minutes,           # Redis expiration, defaults to 'expire_after'
     key_prefix: 'myapp:session:',
-    url: 'redis://host:12345/2',
+    url: 'redis://localhost:6379/0',
   }
 }
 ```
@@ -49,7 +50,7 @@ If you want to handle cases where Redis is unavailable, a custom
 callable handler may be provided as `on_redis_down`:
 
 ``` ruby
-My::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: {
@@ -69,7 +70,7 @@ custom serializer:
 * `CustomClass` - You can just pass the constant name of any class that responds to `.load` and `.dump`
 
 ``` ruby
-My::Application.config.session_store :redis_session_store, {
+Rails.application.config.session_store :redis_session_store, {
   # ... other options ...
   serializer: :hybrid
   redis: {
@@ -88,7 +89,7 @@ custom callable handler may be provided as `on_session_load_error` which
 will be given the error and the session ID.
 
 ``` ruby
-My::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: {

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::AbstractStore
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.11.0'.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,12 +27,12 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
   #
   # ==== Examples
   #
-  #     My::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://host:12345/2'
+  #         url: 'redis://localhost:6379/0'
   #       },
   #       on_redis_down: ->(*a) { logger.error("Redis down! #{a.inspect}") }
   #       serializer: :hybrid # migrate from Marshal to JSON
@@ -116,7 +116,7 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
   end
 
   def set_session(env, sid, session_data, options = nil)
-    expiry = (options || env.fetch(ENV_SESSION_OPTIONS_KEY))[:expire_after]
+    expiry = get_expiry(env, options)
     if expiry
       redis.setex(prefixed(sid), expiry, encode(session_data))
     else
@@ -129,6 +129,11 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
   end
   alias write_session set_session
 
+  def get_expiry(env, options)
+    session_storage_options = options || env.fetch(ENV_SESSION_OPTIONS_KEY, {})
+    session_storage_options[:ttl] || session_storage_options[:expire_after]
+  end
+
   def encode(session_data)
     serializer.dump(session_data)
   end

data/spec/redis_session_store_spec.rb

@@ -59,6 +59,29 @@ describe RedisSessionStore do
     end
   end
 
+  describe 'when configured with both :ttl and :expire_after' do
+    let(:ttl_seconds) { 60 * 120 }
+    let :options do
+      {
+        key: random_string,
+        secret: random_string,
+        redis: {
+          host: 'hosty.local',
+          port: 16_379,
+          db: 2,
+          key_prefix: 'myapp:session:',
+          ttl: ttl_seconds,
+          expire_after: nil
+        }
+      }
+    end
+
+    it 'assigns the :ttl option to @default_options' do
+      expect(default_options[:ttl]).to eq(ttl_seconds)
+      expect(default_options[:expire_after]).to be_nil
+    end
+  end
+
   describe 'when initializing with top-level redis options' do
     let :options do
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-session-store
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Mathias Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -134,7 +134,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".simplecov"
 - ".travis.yml"
 - AUTHORS.md

data/.rubocop_todo.yml

@@ -1,12 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-07-02 09:22:22 -0400 using RuboCop version 0.41.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 110