rack-redis-session-store 1.0.1 → 1.1.0

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea
+*.iml
+

data/lib/rack-redis-session-store.rb

@@ -7,38 +7,53 @@ module ActionDispatch
   module Session
     class RedisStore < Rack::Session::Abstract::ID
       def initialize(app, options = {})
-        @redis = ConnectionPool::Wrapper.new(:size => options[:max_connections], :timeout => 5) {
+        @redis = ConnectionPool.new(:size => options[:max_connections], :timeout => 5) {
           Redis.new(:host => "#{options[:host]}", :port => options[:port], db: options[:db])
         }
+        options[:expire_after] ||= 1.day.to_i
         super
       end
 
       def generate_sid
-        loop do
-          sid = super
-          break sid unless @redis.get(sid)
+        @redis.with do |redis|
+          loop do
+            sid = super
+            break sid unless redis.get(sid)
+          end
         end
       end
 
       def get_session(env, sid)
-        unless sid and session = @redis.get(sid)
-          sid, session = generate_sid, {}
-          unless /^OK/ =~ @redis.set(sid, session.to_json)
-            raise "Session collision on '#{sid.inspect}'"
+        session = {}
+        if sid!='null'
+          @redis.with do |redis|
+            options = env['rack.session.options']
+            session_string = redis.get(sid)
+            if session_string
+              session = JSON.parse(session_string)
+            end
           end
         else
-          session = JSON.parse(session)
+          sid = generate_sid
         end
         [sid, session]
       end
 
       def set_session(env, session_id, new_session, options)
-        @redis.set session_id, new_session.to_json
-        session_id
+        if (!new_session.empty?)
+          @redis.with do |redis|
+            redis.setex session_id, options[:expire_after], new_session.to_json
+          end
+        end
+        #For some reason, rack doesn't set new session_id to options[:id]
+        options[:id] = session_id
       end
 
       def destroy_session(env, session_id, options)
-        @redis.del(session_id)
+        puts('Destroy session')
+        @redis.with do |redis|
+          redis.del(session_id)
+        end
         generate_sid unless options[:drop]
       end
     end

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '1.0.1'
+VERSION = '1.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-redis-session-store
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler