redis-session-store 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f3683b0cfb27fd4e78c5639909af2234bb5bbfb
-  data.tar.gz: 269d6ab5865c26a9e7f6fb03a467c823569eda6d
+  metadata.gz: 56bc245a6348c77dc89fd0f9cafcb190ce55bf0a
+  data.tar.gz: 39c2e4dacfb2bdf3ffdb2ab661199cca1f41bac8
 SHA512:
-  metadata.gz: 896d45ca2a1aa9234bef55dae1170e265bc608a1d300aea69add6a7df1a0de580655017f90804fb4d36d82e5c4beccf8daaafb6a23a0d6702f3b43d0c82eab38
-  data.tar.gz: 78bf2f881ecfc5da216115e34f71dbe117b91b99b35a9bd29e030d0bee9380816802b2691b4468539a651dd3ddcc6533bf69a96a9950b9eb8ac389445a586aa3
+  metadata.gz: 3c3766b71ff8e0c3d1e1e89497a6cf7e7b59c2cba3a199e7e94f59cd246deb9762df2e3d78fc420cd835cacebfb9eaeeae7cb7809262211fcb4c0aecb7b992a9
+  data.tar.gz: 3dcf04844ab54396592dbae1ac820f600fa73d0147b6695582dc6ae0c4596ab8bedfef2a7c0dc89a4c7c42a73e8a833292a7d11401520c55a5c4737be16ad670

data/.rubocop.yml

@@ -1 +1,10 @@
----
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-03-13 18:57:37 -0400 using RuboCop version 0.19.0.
+# 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
+FileName:
+  Enabled: false

data/AUTHORS.md

@@ -11,4 +11,5 @@ Redis Session Store authors
 - Justin McNally
 - Mathias Meyer
 - Michael Fields
+- Olek Poplavsky
 - Tim Lossen

data/README.md

@@ -2,6 +2,7 @@ Redis Session Store
 ===================
 
 [![Build Status](https://travis-ci.org/roidrage/redis-session-store.png?branch=master)](https://travis-ci.org/roidrage/redis-session-store)
+[![Code Climate](https://codeclimate.com/github/roidrage/redis-session-store.png)](https://codeclimate.com/github/roidrage/redis-session-store)
 
 A simple Redis-based session store for Rails.  But why, you ask,
 when there's [redis-store](http://github.com/jodosha/redis-store/)?

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.4.0'
+  VERSION = '0.4.2'
 
   # ==== Options
   # * +:key+ - Same as with the other cookie stores, key name
@@ -36,7 +36,7 @@ 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]
+    @raise_errors = !options[:raise_errors].nil?
   end
 
   private
@@ -48,15 +48,20 @@ class RedisSessionStore < ActionDispatch::Session::AbstractStore
   end
 
   def get_session(env, sid)
-    sid ||= generate_sid
-    begin
-      data = redis.get(prefixed(sid))
-      session = data.nil? ? {} : Marshal.load(data)
-    rescue Errno::ECONNREFUSED => e
-      raise e if raise_errors
+    unless sid && (session = load_session_from_redis(sid))
+      sid = generate_sid
       session = {}
     end
+
     [sid, session]
+  rescue Errno::ECONNREFUSED => e
+    raise e if raise_errors
+    [generate_sid, {}]
+  end
+
+  def load_session_from_redis(sid)
+    data = redis.get(prefixed(sid))
+    data ? Marshal.load(data) : nil
   end
 
   def set_session(env, sid, session_data, options = nil)

data/spec/redis_session_store_spec.rb

@@ -171,11 +171,19 @@ describe RedisSessionStore do
     end
 
     context 'when redis is down' do
-      before { store.stub(:redis).and_raise(Errno::ECONNREFUSED) }
+      before do
+        store.stub(:redis).and_raise(Errno::ECONNREFUSED)
+        store.stub(generate_sid: 'foop')
+      end
+
+      it 'returns an empty session hash' do
+        expect(store.send(:get_session, double('env'), fake_key).last)
+          .to eq({})
+      end
 
-      it 'should return an empty session hash' do
-        expect(store.send(:get_session, double('env'), fake_key))
-          .to eq([fake_key, {}])
+      it 'returns a newly generated sid' do
+        expect(store.send(:get_session, double('env'), fake_key).first)
+          .to eq('foop')
       end
 
       context 'when :raise_errors option is truthy' do

data/spec/support.rb

@@ -1,9 +1,9 @@
 # vim:fileencoding=utf-8
 
 unless defined?(ActionDispatch::Session::AbstractStore)
-  module ActionDispatch # rubocop:disable Documentation
+  module ActionDispatch
     module Session
-      class AbstractStore
+      class AbstractStore # rubocop:disable Documentation
         ENV_SESSION_OPTIONS_KEY = 'rack.session.options'.freeze
         DEFAULT_OPTIONS = {
           key: '_session_id',
@@ -35,7 +35,7 @@ end
 unless defined?(Rails)
   require 'logger'
 
-  module Rails
+  module Rails # rubocop:disable Documentation
     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.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Mathias Meyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis