redis-rack 2.1.0.pre → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f58690fddef5788f2c9b9297969f1ad812278554aca17f40842b163a6362f1bc
-  data.tar.gz: e89fb1293e5cc06955ab50138d27e7766d7a07691916ae351347ef29b43751d3
+  metadata.gz: bd358598a3b5173b0af0e6af5a0eb8544d33beb746a24c0d4ae01cb01e5e82c1
+  data.tar.gz: 9afa606f06fc3a5b6812ac5d5a961bc440df74b2ac27160a03536fa0f69d7474
 SHA512:
-  metadata.gz: 5263c92df2caeadca08bcc303a8454965f1aca30d48f958bfb0773f5af52f866b51d1cf6ce5d7850737036fe486e8dd20d2aeb45e550a088db600295515cd5d3
-  data.tar.gz: 0312052d9285c9cef39ab3857d13c42df7023d494fb4392112bc1fce475fd905f51beaf253f337abab07d6d013dce7f32af5c5a1c4cd749fb744e9928ce7d36b
+  metadata.gz: a88c2a36dca22320e1e8d015fbfd0ece8b71f814c60e7a90cb1036ae8cee9f713f3321389f286c707b982a5a82c8b5078ffe93b58c37e17367fec6aa8544e209
+  data.tar.gz: 41722398d1973c7390155fb71c9fe17e3e99e1b0093db1b7d588c77dec01487390b4208a8e04ff0a8050d0f03029c606d619e68da7cbfed9e3bdf397159c0502

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 script: bundle exec rake
 rvm:
-  - 2.2.3
-  - 2.3.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
   - jruby-head
 matrix:

data/lib/rack/session/redis.rb

@@ -5,10 +5,10 @@ require 'redis/rack/connection'
 
 module Rack
   module Session
-    class Redis < Abstract::Persisted
+    class Redis < Abstract::PersistedSecure
       attr_reader :mutex
 
-      DEFAULT_OPTIONS = Abstract::Persisted::DEFAULT_OPTIONS.merge(
+      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge(
         :redis_server => 'redis://127.0.0.1:6379/0/rack:session'
       )
 
@@ -24,7 +24,7 @@ module Rack
         loop do
           sid = generate_sid
           first = with do |c|
-            [*c.setnx(sid, session, @default_options)].first
+            [*c.setnx(sid.private_id, session, @default_options)].first
           end
           break sid if [1, true].include?(first)
         end
@@ -35,7 +35,7 @@ module Rack
           [generate_sid, {}]
         else
           with_lock(req, [nil, {}]) do
-            unless sid and session = with { |c| c.get(sid) }
+            unless sid and session = get_session_with_fallback(sid)
               session = {}
               sid = generate_unique_sid(session)
             end
@@ -44,16 +44,19 @@ module Rack
         end
       end
 
-      def write_session(req, session_id, new_session, options)
+      def write_session(req, sid, new_session, options)
         with_lock(req, false) do
-          with { |c| c.set session_id, new_session, options }
-          session_id
+          with { |c| c.set sid.private_id, new_session, options }
+          sid
         end
       end
 
-      def delete_session(req, session_id, options)
+      def delete_session(req, sid, options)
         with_lock(req) do
-          with { |c| c.del(session_id) }
+          with do |c|
+            c.del(sid.public_id)
+            c.del(sid.private_id)
+          end
           generate_sid unless options[:drop]
         end
       end
@@ -78,6 +81,12 @@ module Rack
       def with(&block)
         @conn.with(&block)
       end
+
+      private
+
+      def get_session_with_fallback(sid)
+        with { |c| c.get(sid.private_id) || c.get(sid.public_id) }
+      end
     end
   end
 end

data/lib/redis/rack/version.rb

@@ -1,6 +1,5 @@
 class Redis
   module Rack
-    VERSION = '2.1.0.pre'
+    VERSION = '2.1.0'
   end
 end
-

data/redis-rack.gemspec

@@ -12,15 +12,13 @@ Gem::Specification.new do |s|
   s.description = %q{Redis Store for Rack applications}
   s.license     = 'MIT'
 
-  s.rubyforge_project = 'redis-rack'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = []
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'redis-store',   ['< 2', '>= 1.2']
-  s.add_runtime_dependency 'rack',          '>= 1.5', '< 3'
+  s.add_runtime_dependency 'rack',          '>= 2.0.8', '< 3'
 
   s.add_development_dependency 'rake',     '~> 10'
   s.add_development_dependency 'bundler',  '> 1', '< 3'

data/test/rack/session/redis_test.rb

@@ -93,7 +93,7 @@ describe Rack::Session::Redis do
   it "does not store a blank session" do
     session_store = Rack::Session::Redis.new(incrementor)
     sid = session_store.generate_unique_sid({})
-    session_store.with { |c| c.get(sid).must_be_nil }
+    session_store.with { |c| c.get(sid.private_id).must_be_nil }
   end
 
   it "locks the store mutex" do
@@ -299,10 +299,11 @@ describe Rack::Session::Redis do
 
       res0 = req.get("/")
       session_id = (cookie = res0["Set-Cookie"])[session_match, 1]
-      ses0 = pool.with { |c| c.get(session_id) }
+      sid = Rack::Session::SessionId.new(session_id)
+      ses0 = pool.with { |c| c.get(sid.private_id) }
 
       req.get("/", "HTTP_COOKIE" => cookie)
-      ses1 = pool.with { |c| c.get(session_id) }
+      ses1 = pool.with { |c| c.get(sid.private_id) }
 
       ses1.wont_equal(ses0)
     end
@@ -322,6 +323,7 @@ describe Rack::Session::Redis do
       res.body.must_equal('{"counter"=>1}')
       cookie = res["Set-Cookie"]
       session_id = cookie[session_match, 1]
+      sid = Rack::Session::SessionId.new(session_id)
 
       delta_incrementor = lambda do |env|
         # emulate disconjoinment of threading
@@ -343,7 +345,7 @@ describe Rack::Session::Redis do
         request.body.must_include('"counter"=>2')
       end
 
-      session = pool.with { |c| c.get(session_id) }
+      session = pool.with { |c| c.get(sid.private_id) }
       session.size.must_equal(tnum+1) # counter
       session['counter'].must_equal(2) # meeeh
 
@@ -360,7 +362,7 @@ describe Rack::Session::Redis do
         request.body.must_include('"counter"=>3')
       end
 
-      session = pool.with { |c| c.get(session_id) }
+      session = pool.with { |c| c.get(sid.private_id) }
       session.size.must_equal(tnum+1)
       session['counter'].must_equal(3)
 
@@ -382,7 +384,7 @@ describe Rack::Session::Redis do
         request.body.must_include('"foo"=>"bar"')
       end
 
-      session = pool.with { |c| c.get(session_id) }
+      session = pool.with { |c| c.get(sid.private_id) }
       session.size.must_equal(r.size+1)
       session['counter'].must_be_nil
       session['foo'].must_equal('bar')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-rack
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre
+  version: 2.1.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.0.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -195,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: