rack-redis-session-store 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b02f85c45a99fc7975c7fef85be45039b7ce91
-  data.tar.gz: f99015530378207faee2f48b122a18d177508f90
+  metadata.gz: a6b92694592164facffa121a611d0dc3d91ec136
+  data.tar.gz: 4f26f80bba4017629352c698d6c2b5099993e434
 SHA512:
-  metadata.gz: 15d6522a10cbf5d6f0f4c6e389674a300c772dbd867b345cd4a678ee22b54074bb464af4480c318529d23ca3339e8f2fd0bedd6f6f7d2a326a9c725122289f63
-  data.tar.gz: 8857f03b7b076e04e19d04e52a0e053d3765a65f726b93dd2ce3436e6c29c8ec7389d5cf5075fb8aec436c46f0bad7cb9c508d1ea513b08a01ba55a0276dd64a
+  metadata.gz: 1156d282e92feb912eb5a2e549bb2dbbb1dfb1a7e4bfceb18e50f6532831ef0b5ebc54e3e02f0840fbe8ee361c47d911499584db41962ae2a649d5c39bcadaf1
+  data.tar.gz: b88e3ec0c62d51653c700d422b332f89e22d0ed9ad1d9358a955ebe445e8291801becde4f0d918b2c1964d40ac1df90997769434bdeb2e57ecb8b6d5ec893e4c

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

@@ -24,41 +24,32 @@ module ActionDispatch
       end
 
       def get_session(env, sid)
-        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
+        @redis.with do |redis|
+          unless sid and session = JSON.parse(redis.get(sid))
+            sid, session = generate_sid, {}
           end
-        else
-          sid = generate_sid
+          [sid, session]
         end
-        [sid, session]
       end
 
       def set_session(env, session_id, new_session, options)
-        if (!new_session.empty?)
-          @redis.with do |redis|
-            json = Jbuilder.encode do |json|
-              json.(new_session, *new_session.keys)
-            end
-            redis.setex session_id, options[:expire_after],json
+        expiry = options[:expire_after]
+        expiry = expiry.nil? ? 0 : expiry + 1
+
+        @redis.with do |redis|
+          json = Jbuilder.encode do |json|
+            json.(new_session, *new_session.keys)
           end
+          redis.setex session_id, expiry,json
+          session_id
         end
-        #For some reason, rack doesn't set new session_id to options[:id]
-        options[:id] = session_id
-        return session_id
       end
 
       def destroy_session(env, session_id, options)
-        puts('Destroy session')
         @redis.with do |redis|
           redis.del(session_id)
+          generate_sid unless options[:drop]
         end
-        generate_sid unless options[:drop]
       end
     end
   end

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '2.0.2'
+VERSION = '2.0.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-redis-session-store
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Le Duc Duy