redis-rack 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1119fd71b4e9e7dcf20063b71cfe7edaf3243431
-  data.tar.gz: 2c7f98fa64c1d3779ae0b9ef558d489f5f6da2e7
+  metadata.gz: 241656b9de13ca2a3a51554244fd812c376f47a3
+  data.tar.gz: 1be1cc86120b1cddffd41d55a826154cdd3878ed
 SHA512:
-  metadata.gz: 156ed7ff0634c5069035f3725b953419ca8f01856cf19f8d49003fb8a0deb4acdacfc7256b1b8a7d0b5327546b4e6f7db60524b6eff78175e8d2415c8cd55b50
-  data.tar.gz: 77240b05b6c74701ce275c930fa9a9002e8288ddf6b114960bf700af4555fd24cf396eeafafcd677af54f79e7b49eaf7bdf2d788943780f8d1dbc0768ec25ea1
+  metadata.gz: c269d47a297d858229722d566df37c09eaf0624e799dcbb9e7840fa069a2a9b3de710fb68dbce5886d187f53bc38eb594d0782e6fc3903514743ee696feffad6
+  data.tar.gz: d644ed731fbb18bb1b793743e46d29af225946ea72560e81946f2484f081efb6466a3ec072291ee60e5265380f3ca846c0aa27cf3cfe92ff07d6739c572789d6

data/.gitignore

@@ -2,3 +2,5 @@ Gemfile.lock
 *.gem
 tmp/
 stdout
+gemfiles/vendor
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -10,3 +10,7 @@ matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
+# Put this in your .travis.yml
+gemfile:
+  - gemfiles/rack_2.gemfile
+  - gemfiles/rack_1.gemfile

data/Appraisals

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

data/Rakefile

@@ -2,3 +2,9 @@ require 'bundler/setup'
 require 'rake'
 require 'bundler/gem_tasks'
 require 'redis-store/testing/tasks'
+
+task :all do
+  Dir["gemfiles/*.gemfile"].reject { |p| p =~ /\.lock\Z/ }.each do |gemfile|
+    sh "BUNDLE_GEMFILE=#{gemfile} bundle exec rake"
+  end
+end

data/bin/appraisal

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'appraisal' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("appraisal", "appraisal")

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/gemfiles/rack_1.gemfile

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

data/gemfiles/rack_2.gemfile

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

data/lib/rack/session/redis.rb

@@ -23,9 +23,9 @@ module Rack
                   pool_options[:size]    = options[:pool_size] if options[:pool_size]
                   pool_options[:timeout] = options[:pool_timeout] if options[:pool_timeout]
                   @pooled = true
-                  ::ConnectionPool.new(pool_options) { ::Redis::Store::Factory.create(@default_options[:redis_server]) } 
+                  ::ConnectionPool.new(pool_options) { ::Redis::Store::Factory.create(@default_options[:redis_server]) }
                 else
-                  @default_options.has_key?(:redis_store) ? 
+                  @default_options.has_key?(:redis_store) ?
                     @default_options[:redis_store] :
                     ::Redis::Store::Factory.create(@default_options[:redis_server])
 
@@ -70,8 +70,12 @@ module Rack
         end
       end
 
+      def threadsafe?
+        @default_options.fetch(:threadsafe, true)
+      end
+
       def with_lock(env, default=nil)
-        @mutex.lock if env['rack.multithread']
+        @mutex.lock if env['rack.multithread'] && threadsafe?
         yield
       rescue Errno::ECONNREFUSED
         if $VERBOSE
@@ -94,4 +98,3 @@ module Rack
     end
   end
 end
-

data/lib/redis/rack/version.rb

@@ -1,6 +1,6 @@
 class Redis
   module Rack
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
   end
 end
 

data/redis-rack.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'redis-store',   ['< 1.4', '>= 1.2']
+  s.add_runtime_dependency 'redis-store',   ['< 2', '>= 1.2']
   s.add_runtime_dependency 'rack',          '>= 1.5', '< 3'
 
   s.add_development_dependency 'rake',     '~> 10'
@@ -28,5 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 5'
   s.add_development_dependency 'redis-store-testing'
   s.add_development_dependency 'connection_pool',     '~> 1.2.0'
+  s.add_development_dependency 'appraisal'
 end
 

data/test/rack/session/redis_test.rb

@@ -53,7 +53,6 @@ describe Rack::Session::Redis do
     session_store.with { |connection| connection.to_s.must_match(/127\.0\.0\.1:6380 against DB 1$/)  }
   end
 
-
   it "can use a supplied pool" do
     session_store = Rack::Session::Redis.new(incrementor, pool: ::ConnectionPool.new(size: 1, timeout: 1) { ::Redis::Store::Factory.create("redis://127.0.0.1:6380/1")})
     session_store.pool.class.must_equal ::ConnectionPool
@@ -82,6 +81,38 @@ describe Rack::Session::Redis do
     pool.pool.to_s.must_match(/127\.0\.0\.1:6380 against DB 1$/)
   end
 
+  it "is threadsafe by default" do
+    sesion_store = Rack::Session::Redis.new(incrementor)
+    sesion_store.threadsafe?.must_equal(true)
+  end
+
+  it "locks the store mutex" do
+    mutex = Mutex.new
+    mutex.expects(:lock).once
+    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}
+    was_yielded.must_equal(true)
+  end
+
+  describe "threadsafe disabled" do
+    it "can have the global lock disabled" do
+      sesion_store = Rack::Session::Redis.new(incrementor, :threadsafe => false)
+      sesion_store.threadsafe?.must_equal(false)
+    end
+
+    it "does not lock the store mutex" do
+      mutex = Mutex.new
+      mutex.expects(:lock).never
+      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}
+      was_yielded.must_equal(true)
+    end
+  end
+
   it "creates a new cookie" do
     with_pool_management(incrementor) do |pool|
       res = Rack::MockRequest.new(pool).get("/")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-rack
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-store
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
@@ -134,20 +134,41 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Redis Store for Rack applications
 email:
 - me@lucaguidi.com
-executables: []
+executables:
+- appraisal
+- rake
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - MIT-LICENSE
 - README.md
 - 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/version.rb
@@ -174,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: redis-rack
-rubygems_version: 2.6.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Redis Store for Rack