redis-session-store 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c01a4bd8ba08bf7a390925f4dc40f8b9c008d6
-  data.tar.gz: 91efb335e55ba86ee01476a74ab4ed0217b48e85
+  metadata.gz: 6f3683b0cfb27fd4e78c5639909af2234bb5bbfb
+  data.tar.gz: 269d6ab5865c26a9e7f6fb03a467c823569eda6d
 SHA512:
-  metadata.gz: cfb8578cfa2a62b70bf4f79ea3574e26c82b5e439d9df7ea3097f6d4bea98543e10590daf2ecc484922feb5868a409af47d5126a768c4f67ba392771837f144f
-  data.tar.gz: 1b369cf1663b3ba9a581fc0557541b53546762726086ffa0a799d8fd582a45b4c0b73cfd7ee92f50ec74a90f104155422170ab83007c7f15103daf1a8a712dda
+  metadata.gz: 896d45ca2a1aa9234bef55dae1170e265bc608a1d300aea69add6a7df1a0de580655017f90804fb4d36d82e5c4beccf8daaafb6a23a0d6702f3b43d0c82eab38
+  data.tar.gz: 78bf2f881ecfc5da216115e34f71dbe117b91b99b35a9bd29e030d0bee9380816802b2691b4468539a651dd3ddcc6533bf69a96a9950b9eb8ac389445a586aa3

data/AUTHORS.md

@@ -8,6 +8,7 @@ Redis Session Store authors
 - Gonçalo Silva
 - Ian C. Anderson
 - Jorge Pardiñas
+- Justin McNally
 - Mathias Meyer
 - Michael Fields
 - Tim Lossen

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Mathias Meyer
+Copyright (c) 2014 Mathias Meyer
 
 MIT License
 

data/lib/redis-session-store.rb

@@ -4,7 +4,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.3.1'
+  VERSION = '0.4.0'
 
   # ==== Options
   # * +:key+ - Same as with the other cookie stores, key name
@@ -36,11 +36,12 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
     @default_options.merge!(namespace: 'rack:session')
     @default_options.merge!(redis_options)
     @redis = Redis.new(redis_options)
+    @raise_errors = !!options[:raise_errors]
   end
 
   private
 
-  attr_reader :redis, :key, :default_options
+  attr_reader :redis, :key, :default_options, :raise_errors
 
   def prefixed(sid)
     "#{default_options[:key_prefix]}#{sid}"
@@ -51,26 +52,29 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
     begin
       data = redis.get(prefixed(sid))
       session = data.nil? ? {} : Marshal.load(data)
-    rescue Errno::ECONNREFUSED
+    rescue Errno::ECONNREFUSED => e
+      raise e if raise_errors
       session = {}
     end
     [sid, session]
   end
 
-  def set_session(env, sid, session_data, options)
-    expiry  = options[:expire_after] || nil
+  def set_session(env, sid, session_data, options = nil)
+    expiry = (options || env[ENV_SESSION_OPTIONS_KEY])[:expire_after]
     if expiry
       redis.setex(prefixed(sid), expiry, Marshal.dump(session_data))
     else
       redis.set(prefixed(sid), Marshal.dump(session_data))
     end
     return sid
-  rescue Errno::ECONNREFUSED
+  rescue Errno::ECONNREFUSED => e
+    raise e if raise_errors
     return false
   end
 
   def destroy_session(env, sid, options)
     redis.del(prefixed(sid))
+    return nil if (options || {})[:drop]
     generate_sid
   end
 
@@ -78,12 +82,9 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
     if env['rack.request.cookie_hash'] && env['rack.request.cookie_hash'][key]
       redis.del(prefixed(env['rack.request.cookie_hash'][key]))
     end
-  rescue Errno::ECONNREFUSED
-    if defined?(Rails)
-      Rails.logger.warn('RedisSessionStore#destroy: ' <<
-                        'Connection to redis refused')
-    else
-      warn('RedisSessionStore#destroy: Connection to redis refused')
-    end
+  rescue Errno::ECONNREFUSED => e
+    raise e if raise_errors
+    Rails.logger.warn("RedisSessionStore#destroy: #{e.message}")
+    false
   end
 end

data/spec/redis_session_store_spec.rb

@@ -108,12 +108,10 @@ describe RedisSessionStore do
     let(:options)      { { expire_after: 123 } }
 
     context 'when successfully persisting the session' do
-
       it 'returns the session id' do
         store.send(:set_session, env, session_id, session_data, options)
           .should eq(session_id)
       end
-
     end
 
     context 'when unsuccessfully persisting the session' do
@@ -127,6 +125,33 @@ describe RedisSessionStore do
       end
     end
 
+    context 'when no expire_after option is given' do
+      let(:options) { {} }
+
+      it 'sets the session value without expiry' do
+        store.send(:set_session, env, session_id, session_data, options)
+          .should eq(session_id)
+      end
+    end
+
+    context 'when redis is down' do
+      before { store.stub(:redis).and_raise(Errno::ECONNREFUSED) }
+
+      it 'returns false' do
+        store.send(:set_session, env, session_id, session_data, options)
+          .should eq(false)
+      end
+
+      context 'when :raise_errors option is truthy' do
+        let(:options) { { raise_errors: true } }
+
+        it 'explodes' do
+          expect do
+            store.send(:set_session, env, session_id, session_data, options)
+          end.to raise_error(Errno::ECONNREFUSED)
+        end
+      end
+    end
   end
 
   describe 'fetching a session' do
@@ -146,13 +171,22 @@ describe RedisSessionStore do
     end
 
     context 'when redis is down' do
+      before { store.stub(:redis).and_raise(Errno::ECONNREFUSED) }
 
       it 'should return an empty session hash' do
-        store.stub(:redis).and_raise(Errno::ECONNREFUSED)
-
         expect(store.send(:get_session, double('env'), fake_key))
           .to eq([fake_key, {}])
       end
+
+      context 'when :raise_errors option is truthy' do
+        let(:options) { { raise_errors: true } }
+
+        it 'explodes' do
+          expect do
+            store.send(:get_session, double('env'), fake_key)
+          end.to raise_error(Errno::ECONNREFUSED)
+        end
+      end
     end
   end
 
@@ -174,6 +208,24 @@ describe RedisSessionStore do
 
         store.send(:destroy, env)
       end
+
+      context 'when redis is down' do
+        before { store.stub(:redis).and_raise(Errno::ECONNREFUSED) }
+
+        it 'should return false' do
+          expect(store.send(:destroy, env)).to be_false
+        end
+
+        context 'when :raise_errors option is truthy' do
+          let(:options) { { raise_errors: true } }
+
+          it 'explodes' do
+            expect do
+              store.send(:destroy, env)
+            end.to raise_error(Errno::ECONNREFUSED)
+          end
+        end
+      end
     end
 
     context 'when destroyed via #destroy_session' do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # vim:fileencoding=utf-8
 
 require 'simplecov'
-require_relative 'fake_action_dispatch_session_abstract_store'
+require_relative 'support'
 require 'fakeredis/rspec'
 require 'redis-session-store'

data/spec/{fake_action_dispatch_session_abstract_store.rb → support.rb}

@@ -4,6 +4,7 @@ unless defined?(ActionDispatch::Session::AbstractStore)
   module ActionDispatch # rubocop:disable Documentation
     module Session
       class AbstractStore
+        ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
         DEFAULT_OPTIONS = {
           key: '_session_id',
           path: '/',
@@ -30,3 +31,13 @@ unless defined?(ActionDispatch::Session::AbstractStore)
     end
   end
 end
+
+unless defined?(Rails)
+  require 'logger'
+
+  module Rails
+    def self.logger
+      @logger ||= Logger.new('/dev/null')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-session-store
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Mathias Meyer
@@ -118,9 +118,9 @@ files:
 - Rakefile
 - lib/redis-session-store.rb
 - redis-session-store.gemspec
-- spec/fake_action_dispatch_session_abstract_store.rb
 - spec/redis_session_store_spec.rb
 - spec/spec_helper.rb
+- spec/support.rb
 homepage: https://github.com/roidrage/redis-session-store
 licenses:
 - MIT
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A drop-in replacement for e.g. MemCacheStore to store Rails sessions (and