redis-session-store 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43c209eb4dbc6cc3feedd7138dcc6cfbb6e4be35
-  data.tar.gz: e29f05d4800a9bf8453ad3f24504295d5fd21408
+  metadata.gz: 0158a4d89d8a2848b75766683f7e6e5add9c5d4f
+  data.tar.gz: 9551ca90b67dad5c67ab4d028ee5a0bbafe1ef58
 SHA512:
-  metadata.gz: 91de3d098790b0d015bb463ecf28a21d5b84ba1eee2d7a2e8b2b6646231e6265b2c1933d99e825aa0ac8fa03945409b5b3ef03429e1d1599d8239f471f2ce1f0
-  data.tar.gz: 5797ce680e25ccb54e48cb4b5e2720be2287e7facedec7c28940b54a7f8fb1aa1bac91553797a01a02176650058032c3708e89b53b3d8506511472667620f7b7
+  metadata.gz: 587a5a53e8df3fd350c95600754737fef57b697db50834e5e8113a41841c186aa6a4a3f918c3755010a49e0ff62abb80a70f2bcf67c6d83990256de343a49649
+  data.tar.gz: 6bfe6da52599e3ffabc5dfbbea48aedd36f655b2e5ac33023112fffc6e4907105990d1673b7dca816bd0119a3ed105870522556e517e95b1dcfadf353a64fa5e

data/.rubocop_todo.yml

@@ -8,4 +8,4 @@
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 101
+  Max: 107

data/.travis.yml

@@ -1,9 +1,13 @@
 ---
 language: ruby
+sudo: false
 rvm:
 - 1.9.3
-- 2.0.0
-- 2.1.0
+- 2.1.3
+- jruby-19mode
+matrix:
+  allow_failures:
+  - rvm: jruby-19mode
 notifications:
   email: false
 deploy:
@@ -14,5 +18,4 @@ deploy:
   on:
     tags: true
     repo: roidrage/redis-session-store
-    branch: master
-    rvm: 2.0.0
+    rvm: 2.1.3

data/AUTHORS.md

@@ -14,3 +14,4 @@ Redis Session Store authors
 - Michael Xavier
 - Olek Poplavsky
 - Tim Lossen
+- Todd Bealmear

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 redis-session-store history
 ===========================
 
+## v0.8.1 (2016-01-25)
+
+* Support for Rails 5 and Rack 2
+* Expand error support for redis-rb v3 gem
+
 ## v0.8.0 (2014-08-28)
 
 * Allow for injection of custom redis client

data/lib/redis-session-store.rb

@@ -4,10 +4,14 @@ 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.8.0'
+  VERSION = '0.8.1'
   # Rails 3.1 and beyond defines the constant elsewhere
   unless defined?(ENV_SESSION_OPTIONS_KEY)
-    ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
+    if Rack.release.split('.').first.to_i > 1
+      ENV_SESSION_OPTIONS_KEY = Rack::RACK_SESSION_OPTIONS
+    else
+      ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY
+    end
   end
 
   # ==== Options
@@ -69,7 +73,7 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
       value && !value.empty? &&
       redis.exists(prefixed(value))
     )
-  rescue Errno::ECONNREFUSED => e
+  rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
     on_redis_down.call(e, env, value) if on_redis_down
 
     true
@@ -94,10 +98,11 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
     end
 
     [sid, session]
-  rescue Errno::ECONNREFUSED => e
+  rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
     on_redis_down.call(e, env, sid) if on_redis_down
     [generate_sid, {}]
   end
+  alias_method :find_session, :get_session
 
   def load_session_from_redis(sid)
     data = redis.get(prefixed(sid))
@@ -114,7 +119,7 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
     serializer.load(data)
   end
 
-  def set_session(env, sid, session_data, options = nil) # rubocop: disable MethodLength, LineLength
+  def set_session(env, sid, session_data, options = nil)
     expiry = (options || env.fetch(ENV_SESSION_OPTIONS_KEY))[:expire_after]
     if expiry
       redis.setex(prefixed(sid), expiry, encode(session_data))
@@ -122,10 +127,11 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
       redis.set(prefixed(sid), encode(session_data))
     end
     return sid
-  rescue Errno::ECONNREFUSED => e
+  rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
     on_redis_down.call(e, env, sid) if on_redis_down
     return false
   end
+  alias_method :write_session, :set_session
 
   def encode(session_data)
     serializer.dump(session_data)
@@ -137,7 +143,7 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
 
   def destroy(env)
     if env['rack.request.cookie_hash'] &&
-        (sid = env['rack.request.cookie_hash'][key])
+       (sid = env['rack.request.cookie_hash'][key])
       destroy_session_from_sid(sid, drop: true, env: env)
     end
     false
@@ -146,7 +152,7 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
   def destroy_session_from_sid(sid, options = {})
     redis.del(prefixed(sid))
     (options || {})[:drop] ? nil : generate_sid
-  rescue Errno::ECONNREFUSED => e
+  rescue Errno::ECONNREFUSED, Redis::CannotConnectError => e
     on_redis_down.call(e, options[:env] || {}, sid) if on_redis_down
   end
 

data/redis-session-store.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
                 .match(/^  VERSION = '(.*)'/)[1]
 
   gem.add_runtime_dependency 'redis'
-  gem.add_runtime_dependency 'actionpack', '>= 3', '< 5'
+  gem.add_runtime_dependency 'actionpack', '>= 3', '< 5.1'
 
   gem.add_development_dependency 'fakeredis'
   gem.add_development_dependency 'rake'

data/spec/redis_session_store_spec.rb

@@ -149,7 +149,7 @@ describe RedisSessionStore do
 
     context 'when unsuccessfully persisting the session' do
       before do
-        allow(store).to receive(:redis).and_raise(Errno::ECONNREFUSED)
+        allow(store).to receive(:redis).and_raise(Redis::CannotConnectError)
       end
 
       it 'returns false' do
@@ -169,7 +169,7 @@ describe RedisSessionStore do
 
     context 'when redis is down' do
       before do
-        allow(store).to receive(:redis).and_raise(Errno::ECONNREFUSED)
+        allow(store).to receive(:redis).and_raise(Redis::CannotConnectError)
         store.on_redis_down = ->(*_a) { @redis_down_handled = true }
       end
 
@@ -189,7 +189,7 @@ describe RedisSessionStore do
         it 'explodes' do
           expect do
             store.send(:set_session, env, session_id, session_data, options)
-          end.to raise_error(Errno::ECONNREFUSED)
+          end.to raise_error(Redis::CannotConnectError)
         end
       end
     end
@@ -243,7 +243,7 @@ describe RedisSessionStore do
 
       context 'when redis is down' do
         it 'returns true (fallback to old behavior)' do
-          allow(store).to receive(:redis).and_raise(Errno::ECONNREFUSED)
+          allow(store).to receive(:redis).and_raise(Redis::CannotConnectError)
           expect(store.send(:session_exists?, :env)).to eq(true)
         end
       end
@@ -270,7 +270,7 @@ describe RedisSessionStore do
 
     context 'when redis is down' do
       before do
-        allow(store).to receive(:redis).and_raise(Errno::ECONNREFUSED)
+        allow(store).to receive(:redis).and_raise(Redis::CannotConnectError)
         allow(store).to receive(:generate_sid).and_return('foop')
       end
 
@@ -290,7 +290,7 @@ describe RedisSessionStore do
         it 'explodes' do
           expect do
             store.send(:get_session, double('env'), fake_key)
-          end.to raise_error(Errno::ECONNREFUSED)
+          end.to raise_error(Redis::CannotConnectError)
         end
       end
     end
@@ -317,7 +317,7 @@ describe RedisSessionStore do
 
       context 'when redis is down' do
         before do
-          allow(store).to receive(:redis).and_raise(Errno::ECONNREFUSED)
+          allow(store).to receive(:redis).and_raise(Redis::CannotConnectError)
         end
 
         it 'returns false' do
@@ -330,7 +330,7 @@ describe RedisSessionStore do
           it 'explodes' do
             expect do
               store.send(:destroy, env)
-            end.to raise_error(Errno::ECONNREFUSED)
+            end.to raise_error(Redis::CannotConnectError)
           end
         end
       end

data/spec/support.rb

@@ -1,9 +1,9 @@
 # vim:fileencoding=utf-8
 
 unless defined?(Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY)
-  module Rack # rubocop:disable Documentation
+  module Rack
     module Session
-      module Abstract # rubocop:disable Documentation
+      module Abstract
         ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
       end
     end
@@ -11,9 +11,9 @@ unless defined?(Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY)
 end
 
 unless defined?(ActionDispatch::Session::AbstractStore)
-  module ActionDispatch # rubocop:disable Documentation
+  module ActionDispatch
     module Session
-      class AbstractStore # rubocop:disable Documentation
+      class AbstractStore
         ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
         DEFAULT_OPTIONS = {
           key: '_session_id',
@@ -45,7 +45,7 @@ end
 unless defined?(Rails)
   require 'logger'
 
-  module Rails # rubocop:disable Documentation
+  module Rails
     def self.logger
       @logger ||= Logger.new('/dev/null')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-session-store
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Mathias Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -33,7 +33,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: fakeredis
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A drop-in replacement for e.g. MemCacheStore to store Rails sessions (and