redis-rack 2.0.6 → 2.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b8d92fa59d3d7167cf87bd16e1e62ca34ba905a901964a6d386b47155f8da0
-  data.tar.gz: 3c8b27ef07b66c2050d053287c03eb3aee64860fda3e4ff806200d9cc663f7ec
+  metadata.gz: f58690fddef5788f2c9b9297969f1ad812278554aca17f40842b163a6362f1bc
+  data.tar.gz: e89fb1293e5cc06955ab50138d27e7766d7a07691916ae351347ef29b43751d3
 SHA512:
-  metadata.gz: 351e468a771f67ed2e05c3620735636f23f7ad40e338d420c3662a2f7bfc1abdf82e3cf30c1e9a8268452ed1451e87740cc7fabb110b5c60251717a84b2c70f4
-  data.tar.gz: b93772d79076558bf42e60effd452a47699e215538e73435ec70f500ee8e2902b65b7c1f2eb40d4019884c12fbf81ab57b940702657b4295581abe820483631d
+  metadata.gz: 5263c92df2caeadca08bcc303a8454965f1aca30d48f958bfb0773f5af52f866b51d1cf6ce5d7850737036fe486e8dd20d2aeb45e550a088db600295515cd5d3
+  data.tar.gz: 0312052d9285c9cef39ab3857d13c42df7023d494fb4392112bc1fce475fd905f51beaf253f337abab07d6d013dce7f32af5c5a1c4cd749fb744e9928ce7d36b

data/.ruby-version

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

data/.travis.yml

@@ -1,17 +1,14 @@
 language: ruby
 script: bundle exec rake
 rvm:
-- 2.2.3
-- 2.3.1
-- ruby-head
-- jruby-head
+  - 2.2.3
+  - 2.3.1
+  - 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,10 +5,10 @@ require 'redis/rack/connection'
 
 module Rack
   module Session
-    class Redis < Abstract::ID
+    class Redis < Abstract::Persisted
       attr_reader :mutex
 
-      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge(
+      DEFAULT_OPTIONS = Abstract::Persisted::DEFAULT_OPTIONS.merge(
         :redis_server => 'redis://127.0.0.1:6379/0/rack:session'
       )
 
@@ -30,11 +30,11 @@ module Rack
         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
+          with_lock(req, [nil, {}]) do
             unless sid and session = with { |c| c.get(sid) }
               session = {}
               sid = generate_unique_sid(session)
@@ -44,15 +44,15 @@ module Rack
         end
       end
 
-      def set_session(env, session_id, new_session, options)
-        with_lock(env, false) do
+      def write_session(req, session_id, new_session, options)
+        with_lock(req, false) do
           with { |c| c.set session_id, new_session, options }
           session_id
         end
       end
 
-      def destroy_session(env, session_id, options)
-        with_lock(env) do
+      def delete_session(req, session_id, options)
+        with_lock(req) do
           with { |c| c.del(session_id) }
           generate_sid unless options[:drop]
         end
@@ -62,8 +62,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

data/lib/redis/rack/version.rb

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

data/redis-rack.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rack',          '>= 1.5', '< 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

@@ -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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-rack
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0.pre
 platform: ruby
 authors:
 - Luca Guidi
@@ -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.3'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        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
@@ -191,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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

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 => "../"