redis-rack 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b8d92fa59d3d7167cf87bd16e1e62ca34ba905a901964a6d386b47155f8da0
-  data.tar.gz: 3c8b27ef07b66c2050d053287c03eb3aee64860fda3e4ff806200d9cc663f7ec
+  metadata.gz: bd358598a3b5173b0af0e6af5a0eb8544d33beb746a24c0d4ae01cb01e5e82c1
+  data.tar.gz: 9afa606f06fc3a5b6812ac5d5a961bc440df74b2ac27160a03536fa0f69d7474
 SHA512:
-  metadata.gz: 351e468a771f67ed2e05c3620735636f23f7ad40e338d420c3662a2f7bfc1abdf82e3cf30c1e9a8268452ed1451e87740cc7fabb110b5c60251717a84b2c70f4
-  data.tar.gz: b93772d79076558bf42e60effd452a47699e215538e73435ec70f500ee8e2902b65b7c1f2eb40d4019884c12fbf81ab57b940702657b4295581abe820483631d
+  metadata.gz: a88c2a36dca22320e1e8d015fbfd0ece8b71f814c60e7a90cb1036ae8cee9f713f3321389f286c707b982a5a82c8b5078ffe93b58c37e17367fec6aa8544e209
+  data.tar.gz: 41722398d1973c7390155fb71c9fe17e3e99e1b0093db1b7d588c77dec01487390b4208a8e04ff0a8050d0f03029c606d619e68da7cbfed9e3bdf397159c0502

data/.ruby-version

@@ -0,0 +1 @@
+2.6.2

data/.travis.yml

@@ -1,17 +1,18 @@
 language: ruby
 script: bundle exec rake
 rvm:
-- 2.2.3
-- 2.3.1
-- ruby-head
-- jruby-head
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - ruby-head
+  - jruby-head
 matrix:
   allow_failures:
   - rvm: jruby-head
   - rvm: ruby-head
-gemfile:
-- gemfiles/rack_2.gemfile
-- gemfiles/rack_1.gemfile
 deploy:
   provider: rubygems
   api_key:

data/lib/rack/session/redis.rb

@@ -5,7 +5,7 @@ require 'redis/rack/connection'
 
 module Rack
   module Session
-    class Redis < Abstract::ID
+    class Redis < Abstract::PersistedSecure
       attr_reader :mutex
 
       DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge(
@@ -24,18 +24,18 @@ 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
       end
 
-      def get_session(env, sid)
-        if env['rack.session.options'][:skip]
+      def find_session(req, sid)
+        if req.session.options[:skip]
           [generate_sid, {}]
         else
-          with_lock(env, [nil, {}]) do
-            unless sid and session = with { |c| c.get(sid) }
+          with_lock(req, [nil, {}]) do
+            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 set_session(env, session_id, new_session, options)
-        with_lock(env, false) do
-          with { |c| c.set session_id, new_session, options }
-          session_id
+      def write_session(req, sid, new_session, options)
+        with_lock(req, false) do
+          with { |c| c.set sid.private_id, new_session, options }
+          sid
         end
       end
 
-      def destroy_session(env, session_id, options)
-        with_lock(env) do
-          with { |c| c.del(session_id) }
+      def delete_session(req, sid, options)
+        with_lock(req) do
+          with do |c|
+            c.del(sid.public_id)
+            c.del(sid.private_id)
+          end
           generate_sid unless options[:drop]
         end
       end
@@ -62,8 +65,8 @@ module Rack
         @default_options.fetch(:threadsafe, true)
       end
 
-      def with_lock(env, default=nil)
-        @mutex.lock if env['rack.multithread'] && threadsafe?
+      def with_lock(req, default=nil)
+        @mutex.lock if req.multithread? && threadsafe?
         yield
       rescue Errno::ECONNREFUSED
         if $VERBOSE
@@ -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.0.6'
+    VERSION = '2.1.0'
   end
 end
-

data/redis-rack.gemspec

@@ -12,18 +12,16 @@ 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'
+  s.add_development_dependency 'bundler',  '> 1', '< 3'
   s.add_development_dependency 'mocha',    '~> 0.14.0'
   s.add_development_dependency 'minitest', '~> 5'
   s.add_development_dependency 'redis-store-testing'

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
@@ -102,7 +102,9 @@ describe Rack::Session::Redis do
     sesion_store = Rack::Session::Redis.new(incrementor)
     sesion_store.instance_variable_set(:@mutex, mutex)
     was_yielded = false
-    sesion_store.with_lock({'rack.multithread' => true}) { was_yielded = true}
+    request = Minitest::Mock.new
+    request.expect(:multithread?, true)
+    sesion_store.with_lock(request) { was_yielded = true}
     was_yielded.must_equal(true)
   end
 
@@ -118,7 +120,9 @@ describe Rack::Session::Redis do
       sesion_store = Rack::Session::Redis.new(incrementor, :threadsafe => false)
       sesion_store.instance_variable_set(:@mutex, mutex)
       was_yielded = false
-      sesion_store.with_lock({'rack.multithread' => true}) { was_yielded = true}
+      request = Minitest::Mock.new
+      request.expect(:multithread?, true)
+      sesion_store.with_lock(request) { was_yielded = true}
       was_yielded.must_equal(true)
     end
   end
@@ -295,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
@@ -318,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
@@ -339,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
 
@@ -356,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)
 
@@ -378,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.0.6
+  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'
@@ -68,16 +68,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +163,8 @@ extra_rdoc_files: []
 files:
 - ".github/auto-assign-issues.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
-- Appraisals
 - CODEOWNERS
 - Gemfile
 - MIT-LICENSE
@@ -166,8 +172,6 @@ files:
 - Rakefile
 - bin/appraisal
 - bin/rake
-- gemfiles/rack_1.gemfile
-- gemfiles/rack_2.gemfile
 - lib/rack/session/redis.rb
 - lib/redis-rack.rb
 - lib/redis/rack/connection.rb

data/Appraisals

@@ -1,7 +0,0 @@
-appraise 'rack-2' do
-  gem 'rack', '~> 2'
-end
-
-appraise 'rack-1' do
-  gem 'rack', '~> 1'
-end

data/gemfiles/rack_1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "~> 1"
-
-gemspec :path => "../"

data/gemfiles/rack_2.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rack", "~> 2"
-
-gemspec :path => "../"